From 1c7cb41e75dece1ec91039625fcc434776df3821 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期二, 01 七月 2025 17:33:22 +0800
Subject: [PATCH] 满托入库按照第一层先入
---
core/Monitor.cs | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 0bdcc36..f79b8a9 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -137,7 +137,7 @@
&& c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0
&& SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == c.S_CODE).NotAny()//涓嶈兘鏈夎揣
&& c.C_ENABLE == "Y").
- OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
+ OrderBy(o => o.N_LAYER, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
if (endLoc != null)
{
@@ -370,12 +370,14 @@
return;
}
- var endLoc = db.Queryable<TN_Location>().First(a => a.S_AREA_CODE == Settings.Areas[1]
+ var endLoc = db.Queryable<TN_Location>()
+ .OrderBy(a => a.N_LAYER, OrderByType.Asc)
+ .First(a => a.S_AREA_CODE == Settings.Areas[1]
&& a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃�
&& SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()//涓嶈兘鏈夎揣
);
- if (endLoc != null)
+ if (endLoc == null)
{
LogHelper.Info("缁堢偣搴撳尯宸叉弧鎴栬�宸插叏閮ㄩ攣浣�);
return;
@@ -385,15 +387,15 @@
.LeftJoin<TN_Loc_Container>((o, i) => o.S_CNTR_CODE == i.S_CNTR_CODE)
.Where((o, i) => i.S_LOC_CODE == startLoc.S_CODE).First();
- if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, "澶嶆鑷姩鍚堟牸鍥炲簱", 3, cginfo.S_CNTR_CODE, out string taskNo, cginfo.S_SPE))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�+ if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, "澶嶆鍚堟牸鑷姩鍥炲簱", 3, cginfo.S_CNTR_CODE, out string taskNo, cginfo.S_SPE))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣� {
LocationHelper.LockLoc(startLoc.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�- LogHelper.Info($"鐢熸垚澶嶆鑷姩鍚堟牸鍥炲簱浠诲姟鎴愬姛锛屽鍣ㄥ彿{cginfo.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
+ LogHelper.Info($"鐢熸垚澶嶆鍚堟牸鑷姩鍥炲簱浠诲姟鎴愬姛锛屽鍣ㄥ彿{cginfo.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
Task task99 = Task.Run(() =>
{
- WMSHelper.InsertOpInfo("鑷姩杞", "澶嶆鑷姩鍚堟牸鍥炲簱", cginfo.S_CNTR_CODE);
+ WMSHelper.InsertOpInfo("鑷姩杞", "澶嶆鍚堟牸鑷姩鍥炲簱", cginfo.S_CNTR_CODE);
});
Task task27 = Task.Run(() =>
@@ -416,7 +418,7 @@
}
else
{
- LogHelper.Info($"鐢熸垚澶嶆鑷姩鍚堟牸鍥炲簱浠诲姟澶辫触锛屽鍣ㄥ彿{cginfo.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
+ LogHelper.Info($"鐢熸垚澶嶆鍚堟牸鑷姩鍥炲簱浠诲姟澶辫触锛屽鍣ㄥ彿{cginfo.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}");
return;
}
@@ -483,7 +485,8 @@
var endLoc_2 = db.Queryable<TN_Location>()
.Where(o => o.S_AREA_CODE == Settings.Areas[2]
&& SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()//涓嶈兘鏈夎揣
- && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�).First();
+ && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�)
+ .First();
if (endLoc_2 != null)
{
@@ -597,9 +600,13 @@
db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID);
- cginfo.S_ITEM_STATE = "杩囨湡";
- cginfo.N_ITEM_STATE = 3;
- db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+
+ if (cginfo != null)
+ {
+ cginfo.S_ITEM_STATE = "杩囨湡";
+ cginfo.N_ITEM_STATE = 3;
+ db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+ }
}
// 鍚屾 TN_InventoryM 涓�TN_CG_Detail
@@ -614,7 +621,10 @@
targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
- Where((o, i) => System.DateTime.Now >= o.EXPIRATION && i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1).First();
+ Where((o, i) => System.DateTime.Now >= o.EXPIRATION
+ && ((i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1)
+ || (i.S_ITEM_STATE == "鍚堟牸" && i.N_ITEM_STATE == 0))
+ ).First();
if (targetInM != null)//妫�祴鍑哄凡杩囨湡鐨勮揣鍝� {
@@ -623,22 +633,32 @@
db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID);
- cginfo.S_ITEM_STATE = "杩囨湡";
- cginfo.N_ITEM_STATE = 3;
- db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+
+ if (cginfo != null)
+ {
+ cginfo.S_ITEM_STATE = "杩囨湡";
+ cginfo.N_ITEM_STATE = 3;
+ db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+ }
}
- targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
- Where((o, i) => System.DateTime.Now < o.EXPIRATION && i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1).First();
+ var targetInMList = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
+ Where((o, i) => System.DateTime.Now < o.EXPIRATION
+ && ((i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1)
+ || (i.S_ITEM_STATE == "鍚堟牸" && i.N_ITEM_STATE == 0))
+ ).ToList();
- if (targetInM != null)//妫�祴鍑哄揩杩囨湡鐨勮揣鍝�+ if (targetInMList.Count > 0)//妫�祴鍑哄揩杩囨湡鐨勮揣鍝� {
- targetInM.EXPIRATION_DAY = SpecHelper.CalculateDaysDifference(System.DateTime.Now,targetInM.EXPIRATION).ToString();
- db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
+ foreach (var item in targetInMList)
+ {
+ item.EXPIRATION_DAY = SpecHelper.CalculateDaysDifference(System.DateTime.Now, item.EXPIRATION).ToString();
+ }
+ db.Updateable<TN_InventoryM>(targetInMList).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
}
- targetInM = db.Queryable<TN_InventoryM>().First(a => Convert.ToInt32(a.EXPIRATION_DAY) > 0 && a.ITEMSTATE == "杩囨湡");//宸茶繃鏈熺殑璐у搧锛屽墿浣欏ぉ鏁版敼涓�
- if (targetInM != null)
+ targetInM = db.Queryable<TN_InventoryM>().First(a => Convert.ToInt32(a.EXPIRATION_DAY) > 0 && a.ITEMSTATE == "杩囨湡");
+ if (targetInM != null)//宸茶繃鏈熺殑璐у搧锛屽墿浣欏ぉ鏁版敼涓�
{
targetInM.EXPIRATION_DAY = "0";
db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
@@ -802,7 +822,22 @@
}
catch (Exception ex)
{
- LogHelper.Error($"鍙戠敓浜嗗紓甯革紝鍚屾TN_EquipProDetail寮傚父锛寋ex.Message}", ex);
+ // 鑾峰彇鏈�唴灞傚紓甯革紙閫氬父鏄疄闄呭紩鍙戦棶棰樼殑寮傚父锛�+ Exception innerEx = ex;
+ while (innerEx.InnerException != null)
+ {
+ innerEx = innerEx.InnerException;
+ }
+
+ // 鑾峰彇鍫嗘爤甯т俊鎭�+ var stackTrace = new System.Diagnostics.StackTrace(innerEx, true);
+ var stackFrame = stackTrace.GetFrame(0); // 鑾峰彇鏈�《灞傜殑鍫嗘爤甯�+
+ // 鑾峰彇鏂囦欢鍚嶅拰琛屽彿
+ string fileName = stackFrame.GetFileName();
+ int lineNumber = stackFrame.GetFileLineNumber();
+
+ LogHelper.Error($"鍙戠敓浜嗗紓甯革紝鍚屾TN_EquipProDetail寮傚父锛屾枃浠�{fileName}, 琛屽彿:{lineNumber}, 閿欒:{ex.Message}\r\n{ex.StackTrace}", ex);
}
}
--
Gitblit v1.9.1