From 43701568a4a90b3a7a471ac0b34222b1df3efd22 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 02 四月 2026 15:12:03 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs | 148 +++++++++++++++++++++---------------------------
1 files changed, 65 insertions(+), 83 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 f667d86..b2ae635 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)
@@ -69,7 +69,7 @@
continue;
//throw new Exception("璁惧鏁呴殰");
}
- if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt()|| task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt() || task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt() || task.TaskType == TaskTypeEnum.F04.ObjToInt())
{
if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
{
@@ -87,21 +87,15 @@
}
else
{
-
- #region 4妤煎叆搴�
- //4妤煎嚭搴撴枡绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, task.SourceAddress) != 1)
+ if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, task.TargetAddress) != 2)
{
- if (task.ExceptionMessage != "4妤煎叆搴撴枡绠辨病鏈夊埌浣�")
+ if (task.ExceptionMessage != "4F鎻愬崌鏈哄叆鍙ｆ湁璐�")
{
- task.ExceptionMessage = "4妤煎叆搴撴枡绠辨病鏈夊埌浣�";
+ task.ExceptionMessage = "4F鎻愬崌鏈哄叆鍙ｆ湁璐�";
Uptasks.Add(task);
}
continue;
}
-
- #endregion
-
}
@@ -109,7 +103,7 @@
var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
if (result.Status == false)
{
- if (task.ExceptionMessage!= result.Message)
+ if (task.ExceptionMessage != result.Message)
{
task.ExceptionMessage = result.Message;
Uptasks.Add(task);
@@ -123,62 +117,45 @@
//杩欓噷浠诲姟鍙樻垚浜咰heckPalletCodeing
}
- else if(task.TaskType == TaskTypeEnum.CK3F.ObjToInt()) //鍑哄簱
+ else if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt() || task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt() || task.TaskType == TaskTypeEnum.F03.ObjToInt()) //鍑哄簱
{
////鍑哄簱鏂欑缂撳瓨鏁伴噺(杩欎釜鏄簱鍖烘煡璇㈢殑鏃跺�欒鏌ヤ竴涓嬶紝杩旂粰wms)
//if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("娌℃湁鍑哄簱鏂欑缂撳瓨鏁伴噺涓虹┖");
-
- //璇诲彇3妤煎嚭搴撴枡绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, task.SourceAddress) != 1)
+ if (task.TaskType == TaskTypeEnum.CK3F.ObjToInt())
{
- if (task.ExceptionMessage != "3妤煎嚭搴撴枡绠辨病鏈夊埌浣�")
+ //璇诲彇3妤煎嚭搴撴枡绠卞埌浣�
+ if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, task.SourceAddress) != 1)
{
- task.ExceptionMessage = "3妤煎嚭搴撴枡绠辨病鏈夊埌浣�";
- Uptasks.Add(task);
+ if (task.ExceptionMessage != "3妤兼彁鍗囨満鍑哄彛鍏夌數鍙嶉鏃犺揣")
+ {
+ task.ExceptionMessage = "3妤兼彁鍗囨満鍑哄彛鍏夌數鍙嶉鏃犺揣";
+ Uptasks.Add(task);
+ }
+ continue;
}
- continue;
}
- //鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
- var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
- if (result.Status == false)
+ else
{
- if (task.ExceptionMessage != result.Message)
+ if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, task.SourceAddress) != 1)
{
- task.ExceptionMessage = result.Message;
- Uptasks.Add(task);
+ if (task.ExceptionMessage != "4妤兼彁鍗囨満鍑哄彛鍏夌數鍙嶉鏃犺揣")
+ {
+ task.ExceptionMessage = "4妤兼彁鍗囨満鍑哄彛鍏夌數鍙嶉鏃犺揣";
+ Uptasks.Add(task);
+ }
+ continue;
}
- continue;
- }
- task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
- task.ExceptionMessage = "";
- Uptasks.Add(task);
- }
- else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt())//4妤煎嚭搴撲换鍔�
- {
-
- #region 鍑哄簱淇″彿
- //鍥炵┖绠辩殑鏃跺�欒璇讳竴涓悧
- if (device.GetValue<HoistEnum, string>(HoistEnum.Emptycontainernumber, task.TargetAddress) == null)
- {
- if (task.ExceptionMessage != "4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��")
+ if (device.GetValue<HoistEnum, short>(HoistEnum.ROutScanningCompletionSignal, task.SourceAddress) != 1)
{
- task.ExceptionMessage = "4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��";
- Uptasks.Add(task);
+ if (task.ExceptionMessage != "4妤兼彁鍗囨満鍑哄彛鎵爜瀹屾垚淇″彿娌℃湁瀹屾垚")
+ {
+ task.ExceptionMessage = "4妤兼彁鍗囨満鍑哄彛鎵爜瀹屾垚淇″彿娌℃湁瀹屾垚";
+ Uptasks.Add(task);
+ }
+ continue;
}
- continue;
}
- //鍒ゆ柇4妤肩┖绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, task.TargetAddress) != 2)
- {
- if (task.ExceptionMessage != "鎻愬崌鏈哄叆搴撶┖鏃犺揣")
- {
- task.ExceptionMessage = "鎻愬崌鏈哄叆搴撶┖鏃犺揣";
- Uptasks.Add(task);
- }
- continue;
- }
- #endregion
//鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
if (result.Status == false)
@@ -190,51 +167,56 @@
}
continue;
}
-
task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
task.ExceptionMessage = "";
Uptasks.Add(task);
}
- //else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt()) //鍥涙ゼ搴撳唴鍒版彁鍗囨満
- //{
-
-
- //}
+
+
}
+ #region 鎵樼洏鍙风‘璁や腑
//鏌ユ壘涓夋ゼ鍏ュ簱浠诲姟鐘舵�佷负CheckPalletCodeing鐨勪换鍔℃墭鐩樺彿纭涓�
var RK3FTasks = _taskService.Repository.QueryFirst(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt() && x.TaskState == (int)TaskStatusEnum.CheckPalletCodeing);
- if (RK3FTasks!=null)
+ 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)
+ 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.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
+ }
Uptasks.Add(RK3FTasks);
}
+ #endregion
if (Uptasks.Count > 0)
{
_taskService.UpdateData(Uptasks);
--
Gitblit v1.9.3