From 0ac2d4112295d2d4ef9ca7502af509c2b165f337 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 23 六月 2025 17:31:15 +0800
Subject: [PATCH] 金坛修改
---
core/TaskCore.cs | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/core/TaskCore.cs b/core/TaskCore.cs
index 3108067..77436ae 100644
--- a/core/TaskCore.cs
+++ b/core/TaskCore.cs
@@ -20,7 +20,6 @@
internal class TaskCore
{
public static void OperateTaskStatus(AgvTaskState model) {
-
var wmsTask = TaskHelper.GetTask(model.task_no);
var db = new SqlHelper<object>().GetInstance();
@@ -63,7 +62,11 @@
}
break;
case 2:
- TaskHelper.End(wmsTask);
+ //绌烘墭鍑烘垨鑰呮弧鎵樺嚭浠诲姟瀹屾垚鍒ゆ柇鏄惁瑕佹彁楂樺叆搴撲紭鍏堢骇
+
+ LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
+ TaskProcess.inPri(wmsTask);
+ TaskHelper.End(wmsTask);
break;
case 7:
@@ -78,7 +81,6 @@
TaskProcess.OperateStatus(wcsTask1, 7);
}
}
-
TaskHelper.Fail(wmsTask);
TaskProcess.OperateStatus(wmsTask, 7);
@@ -88,19 +90,19 @@
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
}
- //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
- if (!WcsTask.WcsCvstate(wmsTask))
- {
- LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
- TaskProcess.OperateStatus(wmsTask, 4);
- ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
- }
- break;
+
+ //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
+ if (!WcsTask.WcsCvstate(wmsTask))
+ {
+ LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
+ TaskProcess.OperateStatus(wmsTask, 4);
+ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ }
+ break;
}
- TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
-
+ TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
}
else
{
@@ -108,12 +110,30 @@
TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
}
}
-
}
-
+ public static void addAgvActionState(AgvTaskState model)
+ {
+ var agvAction = new AgvActionState();
+ agvAction.state = model.state;
+ agvAction.task_no = model.task_no;
+ agvAction.ext_data = model.ext_data;
+ agvAction.forklift_no = model.forklift_no;
+ if (TaskHelper.CreateAgvActionState(agvAction))
+ {
+ LogHelper.Info("娣诲姞agv鍔ㄤ綔缂撳瓨鎴愬姛淇℃伅" + JsonConvert.SerializeObject(agvAction), "agv鍔ㄤ綔缂撳瓨");
+ }
+ else {
+ LogHelper.Info("娣诲姞agv鍔ㄤ綔缂撳瓨澶辫触淇℃伅" + JsonConvert.SerializeObject(agvAction), "agv鍔ㄤ綔缂撳瓨");
+ }
+
+ }
+
+
+
+
/// <summary>
--
Gitblit v1.9.1