From 0875bfa35d389e238ae82142ce45b71c9715133b Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 17 四月 2026 17:37:39 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 74 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 34 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 cd05af9..6d7749c 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"
@@ -102,36 +102,39 @@
//鍏ユ彁鍗囨満
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 (task.CurrentAddress==task.TargetAddress)
{
- bool Work = false;
- try
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒版彁鍗囨満淇℃伅";
+ else
{
- if (device.IsConnected)
+ bool Work = false;
+ try
{
- int i = 0;
- while (!Work && i <= 3)
+ if (device.IsConnected)
{
- i++;
- Work = device.SetValue(HoistEnum.Inboundboxon, 1, task.TargetAddress);
- Thread.Sleep(500);
+ int i = 0;
+ while (!Work && i <= 3)
+ {
+ i++;
+ Work = device.SetValue(HoistEnum.Inboundboxon, 1, task.CurrentAddress);
+ Thread.Sleep(500);
+ }
+ }
+ if (!Work)
+ {
+ task.ExceptionMessage = $"銆恵task.CurrentAddress}銆戝啓鍏�3妤煎叆搴撶鏀惧埌浣嶅け璐�";
+ task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.CurrentAddress}";
}
}
- if (!Work)
+ catch (Exception ex)
{
- task.ExceptionMessage = $"銆恵task.TargetAddress}銆戝啓鍏�3妤煎叆搴撶鏀惧埌浣嶅け璐�";
- task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.TargetAddress}";
+ task.ExceptionMessage = $"銆恵task.CurrentAddress}銆戝啓鍏�3妤煎叆搴撶鏀惧埌浣嶅け璐ワ紒{ex.Message}";
+ task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.CurrentAddress}";
}
}
- catch (Exception ex)
- {
- task.ExceptionMessage = $"銆恵task.TargetAddress}銆戝啓鍏�3妤煎叆搴撶鏀惧埌浣嶅け璐ワ紒{ex.Message}";
- task.Remark = $"{device.DeviceCode}_Inboundboxon_{1}_{task.TargetAddress}";
- }
+ BaseDal.UpdateData(task);
}
- BaseDal.UpdateData(task);
}
//3 鍑烘彁鍗囨満 涔嬪墠鏄疉GV_ToExecute
@@ -165,7 +168,7 @@
task.ExceptionMessage = $"銆恵task.SourceAddress}銆戝啓鍏�3妤煎嚭搴撶鏀惧埌浣嶅け璐ex.Message}";
task.Remark = $"{device.DeviceCode}_Outboundboxon_{1}_{task.SourceAddress}"; throw;
}
-
+
}
BaseDal.UpdateData(task);
}
@@ -201,7 +204,7 @@
task.ExceptionMessage = $"銆恵task.TargetAddress}銆戝啓鍏�4妤肩┖绠辨斁鍒颁綅澶辫触{ex.Message}";
task.Remark = $"{device.DeviceCode}_Emptyboxplacedinposition_{1}_{task.TargetAddress}";
}
-
+
}
BaseDal.UpdateData(task);
}
@@ -237,7 +240,7 @@
task.ExceptionMessage = $"銆恵task.SourceAddress}銆戝啓鍏�4妤煎嚭搴撳彇绠卞畬鎴愬け璐ex.Message}";
task.Remark = $"{device.DeviceCode}_Outboundboxretrievalcompleted_{1}_{task.SourceAddress}";
}
-
+
}
BaseDal.UpdateData(task);
}
@@ -274,7 +277,7 @@
task.ExceptionMessage = $"銆恵Address}銆戝叧闂姹傝繘鍏ュけ璐ワ紒{ex.Message}";
task.Remark = $"{device.DeviceCode}_RequestToEnter_{false}_{Address}";
}
-
+
}
BaseDal.UpdateData(task);
}
@@ -318,7 +321,7 @@
task.ExceptionMessage = $"銆怲SJR3F銆�3妤艰鐮佽Е鍙戝け璐ワ紒{ex.Message}";
task.Remark = $"{device.DeviceCode}_Codereadingtriggered_{1}_TSJR3F";
}
-
+
}
task.TaskState = (int)TaskStatusEnum.CheckPalletCodeing;
BaseDal.UpdateData(task);
@@ -375,7 +378,7 @@
var task = BaseDal.QueryFirst(x => x.PalletCode == Rgv.content.podID);
if (task == null) throw new Exception($"鏈壘鍒颁换鍔�,浠诲姟缂栧彿銆恵Rgv.content.taskID}銆�");
//绉诲簱
- if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.CPMoveInventory.ObjToInt() && string.IsNullOrEmpty(task.WMSTaskNum))
{
if (Rgv.messageType == 72)
{
@@ -419,15 +422,18 @@
if (task.TaskType == (int)TaskTypeEnum.CPInbound && task.TaskState == (int)TaskStatusEnum.Execut)
{
task.TaskState = (int)TaskStatusEnum.WaiCheckShape;
- //BaseDal.UpdateData(task);//缁欒川妫�闂ㄥ啓鍏ュ惎鍔ㄤ俊鍙�
- var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
- if (device == null) task.ExceptionMessage = "鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�";
- else
+ if (task.SourceAddress != "OUT-01")
{
- if (device.IsConnected)
- device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
+ //BaseDal.UpdateData(task);//缁欒川妫�闂ㄥ啓鍏ュ惎鍔ㄤ俊鍙�
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
+ if (device == null) task.ExceptionMessage = "鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�";
else
- task.ExceptionMessage = "1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�";
+ {
+ if (device.IsConnected)
+ device.SetValue(QualityInspectionCommandEnum.StartqualityInspection, true, task.SourceAddress);
+ else
+ task.ExceptionMessage = "1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�";
+ }
}
TaskFeedback(task, 4);
}
@@ -684,7 +690,7 @@
{
if (locationStatusEnum == LocationStatusEnum.Free) //濡傛灉璧风偣瀹屾垚灏辩粰璐т綅璧嬪�兼墭鐩樺彿
{
- stationManger.Remark ="";
+ stationManger.Remark = "";
stationManger.IsOccupied = LocationStatusEnum.Free.ObjToInt();
}
else
--
Gitblit v1.9.3