From 276869b6204afa07dabd957aa247def78b14818c Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期五, 20 六月 2025 17:29:01 +0800
Subject: [PATCH] 取消任务与点对点逻辑修改
---
process/TaskProcess.cs | 8 +++++---
core/WCSCore.cs | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 0de22fe..3c45359 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -162,7 +162,7 @@
case 7:
Task task10 = Task.Run(() =>
{
- if (TN_Task.S_TYPE.Contains("婊℃墭涓嬬嚎鍏ュ簱") || TN_Task.S_TYPE.Contains("PDA婊℃墭涓嬬嚎鍏ュ簱") || TN_Task.S_END_AREA == Settings.Areas[1])
+ if (TN_Task.S_TYPE.Contains("婊℃墭涓嬬嚎鍏ュ簱") || TN_Task.S_TYPE.Contains("PDA婊℃墭涓嬬嚎鍏ュ簱"))
{
TaskProcess.OperateStatus(TN_Task, 7);//寮傚父澶勭悊
}
@@ -187,10 +187,10 @@
{
WCSHelper.End(TN_Task);//浠诲姟鐘舵�鏀规垚缁撴潫
LocationHelper.BindingLoc(TN_Task.S_END_LOC, TN_Task.S_CNTR_CODE.Split(',').ToList());
+
}
LocationHelper.UnLockLoc(TN_Task.S_END_LOC);
LocationHelper.UnLockLoc(TN_Task.S_START_LOC);//瑙ｉ攣璧风偣缁堢偣
-
}
});
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index b282096..7c261b5 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -51,7 +51,9 @@
CacheBitUpdate(mst, false);
WCSHelper.End(mst);//浠诲姟鐘舵�鏀规垚缁撴潫
}
- else {// 娌℃湁寮�鍗歌揣
+ else
+ {
+ // 娌℃湁寮�鍗歌揣
WCSHelper.Fail(mst);//浠诲姟鐘舵�鏀规垚閿欒
var db = new SqlHelper<object>().GetInstance();
var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == mst.S_CNTR_CODE);
@@ -63,8 +65,8 @@
{
db.Deleteable<TN_InventoryM>().Where(it => it.RFID == mst.S_CNTR_CODE).ExecuteCommand();
}
-
- //LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC, reqCode = 1 });
+ //蹇呴』鍒犳帀
+ LocationHelper.ErrorLocCntReset(new ErrorLocCntResetInfo() { locID = mst.S_START_LOC, reqCode = 1 });
}
LocationHelper.UnLockLoc(mst.S_START_LOC);//瑙ｉ攣璧风偣
LocationHelper.UnLockLoc(mst.S_END_LOC);//瑙ｉ攣缁堢偣
--
Gitblit v1.9.1