From 687aeb1192d8bb180ae9eb848a667436186c9898 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 21 三月 2026 14:29:27 +0800
Subject: [PATCH] 优化
---
项目资料/与设备交互接口/高普PLC-WCS通讯变量表.xlsx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskMethods.cs | 16 +++++++-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/TSJJob.cs | 67 +++++++++++++++++++--------------
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 12 +++++
4 files changed, 64 insertions(+), 31 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 02ae60f..914c4fe 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"
@@ -80,8 +80,20 @@
task.TaskState = (int)TaskStatusEnum.Takeing;
TaskFeedback(task, 1);
break;
- case "outbin":
+ case "outbin"://绂诲紑璧风偣
{
+ if (task.TaskType == TaskTypeEnum.CK3F.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.Outboundboxon, 1);
+ else
+ task.ExceptionMessage = "鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�";
+ }
+ }
///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
TaskFromCompleted(task, deviceTypeEnum);
}
@@ -98,7 +110,7 @@
BaseDal.UpdateData(task);
}
break;
- case "end":
+ case "end"://浠诲姟瀹屾垚閫氱煡
{
///鍒ゆ柇浠诲姟鏄惁璺熻澶囨湁鍏�
if(task.TaskType== TaskTypeEnum.RK3F.ObjToInt()&& task.TaskState == (int)TaskStatusEnum.CheckPalletCodeFinish)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index cfab50c..cedaf63 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -1137,7 +1137,17 @@
}
else if (getLocationInfo.WarehouseId == 3)
{
-
+ //杩欓噷鏄彁鍗囨満鐨�
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device == null) throw new Exception("鏈壘鍒版彁鍗囨満璁惧淇℃伅");
+ if (!device.IsConnected) throw new Exception("PLC1鎻愬崌鏈鸿澶囪繛鎺ュけ璐�");
+ var value = device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ");
+ list.Add(new
+ {
+ LoctionCode = value,
+ LocationStatus = value!=0? 100 : 0,
+ EnableStatus = 0,
+ });
}
else if (getLocationInfo.WarehouseId == 4)
{
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 870675c..e27a421 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"
@@ -41,7 +41,6 @@
public Task Execute(IJobExecutionContext context)
{
-
bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
if (flag && value != null)
{
@@ -103,16 +102,31 @@
}
else if(task.TaskType == TaskTypeEnum.CK3F.ObjToInt()) //鍑哄簱
{
- ////鍑哄簱鏂欑缂撳瓨鏁伴噺
+ ////鍑哄簱鏂欑缂撳瓨鏁伴噺(杩欎釜鏄簱鍖烘煡璇㈢殑鏃跺�欒鏌ヤ竴涓嬶紝杩旂粰wms)
//if (device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ") == 0) throw new Exception("娌℃湁鍑哄簱鏂欑缂撳瓨鏁伴噺涓虹┖");
//璇诲彇3妤煎嚭搴撴枡绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJ") != 1) throw new Exception("3妤煎嚭搴撴枡绠辨病鏈夊埌浣�");
+ if (device.GetValue<HoistEnum, short>(HoistEnum.SOutboundmaterialbox, "TSJ") != 1)
+ {
+ if (task.ExceptionMessage != "3妤煎嚭搴撴枡绠辨病鏈夊埌浣�")
+ {
+ task.ExceptionMessage = "3妤煎嚭搴撴枡绠辨病鏈夊埌浣�";
+ Uptasks.Add(task);
+ }
+ continue;
+ }
//鐒跺悗璋冪敤杈撻�佺嚎鎺ュ彛锛岄�氱煡杈撻�佺嚎鏈夋枡绠遍渶瑕佸叆搴擄紝浠诲姟涓捐鎵ц
- if (_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Status == false) throw new Exception($"3妤煎嚭搴撲换鍔′妇琛屾墽琛屽け璐ワ紝閿欒淇℃伅{_taskService.Hikvisiontaskscontinue(task.WMSTaskNum).Message}");//缁欎换鍔″彿
-
- //鍘绘洿鏂颁换鍔￠噷鍐欏��
- //鍐�3妤煎嚭搴撶鍙栬揣瀹屾垚
- device.SetValue<HoistEnum, short>(HoistEnum.Outboundboxon, 1);
+ var result = _taskService.Hikvisiontaskscontinue(task.WMSTaskNum);
+ if (result.Status == false)
+ {
+ if (task.ExceptionMessage != result.Message)
+ {
+ task.ExceptionMessage = result.Message;
+ Uptasks.Add(task);
+ }
+ continue;
+ }
+ task.TaskState = (int)TaskStatusEnum.AGV_ToExecute;
+ Uptasks.Add(task);
}
else if (task.TaskType == TaskTypeEnum.Q1TSJ4.ObjToInt())//4妤煎叆搴�
{
@@ -129,7 +143,7 @@
{
//4妤煎嚭搴撴枡绠卞埌浣�
- if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox, "TSJ") == 2) throw new Exception("4妤煎嚭搴撴枡绠辨病鏈夊埌浣�");
+ if (device.GetValue<HoistEnum, short>(HoistEnum.FOutboundmaterialbox,"TSJ") == 2) throw new Exception("4妤煎嚭搴撴枡绠辨病鏈夊埌浣�");
//鍐欎互涓�涓嚭搴撳畬鎴愪俊鍙�
device.SetValue(HoistEnum.Outboundboxretrievalcompleted, "TSJ", "1");
}
@@ -139,40 +153,37 @@
//鏌ユ壘涓夋ゼ鍏ュ簱浠诲姟鐘舵�佷负CheckPalletCodeing鐨勪换鍔℃墭鐩樺彿纭涓�
- var RK3FTasks = taskList.Where(x => x.TaskType == TaskTypeEnum.RK3F.ObjToInt()&&x.TaskState== (int)TaskStatusEnum.CheckPalletCodeing).ToList();
- foreach (var item in RK3FTasks)
+ 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, "TSJ");
//鏍规嵁璇诲埌鐨勭鍙疯繘琛屾枡绠辨楠岋紝妫�楠岄�氳繃灏辫Е鍙戣鐮佸櫒璇诲彇锛屽鏋滀笉閫氳繃灏辨姏鍑哄紓甯�
- var Verification = _taskService.MaterialBoxInspection(item.WMSTaskNum, BinNumber.ToString());
- if (!Verification.Status)
+ var Verification = _taskService.MaterialBoxInspection(RK3FTasks.WMSTaskNum, BinNumber.ToString());
+ if (!Verification.Status)
{
- if (!(item.ExceptionMessage == Verification.Message))
+ if (!(RK3FTasks.ExceptionMessage == Verification.Message))
{
- item.ExceptionMessage = Verification.Message;
- Uptasks.Add(item);
+ RK3FTasks.ExceptionMessage = Verification.Message;
+ Uptasks.Add(RK3FTasks);
}
//鏂欑楠岃瘉鍐欏ソ鍚庯紝闇�瑕佹洿鏀�
- item.TargetAddress = Verification.Data.ToString();
- }
-
+ RK3FTasks.TargetAddress = Verification.Data.ToString();
+ }
+
//濡傛灉鏂欑妫�楠屾垚鍔熷氨鍐欏叆璇荤爜鍣ㄧ殑鍊�
- var result = _taskService.Hikvisiontaskscontinue(item.WMSTaskNum, item.TargetAddress);
+ var result = _taskService.Hikvisiontaskscontinue(RK3FTasks.WMSTaskNum, RK3FTasks.TargetAddress);
if (result.Status == false)
{
- if (item.ExceptionMessage != result.Message)
+ if (RK3FTasks.ExceptionMessage != result.Message)
{
- item.ExceptionMessage = result.Message;
- Uptasks.Add(item);
+ RK3FTasks.ExceptionMessage = result.Message;
+ Uptasks.Add(RK3FTasks);
}
- continue;
}
- item.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
-
-
- Uptasks.Add(item);
+ RK3FTasks.TaskState = (int)TaskStatusEnum.CheckPalletCodeFinish;
+ Uptasks.Add(RK3FTasks);
}
if (Uptasks.Count > 0)
{
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\350\256\276\345\244\207\344\272\244\344\272\222\346\216\245\345\217\243/\351\253\230\346\231\256PLC-WCS\351\200\232\350\256\257\345\217\230\351\207\217\350\241\250.xlsx" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\350\256\276\345\244\207\344\272\244\344\272\222\346\216\245\345\217\243/\351\253\230\346\231\256PLC-WCS\351\200\232\350\256\257\345\217\230\351\207\217\350\241\250.xlsx"
new file mode 100644
index 0000000..dd6c8e1
--- /dev/null
+++ "b/\351\241\271\347\233\256\350\265\204\346\226\231/\344\270\216\350\256\276\345\244\207\344\272\244\344\272\222\346\216\245\345\217\243/\351\253\230\346\231\256PLC-WCS\351\200\232\350\256\257\345\217\230\351\207\217\350\241\250.xlsx"
Binary files differ
--
Gitblit v1.9.3