From 8d6df8d172989427be0b9e42d616f95b2730820e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期日, 22 三月 2026 13:06:35 +0800
Subject: [PATCH] 优化job
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 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 914c4fe..3a12d21 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"
@@ -21,6 +21,7 @@
using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
+using WIDESEAWCS_QuartzJob.DTO;
namespace WIDESEAWCS_TaskInfoService
{
@@ -82,6 +83,30 @@
break;
case "outbin"://绂诲紑璧风偣
{
+
+ ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
+ TaskFromCompleted(task, deviceTypeEnum);
+ }
+ break;
+ case "finish"://绂诲紑鎻愬崌鏈�
+ {
+
+ //鍏ユ彁鍗囨満
+ 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
+ {
+ DeviceProDTO? deviceProDTO = device.DeviceProDTOs.FirstOrDefault((DeviceProDTO x) => x.DeviceProParamName == HoistEnum.Inboundboxon.ToString());
+ if (device.IsConnected)
+ device.SetValue(HoistEnum.Inboundboxon, 1);//鍏ュ簱瀹屾垚
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
+
+ //鍑烘彁鍗囨満
if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() && task.TaskState == (int)TaskStatusEnum.AGV_ToExecute)
{
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
@@ -89,13 +114,38 @@
else
{
if (device.IsConnected)
- device.SetValue(HoistEnum.Outboundboxon, 1);
+ device.SetValue(HoistEnum.Outboundboxon, 1);//鍑哄簱瀹屾垚
else
task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
}
}
- ///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
- TaskFromCompleted(task, deviceTypeEnum);
+ //鍥涙ゼ 鍏ュ簱
+ if (task.TaskType == TaskTypeEnum.CHUKU1.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.Emptyboxplacedinposition, 1);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
+ //鍥涙ゼ 鍑哄簱
+ if (task.TaskType == TaskTypeEnum.Q1TSJ4.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.Outboundboxretrievalcompleted, "1");
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
}
break;
case "into"://鐢宠杩涘叆鎻愬崌鏈�
@@ -113,18 +163,7 @@
case "end"://浠诲姟瀹屾垚閫氱煡
{
///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
- 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);
- else
- task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
- }
- }
+
TaskCompleted(task, deviceTypeEnum);
}
break;
--
Gitblit v1.9.3