1

duyongjia

2024-11-20 81f3d2205ff6ee8d173f6d30f57ad510ad86e0bf

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/DoubleStackerCraneJob.cs

@@ -56,16 +56,17 @@
                CommonStackerCrane? stackerCraneOne = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC02") as CommonStackerCrane;
                CommonStackerCrane? stackerCraneTwo = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "SC03") as CommonStackerCrane;

                Dt_DeviceInfo deviceSC02= _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");
                Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
                if(deviceSC02.DeviceStatus=="0")
                {
                    stackerCraneOne = null;
                }
                if(deviceSC03.DeviceStatus=="0")
                {
                    stackerCraneTwo = null;
                }
                //Dt_DeviceInfo deviceSC02= _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");
                //Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
                //if(deviceSC02.DeviceStatus=="0")
                //{
                //    stackerCraneOne = null;
                //}
                //if(deviceSC03.DeviceStatus=="0")
                //{
                //    stackerCraneTwo = null;
                //}
                stackerCraneOne.CheckStackerCraneTaskCompleted();
                Dt_Task? task = GetTask();
                if (task != null)
                {
@@ -159,9 +160,11 @@
                        }

                    }
                    else//不能正常工作状态
                    else//SC02不能正常工作状态,这里需要判断sc02是否禁用，如果已禁用，才可以启动sc03
                    {
                        if (stackerCraneTwo != null)
                        Dt_DeviceInfo deviceSC02 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC02");

                        if (deviceSC02.DeviceStatus=="0"&& stackerCraneTwo != null)
                        {
                            if (!stackerCraneTwo.IsEventSubscribed)
                            {
@@ -198,9 +201,10 @@
                            return stackerCraneTwo;
                        }
                    }
                    else
                    else//SC03不能正常工作状态,这里需要判断sc03是否禁用，如果已禁用，才可以启动sc02
                    {
                        if (stackerCraneOne != null)
                        Dt_DeviceInfo deviceSC03 = _deviceInfoRepository.QueryFirst(x => x.DeviceCode == "SC03");
                        if (deviceSC03.DeviceStatus=="0"&&stackerCraneOne != null)
                        {
                            if (!stackerCraneOne.IsEventSubscribed)
                            {