From 06a8b6963d6d4f229d4e196b4b09ce57e2cbf2dd Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期四, 24 七月 2025 17:21:40 +0800
Subject: [PATCH] 印尼佳通-GT服务开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs
index 5b3675b..7de363a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_BZP/process/TaskProcess.cs
@@ -92,6 +92,16 @@
if (state == 1102)
{
LogHelper.Info("鍚慦CS鍙戦�鍙栬揣瀹屾垚瀹夊叏閫�嚭淇″彿", "AGV");
+ var locCntrRels = LocationHelper.GetLocCntr(cst.S_START_LOC);
+ if (locCntrRels.Count == 1)
+ {
+ var container = ContainerHelper.GetCntr(locCntrRels[0].S_CNTR_CODE);
+ if (container != null && container.N_TYPE == 0)
+ {
+ LogHelper.Info("鍙栬揣瀹屾垚鍚庯紝璧风偣璐т綅瀛樺湪姣嶆嫋锛屼笅鍙戞瘝鎷栧叆搴撲换鍔�, "AGV");
+ ApiHelper.baseTrayInStock(cst.S_START_LOC, mst.S_CODE);
+ }
+ }
/*result = WCSDispatch.safetyInteraction(cst.S_CODE, cst.S_START_LOC, "2"); //鍙栬揣瀹屾垚瀹夊叏閫�嚭*/
result = true;
}
@@ -101,9 +111,9 @@
// 鑳庡湀鍏ュ簱锛屼笅鍙戞瘝鎷栧嚭搴撲换鍔�\ 甯樺竷銆佸唴琛叆搴擄紝涓嬪彂鎵樼洏鍥炲簱浠诲姟
if (cst.S_TYPE.Contains("鍏ュ簱") && endLoc.N_LOCK_STATE == 0)
{
- if (container.N_TYPE != 6 )
+ if (container.N_TYPE != 4 )
{
- if (endLoc.N_CURRENT_NUM == 1)
+ if (endLoc.N_CURRENT_NUM == 0)
{
var locCntrRels = LocationHelper.GetLocCntr(endLoc.S_CODE);
if (locCntrRels != null && locCntrRels.Count > 0)
@@ -112,7 +122,7 @@
if (container1.N_TYPE == 0)
{
LogHelper.Info("闈炶儙鍦堝叆搴擄紝鎺ラ┏浣嶅瓨鍦ㄦ瘝鎷栵紝涓嬪彂姣嶆嫋鍏ュ簱浠诲姟", "AGV");
- ApiHelper.autoBaseTrayInStock(endLoc.S_CODE, mst.S_CODE);
+ ApiHelper.baseTrayInStock(endLoc.S_CODE, mst.S_CODE);
}
}
}
@@ -127,7 +137,7 @@
if (endLoc.N_CURRENT_NUM == 0)
{
LogHelper.Info("鑳庡湀鍏ュ簱锛屾帴椹充綅缂哄皯姣嶆嫋锛屼笅鍙戞瘝鎷栧嚭搴撲换鍔�, "AGV");
- ApiHelper.autoBaseTrayOutStock(endLoc.S_CODE, mst.S_CODE);
+ ApiHelper.baseTrayOutStock(endLoc.S_CODE, mst.S_CODE);
}
else if (endLoc.N_CURRENT_NUM == 1)
{
@@ -163,7 +173,6 @@
// 瀹夊叏璇锋眰鍙戦�鎴愬姛锛屾坊鍔犱换鍔″姩浣滆褰� if (result)
{
- WCSHelper.AddActionRecord(no, state, forkliftNo, extData);
LogHelper.Info($"棣栨杩涜瀹夊叏璇锋眰鎴愬姛", "AGV");
}
}
@@ -214,7 +223,6 @@
if (mst.N_B_STATE == 0) {
var startLoc = LocationHelper.GetLocation(mst.S_START_LOC);
var endLoc = LocationHelper.GetLocation(mst.S_END_LOC);
- var container = ContainerHelper.GetCntr(mst.S_CNTR_CODE);
if (mst.S_SCHEDULE_TYPE == "AGV")
{
AddOrderNewModel model = new AddOrderNewModel()
@@ -247,7 +255,7 @@
};
paramList.Add(param);
}
- model.paramList = paramList;
+ model.param = paramList;
LogHelper.Info($"鍚慉GV涓嬪彂浠诲姟锛屼换鍔″弬鏁帮細{model}", "WMS");
var res = NDCApi.AddOrderNew(model);
if (res != null && res.err_code == 0 || true)
@@ -267,7 +275,6 @@
from = mst.S_START_LOC,
to = mst.S_END_LOC,
cntrNo = mst.S_CNTR_CODE,
- cntrType = container.N_TYPE.ToString(),
};
LogHelper.Info($"鍚慦CS涓嬪彂浠诲姟锛屼换鍔″弬鏁帮細{sendTask}", "WMS");
var bo = WCSDispatch.sendTask(sendTask);
--
Gitblit v1.9.1