From 5c272c606bdf2da3577dbaa5f48d0ee163f1e7d2 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 26 三月 2026 10:35:24 +0800
Subject: [PATCH] 纸张淋膜半成品入库逻辑优化

---
 项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/原料库/StackerCraneJob_YLSC3.cs |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/StackerCraneJob_YLSC3.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/StackerCraneJob_YLSC3.cs"
index 8b355c0..eb621f9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/StackerCraneJob_YLSC3.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\345\216\237\346\226\231\345\272\223/StackerCraneJob_YLSC3.cs"
@@ -26,6 +26,7 @@
 using HslCommunication.WebSocket;
 using WIDESEAWCS_DTO.Equipment;
 using WIDESEAWCS_QuartzJob.StackerCrane;
+using WIDESEAWCS_DTO.TaskInfo;
 
 namespace WIDESEAWCS_Tasks
 {
@@ -66,7 +67,7 @@
                     commonStackerCrane.CheckStackerCraneTaskCompleted();//闃叉浠诲姟瀹屾垚浜嬩欢鐩戞祴瓒呮椂锛屽啀鎵嬪姩瑙﹀彂涓�娆�
 
                     //鑾峰彇褰撳墠鍫嗗灈鏈虹姸鎬�
-                    if (commonStackerCrane.CurrentTaskNum>0 && commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.WorkCompleted)
+                    if (commonStackerCrane.CurrentTaskNum>0 && (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.WorkCompleted || commonStackerCrane.Communicator.Read<short>("DB1000.40.0") == 3))
                     {
                         StackerCraneTaskCompletedEventArgs e = new StackerCraneTaskCompletedEventArgs(commonStackerCrane.CurrentTaskNum);
                         CommonStackerCrane_StackerCraneTaskCompletedEventHandler(commonStackerCrane, e);
@@ -94,6 +95,19 @@
                                         Thread.Sleep(1000);
                                     }
                                 }
+                            }
+                            ErrorDeviceInfo? deviceInfo = RoadwayError.Roadways.FirstOrDefault(x => x.Code == commonStackerCrane.DeviceCode);
+                            if (deviceInfo != null)
+                            {
+                                RoadwayError.Roadways.Remove(deviceInfo);
+                            }
+                        }
+                        else
+                        {
+                            ErrorDeviceInfo? deviceInfo = RoadwayError.Roadways.FirstOrDefault(x => x.Code == commonStackerCrane.DeviceCode);
+                            if (deviceInfo == null)
+                            {
+                                RoadwayError.Roadways.Add(new ErrorDeviceInfo() { Code = commonStackerCrane.DeviceCode, Roadway = commonStackerCrane.DeviceCode });
                             }
                         }
                     }
@@ -266,7 +280,7 @@
             Dt_Task? task;
             if (commonStackerCrane.LastTaskType == null)
             {
-                task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
+                task = _taskService.QueryStackerYLTask(commonStackerCrane.DeviceCode);
             }
             else
             {
@@ -276,13 +290,13 @@
                     task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
                     if (task == null)
                     {
-                        task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
+                        task = _taskService.QueryStackerYLTask(commonStackerCrane.DeviceCode, TaskTypeGroup.OutbondGroup);
                     }
                 }
                 else
                 {
                     //涓婁竴涓负鍏ュ簱鍒欐煡鏄惁瀛樺湪鍑哄簱浠诲姟 浜ゆ浛鎵ц
-                    task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
+                    task = _taskService.QueryStackerYLTask(commonStackerCrane.DeviceCode, TaskTypeGroup.OutbondGroup);
                     if (task == null)
                     {
                         task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
@@ -346,6 +360,7 @@
                         {
                             task.ExceptionMessage = "鍑哄簱绔欏彴鏃犳硶涓嬪彂";
                             _taskRepository.UpdateData(task);
+                            WriteInfo(task.DeviceCode, $"鍑哄簱绔欏彴鏃犳硶涓嬪彂");
                         }
                     }
                     else
@@ -362,8 +377,8 @@
                         CommonConveyorLine client = (CommonConveyorLine)device;
                         if (client.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.InteractiveSignal, stationManger.StationCode) != 99)//鍑哄簱绔欏彴鏈鍗犵敤
                         {
-                            task.NextAddress = stationManger.StackerCraneStationCode;
-                            _taskRepository.UpdateData(task);
+                            //task.NextAddress = stationManger.StackerCraneStationCode;
+                            //_taskRepository.UpdateData(task);
                             return task;
                         }
                         else
@@ -398,6 +413,10 @@
             YLStackerCraneTaskCommand stackerCraneTaskCommand = new YLStackerCraneTaskCommand();
 
             stackerCraneTaskCommand.PalletType = Convert.ToInt16(task.PalletType);
+            if (task.TaskLength>=1160 && task.TaskLength<1630)
+            {
+                stackerCraneTaskCommand.PalletType = 3;
+            }
             stackerCraneTaskCommand.TaskNum = task.TaskNum;
             stackerCraneTaskCommand.WorkType = 5;
             if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�

--
Gitblit v1.9.3