From 27e00e4c0d354727728ac4b8770b1575b5077399 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 14 七月 2025 17:30:59 +0800
Subject: [PATCH] 出库修改
---
process/TaskProcess.cs | 109 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 32 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 83a4897..c39b185 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -548,9 +548,25 @@
LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽搴旂殑Wcs鍑哄簱浠诲姟鏈墽琛岋紝鏆備笉鎺ㄩ�", "NDC");
return false;
}
+
+ //鎺ラ┏浣嶄袱涓猘gv浠诲姟锛宎浠诲姟鍙栬揣瀹屾垚 鎺ㄩ�b浠诲姟
+ var agvTask = LocationHelper.GetConnectionTask(wmsWork.CONNECTION,"agv");
+
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽綋鍓嶆帴椹充綅{wmsWork.CONNECTION}锛岀涓�釜agv浠诲姟淇℃伅"+JsonConvert.SerializeObject(agvTask), "NDC");
+ if (agvTask==null)
+ {
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽綋鍓嶆帴椹充綅{wmsWork.CONNECTION}锛宎gv浠诲姟娌℃壘鍒帮紝鏆備笉鎺ㄩ�", "NDC");
+ return false;
+ }
+
+ if (agvTask.S_B_STATE!="鍙栬揣瀹屾垚")
+ {
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽綋鍓嶆帴椹充綅{wmsWork.CONNECTION}锛宎gv浠诲姟{agvTask.S_CODE},鐘舵�{agvTask.S_B_STATE}锛屾殏涓嶆帹閫�, "NDC");
+ return false;
+ }
}
- //鎺ラ┏浣嶄袱涓猘gv浠诲姟锛宎浠诲姟鍙栬揣瀹屾垚 鎺ㄩ�b浠诲姟
-
+
+
}
@@ -637,6 +653,15 @@
}
return result;
}
+
+ internal static LocationRecordsResult LocationRecords(LocationRecordsParme model) {
+ var result = new LocationRecordsResult();
+ var db = new SqlHelper<object>().GetInstance();
+
+ return result;
+ }
+
+
internal static Result MesUdeItem(MesUdeItemParme model)
{
@@ -956,34 +981,22 @@
{
var task = TaskHelper.GetTaskByWorkNo(model.task_no, "agv");
- var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no,"wcs");
+ var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no, "wcs");
- if (task != null && wcsTask != null)
+ if (task != null)
{
+ LogHelper.Info($"cancelTask1鍙栨秷agv浠诲姟{task.S_CODE}锛�, "鍙栨秷");
if (task.S_B_STATE.Trim() == "鏈墽琛�)
{
//鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
- LogHelper.Info("cancelTask1鍙栨秷agv浠诲姟锛�, "鍙栨秷");
+ TaskHelper.opMesTask(task, 3);
TaskHelper.Fail(task);
TaskProcess.CacheBitCancelUpdate(task);
- if (task.S_TYPE.Contains("鍏ュ簱") || task.S_TYPE.Contains("鍥炲簱"))
- {
- ContainerHelper.delCntr(task.S_CNTR_CODE);
- ContainerHelper.delCntrItem(task.S_CNTR_CODE);
- }
- else {
- WcsTask.WcsCancellTask(wcsTask);
- }
-
-
- TaskHelper.Fail(wcsTask);
- TaskProcess.OperateStatus(wcsTask, 7);
result.errCode = 0;
result.errMsg = "鍙栨秷鎴愬姛";
result.success = true;
- return result;
}
- else if (task.S_B_STATE.Trim() != "鍙栨秷" && task.S_B_STATE.Trim() != "澶辫触")
+ else if (task.S_B_STATE.Trim() != "鍙栨秷" && task.S_B_STATE.Trim() != "澶辫触" && task.S_B_STATE.Trim() != "瀹屾垚")
{
var db = new SqlHelper<object>().GetInstance();
var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "4").First();
@@ -997,22 +1010,13 @@
result.success = false;
return result;
}
-
+ TaskHelper.opMesTask(task, 3);
//宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
TaskHelper.Fail(task);
-
+
NDCApi.CancelOrder(task.S_CODE.Trim());
TaskProcess.CacheBitCancelUpdate(task);
- if (task.S_TYPE.Contains("鍏ュ簱") || task.S_TYPE.Contains("鍥炲簱"))
- {
- ContainerHelper.delCntr(task.S_CNTR_CODE);
- ContainerHelper.delCntrItem(task.S_CNTR_CODE);
- }
- else {
- WcsTask.WcsCancellTask(wcsTask);
- }
- TaskHelper.Fail(wcsTask);
- TaskProcess.OperateStatus(wcsTask, 7);
+
result.errCode = 0;
result.errMsg = "鍙栨秷鎴愬姛";
result.success = true;
@@ -1030,11 +1034,52 @@
result.errMsg = $"{model.task_no}浠诲姟涓嶅瓨鍦�;
result.success = false;
}
+
+ if (wcsTask != null)
+ {
+ LogHelper.Info($"cancelTask1鍙栨秷Wcs浠诲姟{wcsTask.S_CODE}", "鍙栨秷");
+ if (wcsTask.S_B_STATE.Trim() == "鏈墽琛�)
+ {
+ //鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
+ if (task.S_TYPE.Contains("鍏ュ簱") || task.S_TYPE.Contains("鍥炲簱"))
+ {
+ ContainerHelper.delCntr(task.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(task.S_CNTR_CODE);
+ }
+ TaskHelper.Fail(wcsTask);
+ TaskProcess.OperateStatus(wcsTask, 7);
+ result.errCode = 0;
+ result.errMsg = "鍙栨秷鎴愬姛";
+ result.success = true;
+ return result;
+ }
+ else if (wcsTask.S_B_STATE.Trim() != "鍙栨秷" && wcsTask.S_B_STATE.Trim() != "澶辫触" && wcsTask.S_B_STATE.Trim() != "瀹屾垚")
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == task.S_CODE && a.S_ACTION == "5").First();
+
+
+ if (qhflag != null)
+ {
+ LogHelper.Info($"璇ヤ换鍔task.S_CODE}宸茬粡鍙栬揣瀹屾垚", "鍙栨秷");
+ result.errCode = 1;
+ result.errMsg = "浠诲姟宸茬粡鍙栬揣瀹屾垚锛屼笉鍏佽鍙栨秷";
+ result.success = false;
+ return result;
+ }
+ WcsTask.WcsCancellTask(wcsTask);
+ TaskHelper.Fail(wcsTask);
+ TaskProcess.OperateStatus(wcsTask, 7);
+ result.errCode = 0;
+ result.errMsg = "鍙栨秷鎴愬姛";
+ result.success = true;
+ }
+ }
}
catch (Exception ex)
{
- LogHelper.Info("cancelTask1鍙栨秷浠诲姟寮傚父锛�+ex.Message, "鍙栨秷");
+ LogHelper.Info("cancelTask1鍙栨秷浠诲姟寮傚父锛� + ex.Message, "鍙栨秷");
result.errCode = 1;
result.errMsg = "鍙栨秷浠诲姟寮傚父";
return result;
--
Gitblit v1.9.1