From 37051424de7c4a97132fbb06e45df594790aabf9 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 16 十二月 2025 18:40:38 +0800
Subject: [PATCH] 优化功能

---
 项目代码/WCSServices/WIDESEAWCS_Tasks/一期线体/ConveyorLineJob1.cs |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\270\200\346\234\237\347\272\277\344\275\223/ConveyorLineJob1.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\270\200\346\234\237\347\272\277\344\275\223/ConveyorLineJob1.cs"
index ba907c7..0ead3ba 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\270\200\346\234\237\347\272\277\344\275\223/ConveyorLineJob1.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCSServices/WIDESEAWCS_Tasks/\344\270\200\346\234\237\347\272\277\344\275\223/ConveyorLineJob1.cs"
@@ -18,6 +18,7 @@
 using WIDESEAWCS_Communicator;
 using WIDESEAWCS_Core;
 using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_DTO.TaskInfo;
 using WIDESEAWCS_IBasicInfoRepository;
 using WIDESEAWCS_ITaskInfoRepository;
 using WIDESEAWCS_ITaskInfoService;
@@ -104,7 +105,7 @@
                                         }
                                         BarCode1 = pickBarCode;
                                     }
-                                    if (device.DeviceCode == "CL2" && BarCode1 != pickBarCode)
+                                    if (device.DeviceCode == "CL2" && BarCode2 != pickBarCode)
                                     {
                                         WebResponseContent content = _taskService.WMSPickUp(station.PickStationCode, pickBarCode);
                                         if (content.Status)
@@ -133,9 +134,17 @@
                             if (InTake==256 && InBarCode.IsNotEmptyOrNull())
                             {
                                 //鐢宠鍏ュ簱浠诲姟
-                                Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == InBarCode && x.TaskType == TaskTypeEnum.Inbound.ObjToInt() && x.TaskState != TaskStatusEnum.CL_Executing.ObjToInt() && x.DeviceCode==device.DeviceCode);
+                                Dt_Task task = _taskRepository.QueryFirst(x => x.PalletCode == InBarCode && x.TaskType == TaskTypeEnum.Inbound.ObjToInt() && x.DeviceCode==device.DeviceCode);
                                 if (task != null) continue;
-
+                                Dt_StationManger? stationManger = stationMangers.FirstOrDefault(x=>x.StationType==StationTypeEnum.StationType_OnlyOutbound.ObjToInt());
+                                ContainerFlowDTO containerFlowDTO = new ContainerFlowDTO()
+                                {
+                                    SlotCode = stationManger.PickStationCode,
+                                    ContainerCode= InBarCode,
+                                    Direction="100"
+                                };
+                                WebResponseContent responseContent = _taskService.ContainerFlow(containerFlowDTO, station.StationDeviceCode, stationManger.PickStationCode);
+                                if (!responseContent.Status) throw new Exception(responseContent.Message);
                                 WebResponseContent content = _taskService.RequestInTask(station.StationCode, InBarCode);
                                 if (content.Status)
                                 {

--
Gitblit v1.9.3