From 71129e21a35a2d4be75ee0f1e96e2c51ced5f23b Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 05 六月 2025 17:25:46 +0800
Subject: [PATCH] 大洋原材料库开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs | 105 ++++++++++++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 49 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..348d2b3 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
@@ -12,6 +12,7 @@
using System.Text;
using static HH.WCS.DaYang.api.ApiModel;
using static HH.WCS.DaYang.util.Settings;
+using static System.Net.WebRequestMethods;
namespace HH.WCS.DaYang.process
{
@@ -109,33 +110,52 @@
internal static bool Intercept(WCSTask mst)
{
var result = false;
- #region 绌烘墭鍥炲簱浠诲姟闇�鍒ゆ柇鏈夋病鏈夋墽琛屼腑鐨勫嚭搴撲换鍔★紝鎺ラ┏浣嶆湁鏃犳墭鐩橈紝濡傛灉鏈夊厛涓嶆帹閫佷换鍔�- if (mst.S_TYPE == "绌烘墭鍥炲簱" && mst.S_SCHEDULE_TYPE == "1")
+ #region 绌烘墭鍥炲簱浠诲姟闇�鍒ゆ柇鏈夋病鏈夋墽琛屼腑鐨勫嚭搴撲换鍔★紝鎺ラ┏浣嶆湁鏃犳墭鐩橈紝濡傛灉鏈夊厛涓嶆帹閫佷换鍔�浠诲姟浠诲姟闇�agv浠诲姟瀹屾垚鍐嶆帹
+ if (mst.S_TYPE == "绌烘墭鍥炲簱")
{
- //鍒ゆ柇鏈夋棤鍑哄簱涓殑浠诲姟
- var task = WCSHelper.GetTaskbyType("鍑哄簱");
- if (task.Count == 0)
- { //鑾峰彇鎺ラ┏浣嶈澶囩姸鎬�- HttpHelper httpHelper = new HttpHelper();
- TableUrl tableUrl = Settings.tableUrls.Find(a => a.id == 3);
- if (tableUrl != null)
- {
- Result<DeviceStatusModel> DeviceStatu = httpHelper.GetDeviceStatus(new string[] { mst.S_END_LOC }, tableUrl.url);
- //璁惧鐘舵�绌哄垯鍏佽鎺ㄩ�
- if (DeviceStatu != null && DeviceStatu.Data[0].PhotoStatus == 0)
+ if (mst.N_SCHEDULE_TYPE == 1)
+ {
+ //鍒ゆ柇鏈夋棤鍑哄簱涓殑浠诲姟
+ var task = WCSHelper.GetTaskbyType("鍑哄簱");
+ if (task.Count == 0)
+ { //鑾峰彇鎺ラ┏浣嶈澶囩姸鎬�+ HttpHelper httpHelper = new HttpHelper();
+ TableUrl tableUrl = Settings.tableUrls.Find(a => a.id == 3);
+ if (tableUrl != null)
{
- result = true;
+ Result<DeviceStatusModel> DeviceStatu = httpHelper.GetDeviceStatus(new string[] { mst.S_END_LOC }, tableUrl.url);
+ //璁惧鐘舵�绌哄垯鍏佽鎺ㄩ�
+ if (DeviceStatu != null && DeviceStatu.Data[0].PhotoStatus == 0)
+ {
+ result = true;
+ }
+ else
+ {
+ LogHelper.Info($"Intercept:璁惧鐘舵�涓嶅厑璁告帹閫�);
+ }
}
else
{
- LogHelper.Info($"Intercept:璁惧鐘舵�涓嶅厑璁告帹閫�);
+ LogHelper.Info($"Intercept:鑾峰彇鎺ュ彛url澶辫触");
}
}
- else
- {
- LogHelper.Info($"Intercept:鑾峰彇鎺ュ彛url澶辫触");
- }
+ }
+ if (mst.N_SCHEDULE_TYPE == 2)
+ {
+ var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
+ if (task != null)
+ { result = true; }
+ }
+ }
+ if (mst.S_TYPE == "鍑哄簱")
+ {
+ //鎺ㄩ�agv浠诲姟锛屽垽鏂澶囦换鍔℃槸鍚﹀畬鎴�+ if (mst.N_SCHEDULE_TYPE == 1)
+ {
+ var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
+ if (task != null)
+ { result = true; }
}
}
#endregion
@@ -317,8 +337,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 +372,21 @@
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();
+ TableUrl tableUrl = Settings.tableUrls.Find(a => a.id == 3);
+ if (tableUrl != null)
+ {
+ var Wcsrsult = http.TaskAssignment(mst, tableUrl.url);
+ if (Wcsrsult.Code == 200)
+ {
+ mst.N_B_STATE = 1;
+ WCSHelper.UpdateStatus(mst);
+ result = true;
+ }
+ }
+ }
return result;
}
--
Gitblit v1.9.1