From 64ec1a7fb55389d8db371d112e49f741de866796 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期三, 18 六月 2025 16:41:26 +0800
Subject: [PATCH] 业务开发与优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs | 86 ++++++++++++++++++++++++++++++-------------
1 files changed, 60 insertions(+), 26 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 cc3be88..8fc972b 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/process/TaskProcess.cs
@@ -8,10 +8,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection.Emit;
using System.Security.Cryptography;
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 +111,70 @@
internal static bool Intercept(WCSTask mst)
{
var result = false;
- #region 绌烘墭鍥炲簱浠诲姟闇�鍒ゆ柇鏈夋病鏈夋墽琛屼腑鐨勫嚭搴撲换鍔★紝鎺ラ┏浣嶆湁鏃犳墭鐩橈紝濡傛灉鏈夊厛涓嶆帹閫佷换鍔�- if (mst.S_TYPE == "绌烘墭鍥炲簱" && mst.N_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.PhotoStatus == 0)
+ {
+ result = true;
+ }
+ else
+ {
+ LogHelper.Info($"Intercept:璁惧鐘舵�涓嶅厑璁告帹閫�);
+ }
}
else
{
- LogHelper.Info($"Intercept:璁惧鐘舵�涓嶅厑璁告帹閫�);
+ LogHelper.Info($"Intercept:鑾峰彇鎺ュ彛url澶辫触");
}
}
- else
+ }
+ if (mst.N_SCHEDULE_TYPE == 2)
+ {
+ var task = WCSHelper.GetTaskByOpName(mst.S_OP_CODE, 3);
+ if (task != null)
{
- LogHelper.Info($"Intercept:鑾峰彇鎺ュ彛url澶辫触");
+ 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;
+ }
+ }
+ else
+ {
+ //濡傛灉褰撳墠浠诲姟涓嶆槸绉诲簱浠诲姟锛岄渶瑕佸垽鏂Щ搴撲换鍔℃槸鍚﹀畬鎴�+ if (mst.S_TYPE != "绉诲簱")
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var ykmst = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == mst.S_OP_NAME && a.N_B_STATE == 3 && a.S_TYPE == "绉诲簱").First();
+ if (ykmst != null)
+ {
+ result = true;
+ }
+ }
+
}
}
#endregion
@@ -355,21 +394,16 @@
else if (mst.N_SCHEDULE_TYPE == 2)//杈撻�绾夸换鍔� {
HttpHelper http = new HttpHelper();
- var url = Settings.tableUrls.Find(a => a.id == 1);
- if (url != null)
+ TableUrl tableUrl = Settings.tableUrls.Find(a => a.id == 3);
+ if (tableUrl != null)
{
- //鎺ㄩ�杈撻�绾夸换鍔�- var SendResult = http.TaskAssignment(mst, url.url);
- if (SendResult != null && SendResult.Code == 0)
+ var Wcsrsult = http.TaskAssignment(mst, tableUrl.url);
+ if (Wcsrsult.Code == 200)
{
mst.N_B_STATE = 1;
WCSHelper.UpdateStatus(mst);
result = true;
}
- }
- else
- {
- LogHelper.Info($"鏈壘鍒颁换鍔′笅鍙戞帴鍙ｅ湴鍧�紝璇锋鏌ラ厤缃枃浠�);
}
}
return result;
--
Gitblit v1.9.1