From f9ee14fbfe22a0a56350580838bb6e4b57f829dc Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期二, 29 七月 2025 17:28:13 +0800
Subject: [PATCH] 等待交互修改
---
process/TaskProcess.cs | 79 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 63905a7..cf8c3ec 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -54,13 +54,13 @@
if (load)
{
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
- LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
+ LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}","瑙ｉ攣");
LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
else
{
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
- LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
+ 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());
}
@@ -71,7 +71,7 @@
/// </summary>
/// <param name="mst"></param>
internal static void CacheBitCancelUpdate(WMSTask mst) {
-
+ LogHelper.Info($"CacheBitCancelUpdate瑙ｉ攣锛氫换鍔″彿锛歿mst.S_CODE}", "瑙ｉ攣");
LocationHelper.UnLockLoc(mst.S_START_LOC);
LocationHelper.UnLockLoc(mst.S_END_LOC);
@@ -142,42 +142,42 @@
else if (state == 1004) {
LogHelper.Info($"绛夊緟浜や簰锛屼换鍔″彿={mst.S_CODE}", "瀹夊叏浜や簰");
- var wcsCode = "";
+ //var wcsCode = "";
- if (mst.S_TYPE.Contains("鍏ュ簱")|| mst.S_TYPE.Contains("鍥炲簱"))
- {
- wcsCode = mst.S_CODE.Replace(@"_1", "_2");
- }
+ //if (mst.S_TYPE.Contains("鍏ュ簱")|| mst.S_TYPE.Contains("鍥炲簱"))
+ //{
+ // wcsCode = mst.S_CODE.Replace(@"_1", "_2");
+ //}
- if (mst.S_TYPE.Contains("鍑哄簱"))
- {
- wcsCode = mst.S_CODE.Replace(@"_2", "_1");
- }
+ //if (mst.S_TYPE.Contains("鍑哄簱"))
+ //{
+ // wcsCode = mst.S_CODE.Replace(@"_2", "_1");
+ //}
- LogHelper.Info($"绛夊緟浜や簰锛屾煡璇㈡牎楠屼换鍔″彿={wcsCode}", "瀹夊叏浜や簰");
- //绛夊緟rfid鏍￠獙
- var rfidFlag = TaskHelper.GetRfid(wcsCode);
+ //LogHelper.Info($"绛夊緟浜や簰锛屾煡璇㈡牎楠屼换鍔″彿={wcsCode}", "瀹夊叏浜や簰");
+ ////绛夊緟rfid鏍￠獙
+ //var rfidFlag = TaskHelper.GetRfid(wcsCode);
- LogHelper.Info($"绛夊緟浜や簰锛屼换鍔″彿={mst.S_CODE}锛孯FID鏍￠獙淇℃伅"+JsonConvert.SerializeObject(rfidFlag), "瀹夊叏浜や簰");
- if (rfidFlag!=null)
- {
- if (rfidFlag.S_RESULT.Contains("鎴愬姛"))
- {
- LogHelper.Info($"浠诲姟鍙�{mst.S_CODE}锛岀瓑寰呬氦绠℃垚鍔燂紝淇敼鍙傛暟6涓�,4涓�", "瀹夊叏浜や簰");
- NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
- NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
- }
- else {
- var startSite = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
- var endSite = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
- LogHelper.Info($"浠诲姟{mst.S_CODE}RFID鏍￠獙澶辫触锛屾敼鍙傛暟1涓簕startSite},鏀瑰弬鏁�涓簕endSite}锛屽弬鏁�涓�锛�涓�", "瀹夊叏浜や簰");
- NDCApi.ChangeOrderParam(mst.S_CODE, 1, startSite);
- NDCApi.ChangeOrderParam(mst.S_CODE, 2, endSite);
- NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
- Thread.Sleep(1000);
- NDCApi.ChangeOrderParam(mst.S_CODE, 6, "2");
- }
- }
+ //LogHelper.Info($"绛夊緟浜や簰锛屼换鍔″彿={mst.S_CODE}锛孯FID鏍￠獙淇℃伅"+JsonConvert.SerializeObject(rfidFlag), "瀹夊叏浜や簰");
+ //if (rfidFlag!=null)
+ //{
+ // if (rfidFlag.S_RESULT.Contains("鎴愬姛"))
+ // {
+ // LogHelper.Info($"浠诲姟鍙�{mst.S_CODE}锛岀瓑寰呬氦绠℃垚鍔燂紝淇敼鍙傛暟6涓�,4涓�", "瀹夊叏浜や簰");
+ // NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
+ // NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
+ // }
+ // else {
+ // var startSite = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
+ // var endSite = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
+ // LogHelper.Info($"浠诲姟{mst.S_CODE}RFID鏍￠獙澶辫触锛屾敼鍙傛暟1涓簕startSite},鏀瑰弬鏁�涓簕endSite}锛屽弬鏁�涓�锛�涓�", "瀹夊叏浜や簰");
+ // NDCApi.ChangeOrderParam(mst.S_CODE, 1, startSite);
+ // NDCApi.ChangeOrderParam(mst.S_CODE, 2, endSite);
+ // NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
+ // Thread.Sleep(1000);
+ // NDCApi.ChangeOrderParam(mst.S_CODE, 6, "2");
+ // }
+ //}
}
}
@@ -245,9 +245,6 @@
try
{
-
-
-
//绌烘墭鍏ュ簱鍒ゆ柇绌烘墭鍑虹紦瀛樿〃锛屾湁瀵瑰簲璁板綍鐩存帴鏀归亾鍒扮紦瀛樿〃缁堢偣
if (workFlow.FLOWCODE=="3") {
var kt = db.Queryable<MesKtTask>().Where(e => e.TOOLS_TPYE==task.TOOLSTYPE && e.Status=="N").OrderBy(a=>a.CreateDate).First();
@@ -1023,6 +1020,8 @@
work.T_END_TIME = DateTime.Now;
var db = new SqlHelper<object>().GetInstance();
db.Updateable(work).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_MODIFY, it.T_END_TIME }).ExecuteCommand();
+
+ LogHelper.Info($"cancelTask1鍙栨秷{model.task_no}锛岃В閿�, "瑙ｉ攣");
LocationHelper.UnLockLoc(work.S_START_LOC);
LocationHelper.UnLockLoc(work.S_END_LOC);
if (!string.IsNullOrEmpty(work.CONNECTION))
@@ -1050,6 +1049,7 @@
//鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
TaskHelper.opMesTask(task, 3);
TaskHelper.Fail(task);
+
TaskProcess.CacheBitCancelUpdate(task);
ContainerHelper.delCntr(task.S_CNTR_CODE);
@@ -2193,9 +2193,10 @@
{
if (connection != "")
{
+ LogHelper.Info($"{operation.S_CODE}閿佽揣浣�, "涓婇攣");
LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
- LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
+ LocationHelper.LockLoc(operation.CONNECTION, "鍏跺畠閿�, 3);
}
--
Gitblit v1.9.1