From 490e62a0f7b33249dabb74e000725bd8555ca186 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期日, 22 三月 2026 12:56:52 +0800
Subject: [PATCH] 添加3F、4F循环任务;平库表添加状态和托盘号;海康AGV任务反馈添加更新平库货位信息

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
index 02ae60f..b13e3a4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs"
@@ -80,8 +80,20 @@
                             task.TaskState = (int)TaskStatusEnum.Takeing;
                             TaskFeedback(task, 1);
                             break;
-                        case "outbin":
+                        case "outbin"://绂诲紑璧风偣
                             {
+                                if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
+                                {
+                                    var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+                                    if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
+                                    else
+                                    {
+                                        if (device.IsConnected)
+                                            device.SetValue(HoistEnum.Outboundboxon, 1);
+                                        else
+                                            task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+                                    }
+                                }
                                 ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
                                 TaskFromCompleted(task, deviceTypeEnum);
                             }
@@ -98,17 +110,17 @@
                                 BaseDal.UpdateData(task);
                             }
                             break;
-                        case "end":
+                        case "end"://浠诲姟瀹屾垚閫氱煡
                             {
                                 ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
-                                if(task.TaskType== TaskTypeEnum.RK3F.ObjToInt()&& task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
+                                if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
                                 {
                                     var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
                                     if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
                                     else
                                     {
                                         if (device.IsConnected)
-                                            device.SetValue(HoistEnum.Inboundboxon,1);
+                                            device.SetValue(HoistEnum.Inboundboxon, 1);
                                         else
                                             task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
                                     }
@@ -366,6 +378,20 @@
                         dt_HKLocationInfo.LocationStatus = locationStatusEnum.ObjToInt();
                         _hKLocationInfoService.Repository.UpdateData(dt_HKLocationInfo);
                     }
+                    Dt_StationInfo? stationInfo = _stationInfo.Repository.QueryFirst(x => x.StationCode == locationCode);
+                    if (stationInfo != null)
+                    {
+                        if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
+                        {
+                            stationInfo.PalletCode = "";
+                        }
+                        else
+                        {
+                            stationInfo.PalletCode = palletCode;
+                        }
+                        stationInfo.StationStatus = locationStatusEnum.ObjToInt();
+                        _stationInfo.UpdateData(stationInfo);
+                    }
                 }
                 else if (deviceTypeEnum == DeviceTypeEnum.YuanLiJuHe)
                 {

--
Gitblit v1.9.3