From 65a231315d1dcc35d2996106d36e9cca9aba6ce6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 06 三月 2026 09:06:44 +0800
Subject: [PATCH] 更新码垛分配工位优化,老厂退库称重上报设定差异范围

---
 项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/成品仓/ConveyorLineJob_CPB.cs |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPB.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPB.cs"
index 640efb0..026554b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPB.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\346\210\220\345\223\201\344\273\223/ConveyorLineJob_CPB.cs"
@@ -101,16 +101,24 @@
                                             WriteError(item.StationName, $"璺敱淇℃伅閰嶇疆閿欒,璁惧缂栧彿:{item.StationCode},浠诲姟鍙�:{task.TaskNum}");
                                             continue;
                                         }
-                                        device.SetValue(W_ConveyorLineCPDB.W_TargetAddress, router.NextPosi, item.StationCode);
-                                        device.SetValue(W_ConveyorLineCPDB.W_TaskNo, task.TaskNum, item.StationCode);
-                                        device.SetValue(W_ConveyorLineCPDB.W_Command, 1, item.StationCode);
-                                        task.CurrentAddress = item.StationCode;
-                                        task.NextAddress = router.NextPosi;
-                                        task.PalletCode = conveyorLineInfoRead.PalletCode;
-                                        task.Roadway = roadWay;
-                                        task.DeviceCode = router.ChildPosiDeviceCode;
-                                        _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing);
-                                        WriteInfo(item.StationName, $"浠诲姟鍙穥conveyorLineInfoRead.TaskNo}涓嬩竴姝�");
+                                        WebResponseContent responseContent = _taskService.RequestInBoundPalletCode(task.TaskNum, conveyorLineInfoRead.PalletCode.Trim());
+                                        if (responseContent.Status)
+                                        {
+                                            device.SetValue(W_ConveyorLineCPDB.W_TargetAddress, router.NextPosi, item.StationCode);
+                                            device.SetValue(W_ConveyorLineCPDB.W_TaskNo, task.TaskNum, item.StationCode);
+                                            device.SetValue(W_ConveyorLineCPDB.W_Command, 1, item.StationCode);
+                                            task.CurrentAddress = item.StationCode;
+                                            task.NextAddress = router.NextPosi;
+                                            task.PalletCode = conveyorLineInfoRead.PalletCode.Trim();
+                                            task.Roadway = roadWay;
+                                            task.DeviceCode = router.ChildPosiDeviceCode;
+                                            _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing);
+                                            WriteInfo(item.StationName, $"浠诲姟鍙穥task.TaskNum}涓嬩竴姝ュ埌杈緖router.NextPosi}鍏ュ簱绔欏彴");
+                                        }
+                                        else
+                                        {
+                                            WriteError(item.StationName, $"浠诲姟鍙穥task.TaskNum}鎵爜璇锋眰閿欒{responseContent.Message}");
+                                        }
                                     }
                                     else
                                     {
@@ -212,7 +220,7 @@
                                 }
                             }
                         }
-                        else if (item.StationType == StationTypeEnum.StationType_StackingPlates.ObjToInt() && deviceProRead != null && deviceProWrite != null)
+                        else if (item.StationType == StationTypeEnum.StationType_StackingPlates.ObjToInt() && item.IsOccupied==StationOccupiedEnum.None.ObjToInt() && deviceProRead != null && deviceProWrite != null)
                         {//鍙犵洏鏈哄伐浣嶅彨鏂�
                             R_ConveyorLineCPInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_ConveyorLineCPInfo>(deviceProRead.DeviceProAddress);
 
@@ -223,7 +231,14 @@
                                 {
                                     //璇锋眰浠诲姟
                                     WebResponseContent content = _taskService.RequestPlateOutTask(item.StationCode);
-                                    WriteInfo(item.StationName, $"浜屾ゼ绌烘墭鍙犵洏鍑哄簱浠诲姟鐢熸垚");
+                                    if (content.Status)
+                                    {
+                                        WriteInfo(item.StationName, $"浜屾ゼ绌烘墭鍙犵洏鍑哄簱浠诲姟鐢熸垚");
+                                    }
+                                    else
+                                    {
+                                        WriteInfo(item.StationName, $"{content.Message}");
+                                    }
                                 }
                             }
                             //鍙犵洏浠诲姟瀹屾垚浜や簰

--
Gitblit v1.9.3