From 83a7b2db0150d30576461055707367e8189ebc6e Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 25 六月 2025 17:29:08 +0800
Subject: [PATCH] 交互修改
---
process/TaskProcess.cs | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 5006ef2..86cec16 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -141,7 +141,17 @@
else if (state == 1004) {
LogHelper.Info($"绛夊緟浜や簰锛屼换鍔″彿={mst.S_CODE}", "瀹夊叏浜や簰");
- var wcsCode = mst.S_CODE.Replace(@"_1", "_2");
+ var wcsCode = "";
+
+ if (mst.S_TYPE.Contains("鍏ュ簱")|| mst.S_TYPE.Contains("鍥炲簱"))
+ {
+ wcsCode = mst.S_CODE.Replace(@"_1", "_2");
+ }
+
+ if (mst.S_TYPE.Contains("鍑哄簱"))
+ {
+ wcsCode = mst.S_CODE.Replace(@"_2", "_1");
+ }
LogHelper.Info($"绛夊緟浜や簰锛屾煡璇㈡牎楠屼换鍔″彿={wcsCode}", "瀹夊叏浜や簰");
//绛夊緟rfid鏍￠獙
@@ -152,7 +162,16 @@
{
if (rfidFlag.S_RESULT.Contains("鎴愬姛"))
{
- LogHelper.Info($"浠诲姟鍙�{mst.S_CODE}锛岀瓑寰呬氦绠℃垚鍔燂紝淇敼鍙傛暟", "瀹夊叏浜や簰");
+ LogHelper.Info($"浠诲姟鍙�{mst.S_CODE}锛岀瓑寰呬氦绠℃垚鍔燂紝淇敼鍙傛暟6涓�", "瀹夊叏浜や簰");
+ NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
+ }
+ else {
+ var startSite = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
+ var endSite = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
+ LogHelper.Info($"浠诲姟{mst.S_CODE}RFID鏍￠獙澶辫触锛屾敼鍙傛暟1涓簕startSite},鏀瑰弬鏁�涓簕endSite}锛屽弬鏁�涓�锛�涓�", "鏀归亾瀹夊叏浜や簰");
+ NDCApi.ChangeOrderParam(mst.S_CODE, 1, startSite);
+ NDCApi.ChangeOrderParam(mst.S_CODE, 2, endSite);
+ NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
}
}
@@ -246,9 +265,9 @@
db.Updateable(kt).UpdateColumns(it => new { it.Status }).ExecuteCommand();
db.CommitTran();
var site = LocationHelper.GetAgvSiteZc(end.S_CODE);
- LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�锛�涓�", "鏀归亾瀹夊叏浜や簰");
+ LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�锛�涓�", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
- NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
+ NDCApi.ChangeOrderParam(task.S_CODE, 6, "2");
NDCApi.ChangeOrderParam(task.S_CODE, 4, "0");
return;
}
@@ -364,9 +383,9 @@
db.CommitTran();
var site = LocationHelper.GetAgvSiteZc(loc.S_CODE);
- LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�,4涓�024", "鏀归亾瀹夊叏浜や簰");
+ LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�,4涓�024", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
- NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
+ NDCApi.ChangeOrderParam(task.S_CODE, 6, "2");
NDCApi.ChangeOrderParam(task.S_CODE, 4, "1024");
//} else if (workFlow.FLOWNAME.Contains("鍑哄簱")) {
@@ -490,7 +509,13 @@
ndcParme.Add(new param() { name = "DATA", value = "0" });
}
else {
- ndcParme.Add(new param() { name = "DATA", value = "768" });
+ if (work.S_TYPE.Contains("鍏ュ簱") || work.S_TYPE.Contains("鍥炲簱"))
+ {
+ ndcParme.Add(new param() { name = "DATA", value = "768" });
+ }
+ else {
+ ndcParme.Add(new param() { name = "DATA", value = "0" });
+ }
}
@@ -1385,6 +1410,8 @@
{
//鏍规嵁鎺ラ┏浣嶄换鍔℃暟閲忚幏鍙栧潎琛℃帴椹充綅闆嗗悎浼樺厛浠诲姟鏁板皯鐨勬帴椹充綅
var balanceConnectionList = LocationHelper.GetBalanceConnectionList(usableConnectionList.available);
+
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍧囪 鎺ラ┏浣�+JsonConvert.SerializeObject(balanceConnectionList), "Mes浠诲姟涓嬪彂");
foreach (var item in balanceConnectionList)
{
if (item.loc.N_CURRENT_NUM<2)
@@ -1582,6 +1609,14 @@
//鍒涘缓浣滀笟
if (WMSHelper.CreateWmsWork(operation))
{
+ if (connection != "")
+ {
+ LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
+ LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
+ LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
+ }
+
+
LogHelper.Info($"ZCSendTask鍏ュ簱浣滀笟鍒涘缓鎴愬姛{operation.S_CODE}", "Mes浠诲姟涓嬪彂");
result.errMsg = "鍏ュ簱浣滀笟鍒涘缓鎴愬姛";
result.errCode = 0;
--
Gitblit v1.9.1