From afd0f03dac38e56bfdd60b03f197fb9bf5c1eda4 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期四, 19 六月 2025 17:29:00 +0800
Subject: [PATCH] 取消任务，不删除容器货品明细
---
api/ApiHelper.cs | 2 +-
process/TaskProcess.cs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 230651b..388e0e2 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1039,7 +1039,7 @@
Where((o, i, s) => o.N_CURRENT_NUM > 0 && o.S_AREA_CODE == Settings.Areas[1] && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃� && o.C_ENABLE == "Y"
&& (s.S_ITEM_SPEC == model.Spe || s.S_SPE == model.Spe)//鎸囧畾瑙勬牸
&& s.N_ITEM_STATE == 0 && s.S_ITEM_STATE == "鍚堟牸" //鍚堟牸鐨�- && s.T_MODIFY.AddMinutes(waitTime) <= System.DateTime.Now).//鏍规嵁瑙勬牸鐨勪笉鍚岄潤缃笉鍚屽垎閽熸墠鑳藉嚭搴�+ && i.T_CREATE.AddMinutes(waitTime) <= System.DateTime.Now).//鏍规嵁瑙勬牸鐨勪笉鍚岄潤缃笉鍚屽垎閽熸墠鑳藉嚭搴� OrderBy((o, i, s) => s.T_CREATE, OrderByType.Asc).//鍏堣繘鍏堝嚭
First();//绛涢�鏈夊鍣ㄨ揣浣嶅叧绯昏〃淇℃伅锛岀瓫閫夋湁瀹瑰櫒璐у搧鏄庣粏琛ㄤ俊鎭� }
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index cc6ae42..b282096 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -51,7 +51,7 @@
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);
@@ -64,7 +64,7 @@
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