From c2d2f4eb78c54bdfdb6ffb0df5932751d538ed14 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期一, 14 七月 2025 17:35:02 +0800
Subject: [PATCH] 新增PDA搬送，线边空托到原材料上线口
---
core/Monitor.cs | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 769c3f2..2714a0e 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,7 +370,9 @@
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()//涓嶈兘鏈夎揣
);
@@ -460,11 +462,6 @@
LocationHelper.LockLoc(startLoc_1.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
LocationHelper.LockLoc(endLoc_1.S_CODE, 1);//缁堢偣鍏ュ簱閿� LogHelper.Info($"鐢熸垚婊℃墭杩囨湡鍑哄簱浠诲姟鎴愬姛锛屽鍣ㄥ彿{outTimeCg.S_CNTR_CODE}锛岃捣鐐箋startLoc_1.S_CODE}锛岀粓鐐箋endLoc_1.S_CODE}");
-
- Task task27 = Task.Run(() =>
- {
- SpecHelper.DeleteInventoryM(outTimeCg.S_ID);
- });
}
}
}
@@ -483,7 +480,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)
{
@@ -940,11 +938,6 @@
LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�
LogHelper.Info($"鐢熸垚婊℃墭鍑哄簱澶嶆浠诲姟鎴愬姛锛屽鍣細{cntId.S_CNTR_CODE}锛岃捣鐐癸細{startLoc.S_CODE}锛岀粓鐐癸細{endLoc.S_CODE}");
-
- Task task27 = Task.Run(() =>
- {
- SpecHelper.DeleteInventoryM(cgInfo.S_ID);
- });
}
else
{
--
Gitblit v1.9.1