From 38f7aa5340b760d639263959aa59f87c512e75fa Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期六, 19 七月 2025 19:18:28 +0800
Subject: [PATCH] 双钱-点对点、满托出库上线、暂时取消RFID读卡器校验 双钱：取消任务收到4取货完成后，不会再次解锁重置起点
---
core/WCSCore.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 0d76837..ac280b4 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -69,7 +69,15 @@
WCSHelper.Begin(tN_Task, model.forklift_no);//宸叉帹閫佺殑浠诲姟鐨勭姸鎬佹敼鎴愭墽琛� Task task4 = Task.Run(() =>
{
- OpenScanCode(model.task_no, model.forklift_no);//寮�惎鎵爜
+ if (tN_Task.S_TYPE.Contains("鐐瑰鐐�) || tN_Task.S_TYPE.Contains("婊℃墭鍑哄簱涓婄嚎") || tN_Task.S_TYPE.Contains("婊℃墭鍑哄簱澶嶆"))
+ {
+ //涓嶅紑鍚壂鐮�+ }
+ else
+ {
+ OpenScanCode(model.task_no, model.forklift_no);//寮�惎鎵爜
+ }
+
});
break;
case 3:
@@ -102,6 +110,8 @@
case 6:
WCSHelper.UpdateStatus(tN_Task, "鍗歌揣瀹屾垚");//浠诲姟鐘舵�鏀规垚鍗歌揣瀹屾垚
TaskProcess.OperateStatus(tN_Task, 6);//缁堢偣瀹瑰櫒璐т綅缁戝畾,瑙ｉ攣缁堢偣
+
+ SpecHelper.RestEndLoc(tN_Task);
Task task2 = Task.Run(() =>
{
@@ -163,11 +173,6 @@
break;
case 2:
WCSHelper.End(tN_Task);//浠诲姟鐘舵�鏀规垚缁撴潫
-
- Task task16 = Task.Run(() =>
- {
- SpecHelper.RestEndLoc(tN_Task);
- });
break;
case 7:
--
Gitblit v1.9.1