From a8627a98b82d2364cbe849ca746e72fbab9916e5 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 21 五月 2025 17:31:14 +0800
Subject: [PATCH] 重构代码修复事务问题，测试完善后台盘点功能
---
process/TaskProcess.cs | 79 ++++++++++++++-------------------------
1 files changed, 28 insertions(+), 51 deletions(-)
diff --git a/Helpers/TaskHelper.cs b/process/TaskProcess.cs
similarity index 82%
rename from Helpers/TaskHelper.cs
rename to process/TaskProcess.cs
index 4115c46..9925ec0 100644
--- a/Helpers/TaskHelper.cs
+++ b/process/TaskProcess.cs
@@ -1,21 +1,14 @@
-锘縰sing HH.WCS.Mobox3.AnGang.ServiceCore;
-using HH.WCS.Mobox3.AnGang.Dispatch;
-using HH.WCS.Mobox3.AnGang.config;
-using HH.WCS.Mobox3.AnGang.Helper;
+锘縰sing HH.WCS.Mobox3.AnGang.dispatch;
+using HH.WCS.Mobox3.AnGang.wms;
using Newtonsoft.Json;
-using Opc.Ua;
using SqlSugar;
-using System;
using System.Collections.Generic;
using System.Linq;
-using System.Security.Cryptography;
-using static HH.WCS.Mobox3.AnGang.Controllers.ApiModel;
-using Org.BouncyCastle.Crypto;
-using HH.WCS.Mobox3.AnGang.Devices;
-using HH.WCS.Mobox3.AnGang.Models;
+using HH.WCS.Mobox3.AnGang.models;
+using System;
namespace HH.WCS.Mobox3.AnGang.process {
- internal class TaskHelper {
+ internal class TaskProcess {
#region 浠诲姟鐩稿叧
//--------------------------------------------------浠诲姟鐩稿叧--------------------------------------------------
/// <summary>
@@ -35,6 +28,7 @@
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>
@@ -59,16 +53,13 @@
}
-
-
/// <summary>
/// 浠诲姟鐘舵�鏇存柊澶勭悊
/// </summary>
/// <param name="mst"></param>
/// <param name="state"></param>
internal static void OperateStatus(TN_Task mst, int state) {
- if (state == 4)
- {
+ if (state == 4) {
CacheBitUpdate(mst, true);
}
if (state == 6)//鍗歌揣瀹屾垚
@@ -87,15 +78,11 @@
/// <param name="state"></param>
/// <param name="forkliftNo"></param>
/// <param name="extData"></param>
- internal static void OperateReq(string no, int state, string forkliftNo, string extData = "")
- {
- if (state == 1101)
- {
+ internal static void OperateReq(string no, int state, string forkliftNo, string extData = "") {
+ if (state == 1101) {
//璇锋眰鍙栬揣锛�-
}
- if (state == 1102)
- {
+ if (state == 1102) {
//璇锋眰鍗歌揣锛� //鏍规嵁缁堢偣鍒ゆ柇锛屾槸cb02鐨勫叆鍙ｏ紝鍒ゆ柇鍐呭瓨涓姸鎬侊紙瑕佺姸鎬佹椂闂达級锛屽厑璁稿嵏璐э紝閫氱煡agv鏀瑰弬鏁� var dic = new Dictionary<string, string>();
@@ -106,8 +93,7 @@
NDC.ChangeOrder(dic);
//鏀瑰畬鍙傛暟杞﹀瓙灏变細鑷繁鍗歌揣
}
- if (state == 1103)
- {
+ if (state == 1103) {
//澶ч搧妗嗗弶璧颁互鍚庨�鐭ワ紝鎴戜滑瑕侀�鐭ヨ緭閫佺嚎
}
}
@@ -115,12 +101,11 @@
private static object locLocker = new object();
- /// <summary>
+ /// <summary>
/// 鎺ㄩ�浠诲姟
/// </summary>
/// <param name="mst"></param>
- internal static bool SendTask(TN_Task mst)
- {
+ internal static bool SendTask(TN_Task mst) {
var result = false;
var start = "0"; var end = "0";
@@ -131,10 +116,9 @@
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);
- }
+ //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);
@@ -147,19 +131,16 @@
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" });
- }
+
+ //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))
- {
+ if (res != null && (res.err_code == 0 || res.err_code == 50009)) {
//鎺ㄩ�鎴愬姛锛屼慨鏀逛换鍔′紭鍏堢骇
mst.N_B_STATE = 1;
mst.S_B_STATE = TN_Task.GetStateStr(1);
@@ -167,16 +148,14 @@
result = true;
LogHelper.Info($"NDC鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE}start= {mst.S_START_LOC} + end = {mst.S_END_LOC}");
}
- else
- {
+ else {
LogHelper.Info($"NDC鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};Res:" + JsonConvert.SerializeObject(res));
}
}
else if (mst.N_SCHEDULE_TYPE == 5)//閫氳繃鏉ゥ璋冨害璁惧
{
//璋冪涓夋柟鎺ュ彛
- var model = new HanAo.TaskInfoModel
- {
+ var model = new HanAo.TaskInfoModel {
requestPk = mst.S_CODE,
frmPos = mst.S_START_LOC,
toPos = mst.S_END_LOC,
@@ -188,8 +167,7 @@
WCSHelper.UpdateStatus(mst);
LogHelper.Info($"鏉ゥ鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE};" + "start=" + model.frmPos + "end= " + model.toPos);
}
- else
- {
+ else {
LogHelper.Info($"鏉ゥ鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};" + JsonConvert.SerializeObject(model));
}
}
@@ -204,8 +182,7 @@
WCSHelper.UpdateEQNo(mst);
LogHelper.Info($"鍥借嚜鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE};" + "start=" + mst.S_START_LOC + "end= " + mst.S_END_LOC);
}
- else
- {
+ else {
LogHelper.Info($"鍥借嚜鎺ㄩ�浠诲姟澶辫触 {mst.S_CODE};" + JsonConvert.SerializeObject(mst));
}
}
--
Gitblit v1.9.1