From 4d2b6fea8d08c95bd6bb2b8c2b1228383110457e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 12:48:46 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs"
index b0b4028..d6d47e9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs"
@@ -30,7 +30,7 @@
{
[DisallowConcurrentExecution]
public class TSJJob : JobBase, IJob
- {
+ {
private readonly ITaskService _taskService;
private readonly IStationMangerService _stationMangerService;
public TSJJob(ITaskService taskService, IStationMangerService stationMangerService)
@@ -146,6 +146,16 @@
}
continue;
}
+
+ if (device.GetValue<HoistEnum, short>(HoistEnum.ROutScanningCompletionSignal, task.SourceAddress) != 1)
+ {
+ if (task.ExceptionMessage != "4妤兼彁鍗囨満鍑哄彛鎵爜瀹屾垚淇″彿娌℃湁瀹屾垚")
+ {
+ task.ExceptionMessage = "4妤兼彁鍗囨満鍑哄彛鎵爜瀹屾垚淇″彿娌℃湁瀹屾垚";
+ Uptasks.Add(task);
+ }
+ continue;
+ }
}
//鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
@@ -162,6 +172,7 @@
task.ExceptionMessage = "";
Uptasks.Add(task);
}
+
}
@@ -170,33 +181,41 @@
var RK3FTasks = _taskService.Repository.QueryFirst(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt() && x.TaskState == (int)TaskStatusEnum.CheckPalletCodeing);
if (RK3FTasks != null)
{
- var Barcode = device.SetValue<HoistEnum, short>(HoistEnum.Codereadingtriggered, 1);
//妫�鏌�3妤煎叆搴撶鍙锋槸澶氬皯锛岀劧鍚庝紶缁檞ms
var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, RK3FTasks.TargetAddress);
- //鏍规嵁璇诲埌鐨勭鍙疯繘琛屾枡绠辨楠岋紝妫�楠岄�氳繃灏辫Е鍙戣鐮佸櫒璇诲彇锛屽鏋滀笉閫氳繃灏辨姏鍑哄紓甯�
- //var Verification = _taskService.MaterialBoxInspection(RK3FTasks.WMSTaskNum, BinNumber.ToString());
- //if (!Verification.Status)
- //{
- // if (!(RK3FTasks.ExceptionMessage == Verification.Message))
- // {
- // RK3FTasks.ExceptionMessage = Verification.Message;
- // Uptasks.Add(RK3FTasks);
- // }
- // //鏂欑楠岃瘉鍐欏ソ鍚庯紝闇�瑕佹洿鏀�
- // RK3FTasks.TargetAddress = Verification.Data.ToString();
- //}
-
- //濡傛灉鏂欑妫�楠屾垚鍔熷氨鍐欏叆璇荤爜鍣ㄧ殑鍊�
- var result = _taskService.Hikvisiontaskscontinue(RK3FTasks.WMSTaskNum, RK3FTasks.TargetAddress);
- if (result.Status == false)
+ BinNumber = BinNumber?.TrimEnd('\0')?.Substring(2);
+ if (device.GetValue<HoistEnum, short>(HoistEnum.RInScanningCompletionSignal, RK3FTasks.TargetAddress ) !=1 )
{
- if (RK3FTasks.ExceptionMessage != result.Message)
- {
- RK3FTasks.ExceptionMessage = result.Message;
- Uptasks.Add(RK3FTasks);
- }
+ RK3FTasks.ExceptionMessage = "3妤兼壂鐮佸畬鎴愪俊鍙锋病鏈夊畬鎴�";
}
- RK3FTasks.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
+ else //瀹屾垚灏辨妸浠诲姟鐘舵�佹敼鎴愭墭鐩樺彿纭瀹屾垚
+ {
+ //鏍规嵁璇诲埌鐨勭鍙疯繘琛屾枡绠辨楠岋紝妫�楠岄�氳繃灏辫Е鍙戣鐮佸櫒璇诲彇锛屽鏋滀笉閫氳繃灏辨姏鍑哄紓甯�
+ //var Verification = _taskService.MaterialBoxInspection(RK3FTasks.WMSTaskNum, BinNumber.ToString());
+ //if (!Verification.Status)
+ //{
+ // if (!(RK3FTasks.ExceptionMessage == Verification.Message))
+ // {
+ // RK3FTasks.ExceptionMessage = Verification.Message;
+ // Uptasks.Add(RK3FTasks);
+ // }
+ // //鏂欑楠岃瘉鍐欏ソ鍚庯紝闇�瑕佹洿鏀�
+ // RK3FTasks.TargetAddress = Verification.Data.ToString();
+ //}
+
+ //濡傛灉鏂欑妫�楠屾垚鍔熷氨鍐欏叆璇荤爜鍣ㄧ殑鍊�
+ var result = _taskService.Hikvisiontaskscontinue(RK3FTasks.WMSTaskNum, RK3FTasks.TargetAddress);
+ if (result.Status == false)
+ {
+ if (RK3FTasks.ExceptionMessage != result.Message)
+ {
+ RK3FTasks.ExceptionMessage = result.Message;
+ Uptasks.Add(RK3FTasks);
+ }
+ }
+ RK3FTasks.ExceptionMessage = "";
+ RK3FTasks.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
+ }
Uptasks.Add(RK3FTasks);
}
#endregion
--
Gitblit v1.9.3