From 4f3b0a6727ecfa555892ebea64bd76e5a07cd6fb Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 17 三月 2026 10:01:38 +0800
Subject: [PATCH] feat: 新增WMS异常上报自动恢复异常按钮

---
 项目代码/WCSServices/WIDESEAWCS_Tasks/二期线体/ConveyorLineJob2.cs |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\272\214\346\234\237\347\272\277\344\275\223/ConveyorLineJob2.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\272\214\346\234\237\347\272\277\344\275\223/ConveyorLineJob2.cs"
index 0497039..3f03d3b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\272\214\346\234\237\347\272\277\344\275\223/ConveyorLineJob2.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\272\214\346\234\237\347\272\277\344\275\223/ConveyorLineJob2.cs"
@@ -18,6 +18,7 @@
 using WIDESEAWCS_QuartzJob;
 using WIDESEAWCS_QuartzJob.DTO;
 using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoService;
 
 namespace WIDESEAWCS_Tasks
 {
@@ -61,12 +62,11 @@
                                 //涓婃姤WMS鏂欑鍒拌揪
                                 if (PickBarCode.IsNotEmptyOrNull())
                                 {
+                                    conveyorLine.SetValue(ConveyorLineDBName.W_PickToHode, (short)300, station.StationCode);
                                     WebResponseContent content = _taskService.WMSPickUp(station.PickStationCode, PickBarCode);
                                     //WebResponseContent content = WebResponseContent.Instance.OK();
                                     if (content.Status)
                                     {
-                                        //鍐欏叆鎷i�夌‘璁�
-                                        conveyorLine.SetValue(ConveyorLineDBName.W_PickToHode, (short)300, station.StationCode);
                                         WriteInfo(conveyorLine.DeviceCode, $"{station.PickStationCode}鎷i�夌敵璇蜂笂鎶ユ垚鍔焮PickBarCode}");
                                     }
                                     else
@@ -81,9 +81,11 @@
                             }
                             //鎸夐挳鐢宠
                             bool DownRequest = conveyorLine.GetValue<ConveyorLineDBName, bool>(ConveyorLineDBName.R_DownRequest, station.StationCode);
-                            if (DownRequest)
+                            short W_PickToHode = conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.W_PickToHode, station.StationCode);
+                            if (DownRequest && W_PickToHode == 300)
                             {
                                 string PickBarCode = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.R_PickBarCode, station.StationCode).Trim();
+                                WriteInfo(conveyorLine.DeviceCode, $"鐢宠鍏ュ簱{PickBarCode}锛岀珯鍙帮細{station.StationCode}");
                                 //涓婃姤WMS鏂欑鍒拌揪
                                 if (PickBarCode.IsNotEmptyOrNull())
                                 {
@@ -93,9 +95,11 @@
                                         ContainerCode = PickBarCode,
                                         Direction="100"
                                     };
-                                    WebResponseContent responseContent = _taskService.ContainerFlow(containerFlowDTO, station.StationDeviceCode, station.PickStationCode);
+                                    WriteInfo(conveyorLine.DeviceCode, $"浠诲姟鏋勫缓瀹屾垚SlotCode: {containerFlowDTO.SlotCode}, ContainerCode: {containerFlowDTO.ContainerCode}");
+                                    WebResponseContent responseContent = _taskService.ContainerFlow(containerFlowDTO, station.StationDeviceCode, station.PickStationCode,1);
                                     if (responseContent.Status)
                                     {
+                                        WriteInfo(conveyorLine.DeviceCode, $"鍐欏叆PLC淇″彿W_PickToHode: {containerFlowDTO.Direction}锛岀珯鍙帮細{station.StationCode}");
                                         conveyorLine.SetValue(ConveyorLineDBName.W_PickToHode, (short)containerFlowDTO.Direction.ObjToInt(), station.StationCode);
                                     }
                                     else
@@ -107,7 +111,6 @@
                                 {
                                     WriteError(conveyorLine.DeviceCode, $"{station.PickStationCode}鎸夐挳鐢宠涓簕DownRequest}鏉$爜涓虹┖鍊�");
                                 }
-                                
                             }
 
                         }
@@ -120,6 +123,7 @@
                             if (InRequest && !InResponse && InWeight>0)
                             {
                                 string InBarCode = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.R_InBarCode, station.StationCode).Trim();
+                                WriteInfo(conveyorLine.DeviceCode, $"绔欏彴{station.StationCode}鏂欑{InBarCode}鐢宠鍏ュ簱鎴愬姛");
                                 //鏂欑鍒拌揪
                                 if (InBarCode.IsNotEmptyOrNull())
                                 {
@@ -127,9 +131,7 @@
                                     WebResponseContent content =_taskService.RequestInTask(station.StationCode,InBarCode);
                                     if (content.Status)
                                     {
-                                        //鍐欏叆鍏ュ簱纭
-                                        conveyorLine.SetValue(ConveyorLineDBName.W_InResponse, true, station.StationCode);
-                                        WriteInfo(conveyorLine.DeviceCode, $"绔欏彴{station.StationCode}鏂欑{InBarCode}鐢宠鍏ュ簱鎴愬姛");
+                                        conveyorLine.SetValue(ConveyorLineDBName.W_InResponse, true, station.StationCode);   
                                     }
                                     else
                                     {

--
Gitblit v1.9.3