From 3f66e3c1ddc2a78c0ae1e5014c0ab94d9756453a Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 10 十一月 2025 16:14:57 +0800
Subject: [PATCH] 最新

---
 代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs |   65 ++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 29 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index b705d00..5d84dfb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -121,26 +121,29 @@
             {
                 // 鑾峰彇瀹夊叏闂ㄤ俊鎭�
                 AQMReturnnormal aQMConveyor = AQMStoticCommand(conveyorLine, Stations.ChildPosiDeviceCode);
+                if(aQMConveyor != null)
+                {
+                    if (aQMConveyor.SafetyLockStatus == 1)
+                    {
+                        //鍐欏叆鎶ヨ
+                        GetDeviceAddress.WriteSecurityDoorpolice(Stations.ChildPosiDeviceCode, "AlarmSummary", 0);
+                        //鍐欏叆寮�闂ㄤ俊鍙�
+                        GetDeviceAddress.WriteSecurityDoorpolice(Stations.ChildPosiDeviceCode, "OpenDoor", 0);
+                    }
 
-                if (aQMConveyor.SafetyLockStatus == 1)
-                {
-                    //鍐欏叆鎶ヨ
-                    GetDeviceAddress.WriteSecurityDoorpolice(Stations.ChildPosiDeviceCode, "AlarmSummary", 0);
-                    //鍐欏叆寮�闂ㄤ俊鍙�
-                    GetDeviceAddress.WriteSecurityDoorpolice(Stations.ChildPosiDeviceCode, "OpenDoor", 0);
+                    // 鏍规嵁浠诲姟绫诲瀷閫夋嫨澶勭悊绛栫暐
+                    if (Stations.Station_tasktype == (int)RGVTasktype.Outbound)
+                    {
+                        if (aQMConveyor.EmergencyStopStatus == 0) _gvOperationService.WriteOutbuttonpause(null);
+                        HandleDoorRequest(aQMConveyor, Stations, 2);
+                    }
+                    else
+                    {
+                        if (aQMConveyor.EmergencyStopStatus == 0) _gvOperationService.InWriteOutbuttonpause(null);
+                        HandleDoorRequest(aQMConveyor, Stations, 1);
+                    }
                 }
-
-                // 鏍规嵁浠诲姟绫诲瀷閫夋嫨澶勭悊绛栫暐
-                if (Stations.Station_tasktype == (int)RGVTasktype.Outbound)
-                {
-                    if (aQMConveyor.EmergencyStopStatus == 0) _gvOperationService.WriteOutbuttonpause(null);
-                    HandleDoorRequest(aQMConveyor, Stations, 2);
-                }
-                else
-                {
-                    if (aQMConveyor.EmergencyStopStatus == 0) _gvOperationService.InWriteOutbuttonpause(null);
-                    HandleDoorRequest(aQMConveyor, Stations, 1);
-                }
+                
                 return false;
             }
             catch (Exception ex)
@@ -155,21 +158,25 @@
             try
             {
                 PlatformStatus aQMConveyor = StoticCommand(conveyorLine, Stations.ChildPosiDeviceCode);
-                if (aQMConveyor.HCJ_GoodsStatus == 0)    //鍙繘琛屾斁璐�
+                if (aQMConveyor != null)
                 {
-                    WebResponseContent webResponseContent = new WebResponseContent();
-                    //鏍规嵁绫诲瀷鏌ユ壘浠诲姟
-                    if (Stations.Station_material == (int)RGVEquipment.AbnormalOutbound)
+                    if (aQMConveyor.HCJ_GoodsStatus == 0)    //鍙繘琛屾斁璐�
                     {
-                        //鏌ユ壘鏄惁鏈夊紓甯告惉杩愪换鍔�
-                        webResponseContent = _taskService.UpdateDeliveryAddress(Stations.HCJStorageaddress.ToString(), 1);   //杩橀渶瑕佷紶鍏ュ湴鍧�
-                    }
-                    else
-                    {
-                        //鍑哄簱绔欏彴鐨勪换鍔�
-                        webResponseContent = _taskService.UpdateDeliveryAddress(Stations.HCJStorageaddress.ToString(), 2);
+                        WebResponseContent webResponseContent = new WebResponseContent();
+                        //鏍规嵁绫诲瀷鏌ユ壘浠诲姟
+                        if (Stations.Station_material == (int)RGVEquipment.AbnormalOutbound)
+                        {
+                            //鏌ユ壘鏄惁鏈夊紓甯告惉杩愪换鍔�
+                            webResponseContent = _taskService.UpdateDeliveryAddress(Stations.HCJStorageaddress.ToString(), 1);   //杩橀渶瑕佷紶鍏ュ湴鍧�
+                        }
+                        else
+                        {
+                            //鍑哄簱绔欏彴鐨勪换鍔�
+                            webResponseContent = _taskService.UpdateDeliveryAddress(Stations.HCJStorageaddress.ToString(), 2);
+                        }
                     }
                 }
+                
                 return false;
             }
             catch (Exception ex)

--
Gitblit v1.9.3