From dc5be5ac7d2a5aae1618fe3d1d8a689d10fdc9dc Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 15 五月 2025 17:09:38 +0800
Subject: [PATCH] 大洋原材料库业务开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
index cb8afc9..cc3be88 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
@@ -110,7 +110,7 @@
{
var result = false;
#region 绌烘墭鍥炲簱浠诲姟闇�鍒ゆ柇鏈夋病鏈夋墽琛屼腑鐨勫嚭搴撲换鍔★紝鎺ラ┏浣嶆湁鏃犳墭鐩橈紝濡傛灉鏈夊厛涓嶆帹閫佷换鍔�- if (mst.S_TYPE == "绌烘墭鍥炲簱" && mst.S_SCHEDULE_TYPE == "1")
+ if (mst.S_TYPE == "绌烘墭鍥炲簱" && mst.N_SCHEDULE_TYPE == 1)
{
//鍒ゆ柇鏈夋棤鍑哄簱涓殑浠诲姟
var task = WCSHelper.GetTaskbyType("鍑哄簱");
@@ -317,8 +317,8 @@
var result = false;
var start = "0"; var end = "0";
var taskType = mst.S_TYPE.Trim();
- // if (mst.N_B_STATE == 0) {
- if (mst.N_SCHEDULE_TYPE == 1)
+
+ if (mst.N_SCHEDULE_TYPE == 1)//agv浠诲姟
{
start = LocationHelper.GetAgvSite(mst.S_START_LOC);
end = LocationHelper.GetAgvSite(mst.S_END_LOC);
@@ -352,34 +352,26 @@
result = true;
}
}
- //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);
- // }
- //}
- //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);
-
- // }
- //}
-
- // }
+ else if (mst.N_SCHEDULE_TYPE == 2)//杈撻�绾夸换鍔�+ {
+ HttpHelper http = new HttpHelper();
+ var url = Settings.tableUrls.Find(a => a.id == 1);
+ if (url != null)
+ {
+ //鎺ㄩ�杈撻�绾夸换鍔�+ var SendResult = http.TaskAssignment(mst, url.url);
+ if (SendResult != null && SendResult.Code == 0)
+ {
+ mst.N_B_STATE = 1;
+ WCSHelper.UpdateStatus(mst);
+ result = true;
+ }
+ }
+ else
+ {
+ LogHelper.Info($"鏈壘鍒颁换鍔′笅鍙戞帴鍙ｅ湴鍧�紝璇锋鏌ラ厤缃枃浠�);
+ }
+ }
return result;
}
--
Gitblit v1.9.1