From b928a2f0011fc867d7d219cfff4b764250f5b778 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 09 七月 2025 17:03:08 +0800
Subject: [PATCH] 修复查交互表更新终点的流程，添加绑定货位写入物料明细表
---
process/TaskProcess.cs | 105 ++++++++++------------------------------------------
1 files changed, 20 insertions(+), 85 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 5dab3ac..ad383c5 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -29,7 +29,6 @@
LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
-
}
/// <summary>
@@ -45,13 +44,10 @@
LocationHelper.UnLockLoc(mst.S_END_LOC);
}
else {
-
//璧风偣缁堢偣瑙ｉ攣
LocationHelper.UnLockLoc(mst.S_START_LOC);
LocationHelper.UnLockLoc(mst.S_END_LOC);
-
}
-
}
/// <summary>
@@ -114,15 +110,31 @@
if (mst.N_B_STATE == 0) {
// 鍘熶唬鐮佺増鏈� //var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = mst.S_START_LOC, dst = mst.S_END_LOC }), "p2p");
- // 灏婇噸鏂囨。鐨勭増鏈紙鏆備笉鑰冭檻淇敼锛屽洜涓烘病鏈夌粓鐐圭珯鐐癸紝涓嶅悎鐞嗭級
- //var startSite = LocationHelper.GetAgvSite(mst.S_START_LOC);
- //var endSite = LocationHelper.GetAgvSite(mst.S_END_LOC);
+ // 灏婇噸鏂囨。鐨勭増鏈�+ var startSite = LocationHelper.GetAgvSite(mst.S_START_LOC);
+ var endSite = LocationHelper.GetAgvSite(mst.S_END_LOC); // 濡傛灉鎵句笉鍒颁細杩斿洖0锛屽氨鏄亣缁堢偣
- var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = mst.S_START_LOC, dst = mst.S_END_LOC }), "p2pdst", "pgapi");
+ //var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = startSite, order_name = $"tet" }), "p2pdst2", "pgapi");
+ //var code = -1;
+ var code = 0;
+ if (taskType == TaskName.浜у搧鍏ュ簱) {
+ //code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = startSite, order_name = $"{mst.S_CODE}" }), "p2pdst", "pgapi");
+ code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = startSite, order_name = $"{mst.S_CODE}" }), "p2pdst2", "pgapi");
+ }
+ else {
+ code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = startSite, dst = endSite }), "p2pcm", "pgapi");
+ }
+ //LogHelper.Info($"eq_task_code={code}");
+ // car_type 榛樿涓�
+ // src_ort 璐ф灦鎺掑彿
+ // dst_orc 璐ф灦灞傛暟锛堝悗涓や釜淇℃伅搴旇涓哄浗鑷狝GV鍐呴儴缁存姢锛屼互鍚庨潰鏇存敼鐨勭粨鏋滀负鍑嗭級
+
+ //var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, $"{{\"src\" = \"{startSite}\", \"dst\" = \"{endSite}\", \"car-type\": 1 }}", "p2pdst", "pgapi");
if (code > 0) {
//鏇存柊浠诲姟鐘舵�
mst.N_B_STATE = 1;
+ mst.S_B_STATE = TN_Task.GetStateStr(1);
mst.S_EQ_TASK_CODE = code.ToString();
WCSHelper.UpdateStatus(mst);
WCSHelper.UpdateEQNo(mst);
@@ -131,83 +143,6 @@
else {
LogHelper.Info($"鍥借嚜鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};" + JsonConvert.SerializeObject(mst));
}
-
- //if (mst.N_SCHEDULE_TYPE == 1)//閫氳繃NDC锛宧osttoagv璋冨害璁惧
- //{
- // start = LocationHelper.GetAgvSite(mst.S_START_LOC);
- // end = LocationHelper.GetAgvSite(mst.S_END_LOC);
-
- // //if (mst.S_TYPE == "绌烘墭涓嬬嚎鍫嗗彔") {
- // // end = LocationHelper.GetAgvSite(mst.S_END_LOC, true);
- // //}
-
- // LogHelper.Info($"NDC鎺ㄩ�浠诲姟 {mst.S_CODE};" + "start=" + start + "end= " + end);
- // var startLoc = LocationHelper.GetLoc(mst.S_START_LOC);
- // var endLoc = LocationHelper.GetLoc(mst.S_END_LOC);
- // var dic = new List<param>();
- // dic.Add(new param() { name = "IKey", value = "IKey" });
- // dic.Add(new param() { name = "From", value = start.ToString() });
- // dic.Add(new param() { name = "To", value = end.ToString() });
- // dic.Add(new param() { name = "FUNC", value = startLoc.N_LAYER.ToString() });
-
- // dic.Add(new param() { name = "Ctype", value = "0" });
-
-
- // //if (mst.S_TYPE == "浣欐枡涓嬬嚎鍏ュ簱" || mst.S_TYPE == "浜哄伐鎷嗙洏鍏ュ簱") {
- // // dic.Add(new param() { name = "DATA", value = "1024" });
- // //}
- // //else {
- // // dic.Add(new param() { name = "DATA", value = "0" });
- // //}
-
- // var res = NDCApi.AddOrderNew(1, 1, mst.S_CODE, dic);//娣诲姞鏂板懡浠�- // if (res != null && (res.err_code == 0 || res.err_code == 50009)) {
- // //鎺ㄩ�鎴愬姛锛屼慨鏀逛换鍔′紭鍏堢骇
- // mst.N_B_STATE = 1;
- // mst.S_B_STATE = TN_Task.GetStateStr(1);
- // WCSHelper.UpdateStatus(mst);//鏇存柊浠诲姟鐘舵�
- // result = true;
- // LogHelper.Info($"NDC鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE}start= {mst.S_START_LOC} + end = {mst.S_END_LOC}");
- // }
- // else {
- // LogHelper.Info($"NDC鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};Res:" + JsonConvert.SerializeObject(res));
- // }
- //}
- //else if (mst.N_SCHEDULE_TYPE == 5)//閫氳繃鏉ゥ璋冨害璁惧
- //{
- // //璋冪涓夋柟鎺ュ彛
- // var model = new HanAo.TaskInfoModel {
- // requestPk = mst.S_CODE,
- // frmPos = mst.S_START_LOC,
- // toPos = mst.S_END_LOC,
- // trkType = mst.S_OP_NAME == "鍏ュ簱" ? "1" : "2",
- // contNo = mst.S_CNTR_CODE
- // };
- // if (HanAo.CreateOrder(model)) {
- // mst.N_B_STATE = 1;
- // WCSHelper.UpdateStatus(mst);
- // LogHelper.Info($"鏉ゥ鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE};" + "start=" + model.frmPos + "end= " + model.toPos);
- // }
- // else {
- // LogHelper.Info($"鏉ゥ鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};" + JsonConvert.SerializeObject(model));
- // }
- //}
- //else if (mst.N_SCHEDULE_TYPE == 3) //閫氳繃鍥借嚜璋冨害璁惧
- //{
- // var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = mst.S_START_LOC, dst = mst.S_END_LOC }), "p2p");
- // if (code > 0) {
- // //鏇存柊浠诲姟鐘舵�
- // mst.N_B_STATE = 1;
- // mst.S_EQ_TASK_CODE = code.ToString();
- // WCSHelper.UpdateStatus(mst);
- // WCSHelper.UpdateEQNo(mst);
- // LogHelper.Info($"鍥借嚜鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE};" + "start=" + mst.S_START_LOC + "end= " + mst.S_END_LOC);
- // }
- // else {
- // LogHelper.Info($"鍥借嚜鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};" + JsonConvert.SerializeObject(mst));
- // }
- //}
-
}
return result;
}
--
Gitblit v1.9.1