From f9d7694d27475954449ce3073938af98a4798b07 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期五, 18 七月 2025 17:37:24 +0800
Subject: [PATCH] 修复去线边的任务，完成后自动解绑失败的问题
---
core/Monitor.cs | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 769c3f2..2d85a2e 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)
{
@@ -226,6 +226,7 @@
ITEMCODE = woInfo.S_ITEM_CODE,
LOGINNAME = woInfo.S_LINE_NO,
SHIFT = "None",
+ STARTLOC = startLoc.S_CODE,
};
SpecHelper.InsertInventoryM(target);
});
@@ -350,6 +351,22 @@
}
/// <summary>
+ /// 绾胯竟婊℃墭璐т綅鑷姩瑙ｇ粦
+ /// </summary>
+ internal static void XBChekcFull()
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ try
+ {
+
+ }
+ catch (Exception ex)
+ {
+
+ }
+ }
+
+ /// <summary>
/// 鍦ㄥ妫�尯妫�祴鐗╁搧鍚堟牸锛屽悎鏍肩殑鐗╁搧鑷姩鍥炲簱
/// </summary>
internal static void CGOkCheck()
@@ -370,7 +387,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()//涓嶈兘鏈夎揣
);
@@ -408,6 +427,7 @@
ITEMCODE = cginfo.S_ITEM_CODE,
LOGINNAME = "鑷姩杞",
SHIFT = "鏃�,
+ STARTLOC = startLoc.S_CODE,
};
SpecHelper.InsertInventoryM(target);
});
@@ -460,11 +480,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 +498,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)
{
@@ -506,6 +522,7 @@
ITEMCODE = outTimeCg.S_ITEM_CODE,
LOGINNAME = "杩囨湡鍚堟牸鍥炲簱杞",
SHIFT = "None",
+ STARTLOC = startLoc_2.S_CODE,
};
SpecHelper.InsertInventoryM(target);
});
@@ -940,11 +957,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