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_Tasks/TSJJob.cs | 112 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 40 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 e27a421..49bc592 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"
@@ -48,7 +48,7 @@
//Example
//device.GetValue 璇诲彇
//device.SetValue 鍐欏叆
- // _taskService.Repository 浠撳偍灞傦紝杩涜鏁版嵁搴撹闂�-
+ // _taskService.Repository 浠撳偍灞傦紝杩涜鏁版嵁搴撹闂�
try
{
List<Dt_Task> Uptasks = new List<Dt_Task>();
@@ -69,20 +69,48 @@
continue;
//throw new Exception("璁惧鏁呴殰");
}
- if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt()|| task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt())
{
- //鍒ゆ柇3妤煎叆搴撶鍙锋湁鏃�
- if (device.GetValue<HoistEnum, string>(HoistEnum.OutboundInplace, "TSJ") == "1")
+ if (task.TaskType == TaskTypeEnum.RK3F.ObjToInt())
{
- if (task.ExceptionMessage == "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊")
+ //鍒ゆ柇3妤煎叆搴撶鍙锋湁鏃�
+ if (device.GetValue<HoistEnum, short>(HoistEnum.OutboundInplace, task.SourceAddress) != 2)
{
+ if (task.ExceptionMessage == "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊")
+ {
+ continue;
+ }
+ task.ExceptionMessage = "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊";
+ Uptasks.Add(task);
continue;
}
- task.ExceptionMessage = "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊";
- Uptasks.Add(task);
- continue;
}
-
+ else
+ {
+ //鍥炵┖绠辩殑鏃跺�欒璇讳竴涓悧
+ if (device.GetValue<HoistEnum, string>(HoistEnum.Emptycontainernumber, task.SourceAddress) == null)
+ {
+ if (task.ExceptionMessage != "4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��")
+ {
+ task.ExceptionMessage = "4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��";
+ Uptasks.Add(task);
+ }
+ continue;
+ }
+ //鍒ゆ柇4妤肩┖绠卞埌浣�
+ if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, task.SourceAddress) == 2)
+ {
+ if (task.ExceptionMessage != "TSJ4妤煎洖鏂欑涓虹┖")
+ {
+ task.ExceptionMessage = "TSJ4妤煎洖鏂欑涓虹┖";
+ Uptasks.Add(task);
+ }
+ continue;
+ }
+
+ }
+
+
//鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
if (result.Status == false)
@@ -97,6 +125,7 @@
task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
task.ExceptionMessage = "";
Uptasks.Add(task);
+
//杩欓噷浠诲姟鍙樻垚浜咰heckPalletCodeing
}
@@ -105,7 +134,7 @@
////鍑哄簱鏂欑缂撳瓨鏁伴噺(杩欎釜鏄簱鍖烘煡璇㈢殑鏃跺�欒鏌ヤ竴涓嬶紝杩旂粰wms)
//if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("娌℃湁鍑哄簱鏂欑缂撳瓨鏁伴噺涓虹┖");
//璇诲彇3妤煎嚭搴撴枡绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJ") != 1)
+ if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, task.TargetAddress) != 1)
{
if (task.ExceptionMessage != "3妤煎嚭搴撴枡绠辨病鏈夊埌浣�")
{
@@ -126,31 +155,34 @@
continue;
}
task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
+ task.ExceptionMessage = "";
Uptasks.Add(task);
}
- else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//4妤煎叆搴�
+ else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//鍜�3妤煎嚭搴撲腑涓�鏍凤紱
{
- //鍥炵┖绠辩殑鏃跺�欒璇讳竴涓悧
- if (device.GetValue<HoistEnum, short>(HoistEnum.Emptycontainernumber, "TSJ") == null) throw new Exception($"4妤肩┖绠�,璇荤爜鍣ㄦ病鏈夎鍒板��");
-
- //鍒ゆ柇4妤肩┖绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.ReturnbinAvailable, "TSJ") == 2) throw new Exception("4妤煎洖鏂欑涓虹┖");
- if (_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Status == false) throw new Exception($"3妤煎嚭搴撲换鍔′妇琛屾墽琛屽け璐ワ紝閿欒淇℃伅{_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Message}");//缁欎换鍔″彿
- //鍐欏叆绌虹鏀惧埌浣嶄俊鍙�
- device.SetValue(HoistEnum.Emptyboxplacedinposition, "TSJ", "1");
- }
- else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt()) //鍥涙ゼ搴撳唴鍒版彁鍗囨満
- {
-
+ #region 4妤煎嚭搴�
//4妤煎嚭搴撴枡绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox,"TSJ") == 2) throw new Exception("4妤煎嚭搴撴枡绠辨病鏈夊埌浣�");
- //鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
- device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "TSJ", "1");
+ if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, task.TargetAddress) != 2)
+ {
+ if (task.ExceptionMessage != "4妤煎嚭搴撴枡绠辨病鏈夊埌浣�")
+ {
+ task.ExceptionMessage = "3妤煎叆搴撶鍙锋湁璐э紝璇峰厛澶勭悊";
+ Uptasks.Add(task);
+ }
+ continue;
+ }
+
+ #endregion
+ task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
+ task.ExceptionMessage = "";
+ Uptasks.Add(task);
}
-
-
+ //else if (task.TaskType == TaskTypeEnum.CHUKU1.ObjToInt()) //鍥涙ゼ搴撳唴鍒版彁鍗囨満
+ //{
+
+
+ //}
}
-
//鏌ユ壘涓夋ゼ鍏ュ簱浠诲姟鐘舵�佷负CheckPalletCodeing鐨勪换鍔℃墭鐩樺彿纭涓�
var RK3FTasks = _taskService.Repository.QueryFirst(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt() && x.TaskState == (int)TaskStatusEnum.CheckPalletCodeing);
@@ -160,17 +192,17 @@
//妫�鏌�3妤煎叆搴撶鍙锋槸澶氬皯锛岀劧鍚庝紶缁檞ms
var BinNumber = device.GetValue<HoistEnum, string>(HoistEnum.Inboxnumber, "TSJ");
//鏍规嵁璇诲埌鐨勭鍙疯繘琛屾枡绠辨楠岋紝妫�楠岄�氳繃灏辫Е鍙戣鐮佸櫒璇诲彇锛屽鏋滀笉閫氳繃灏辨姏鍑哄紓甯�
- 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 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);
--
Gitblit v1.9.3