From fad1333a599e562c8fa7ee350852fee72b9a6a28 Mon Sep 17 00:00:00 2001 From: 杨张扬 <634643841@qq.com> Date: 星期三, 02 七月 2025 17:33:25 +0800 Subject: [PATCH] 出库任务取消在4之前不删除库存 --- api/ApiHelper.cs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs index 230651b..7122e40 100644 --- a/api/ApiHelper.cs +++ b/api/ApiHelper.cs @@ -763,7 +763,7 @@ && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y" && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == c.S_CODE).NotAny()//涓嶈兘鏈夎揣 ). - OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲 + OrderBy(o => o.N_LAYER, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝1灞傚厛鍏ュ簱 if (endLoc != null) { @@ -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();//绛涢�鏈夊鍣ㄨ揣浣嶅叧绯昏〃淇℃伅锛岀瓫閫夋湁瀹瑰櫒璐у搧鏄庣粏琛ㄤ俊鎭� } -- Gitblit v1.9.1