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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 6046611..388e0e2 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -692,7 +692,7 @@
return result;
}
- model.RfId = WMSHelper.ConvertHexToAscii(model.RfId);
+ model.RfId = WMSHelper.ConvertHexToAscii(model.RfId.Substring(0,16));
//璇ヤ骇绾跨殑婊℃墭涓嬬嚎浣嶇疆锛岃捣鐐� var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
@@ -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();//绛涢�鏈夊鍣ㄨ揣浣嶅叧绯昏〃淇℃伅锛岀瓫閫夋湁瀹瑰櫒璐у搧鏄庣粏琛ㄤ俊鎭� }
@@ -1924,7 +1924,7 @@
var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == startLocCnt.S_CNTR_CODE);
Task task27 = Task.Run(() =>
{
- if (endLoc.S_AREA_CODE == Settings.Areas[2] && cginfo != null) //鎻掑叆WMS搴撳瓨鏄庣粏
+ if (endLoc.S_AREA_CODE == Settings.Areas[1] && cginfo != null) //鎻掑叆WMS搴撳瓨鏄庣粏
{
var target = new TN_InventoryM()
{
@@ -1942,7 +1942,7 @@
});
Task task26 = Task.Run(() =>
{
- if (startLoc.S_AREA_CODE == Settings.Areas[2] && cginfo != null)
+ if (startLoc.S_AREA_CODE == Settings.Areas[1] && cginfo != null)
{
SpecHelper.DeleteInventoryM(cginfo.S_ID);
}
--
Gitblit v1.9.1