From c321182cdcbc7d6489d969810f0610e48ac2b5ed Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 23 七月 2025 17:40:22 +0800
Subject: [PATCH] 双钱-需求变更：增加了两个搬送流程，增加了两个库区，主要是修改对空托上线脱皮机的逻辑
---
core/Monitor.cs | 121 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 116 insertions(+), 5 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index f15790e..06e1625 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -351,11 +351,105 @@
}
/// <summary>
+ /// 妫�祴鍘熸潗鏂欎骇绾夸笅绾块檮杩戞槸鍚︽湁绌轰綅
+ /// </summary>
+ internal static void CheckEmptyLoc_YclOutLineArea()
+ {
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+
+ var endLoc = db.Queryable<TN_Location>().
+ Where(o => o.S_AREA_CODE == Settings.Areas[15]
+ && o.N_LOCK_STATE == 0
+ && o.S_LOCK_STATE == "鏃�
+ && o.C_ENABLE == "Y"
+ && o.N_CURRENT_NUM == 0
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()
+ ).//鍘熸潗鏂欎骇绾块檮杩戠┖鎵樺簱鍖�+ First();
+
+ if (endLoc == null)
+ {
+ LogHelper.Info($"鍘熸潗鏂欎骇绾块檮杩戠┖鎵樺簱鍖簕Settings.Areas[15]}锛屽凡婊★紝鏃犻渶鍐嶅叆绌烘墭");
+ return;
+ }
+
+ var startLoc = db.Queryable<TN_Location>().
+ Where(o => o.S_AREA_CODE == Settings.Areas[3]
+ && o.N_LOCK_STATE == 0
+ && o.S_LOCK_STATE == "鏃�
+ && o.C_ENABLE == "Y"
+ && o.N_CURRENT_NUM > 0
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).Any()
+ ).ToList().//绌烘墭鍫嗗彔搴撳尯
+ OrderByDescending(o => o.N_CURRENT_NUM).
+ First();
+
+ if (startLoc == null)
+ {
+ startLoc = db.Queryable<TN_Location>().
+ Where(o => o.S_AREA_CODE == Settings.Areas[16]
+ && o.N_LOCK_STATE == 0
+ && o.S_LOCK_STATE == "鏃�
+ && o.C_ENABLE == "Y"
+ && o.N_CURRENT_NUM > 0
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).Any()
+ ).ToList().//绌烘墭璐ф灦搴撳尯
+ OrderByDescending(o => o.N_CURRENT_NUM).
+ First();
+ }
+
+ if (startLoc == null)
+ {
+ LogHelper.Info($"璧风偣娌℃湁鎵惧埌鍚堥�鐨勭┖鎵樿揣浣嶏紝瑕佹眰鏈夎揣");
+ return;
+ }
+
+ var cntrList = db.Queryable<TN_Loc_Container>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).OrderBy(a => a.T_CREATE, OrderByType.Asc).ToList();
+
+ if (cntrList.Count < 1)
+ {
+ LogHelper.Info($"璧风偣{startLoc.S_CODE}鏈壘鍒拌揣浣嶅鍣ㄥ叧绯讳俊鎭�);
+ return;
+ }
+
+ string cntrString = "";
+ for (int i = 0; i < cntrList.Count; i++)
+ {
+ if (i == cntrList.Count - 1)//鏈�悗涓�釜瀛楃涓茶繛鎺ヤ笉鍔犻�鍙�+ {
+ cntrString += cntrList[i].S_CNTR_CODE;
+ }
+ else
+ {
+ cntrString += cntrList[i].S_CNTR_CODE + ",";
+ }
+ }
+
+ if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, "绌烘墭鑷姩涓婄嚎", 3, cntrString))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�+ {
+ LocationHelper.LockLoc(startLoc.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
+ LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�+
+ LogHelper.Info($"鐢熸垚绌烘墭鑷姩涓婄嚎浠诲姟鎴愬姛锛屽鍣細{cntrString}锛岃捣鐐癸細{startLoc.S_CODE}");
+ }
+ else
+ {
+ LogHelper.Info($"鐢熸垚绌烘墭鑷姩涓婄嚎浠诲姟澶辫触锛屽鍣細{cntrString}锛岃捣鐐癸細{startLoc.S_CODE}");
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ }
+
+ /// <summary>
/// 绾胯竟婊℃墭璐т綅鑷姩瑙ｇ粦
/// </summary>
internal static void XBChekcFull()
{
- var db = new SqlHelper<object>().GetInstance();
try
{
@@ -991,12 +1085,29 @@
}
var endLoc = db.Queryable<TN_Location>().
- Where(a => a.S_AREA_CODE == Settings.Areas[4] && a.N_LOCK_STATE == 0
+ Where(a => a.S_AREA_CODE == Settings.Areas[15] && a.N_LOCK_STATE == 0
&& a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0
&& SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()
- ).
- OrderBy(a => a.N_CURRENT_NUM, OrderByType.Asc).
- First();
+ ).First();//鍏堟壘 鍘熸潗鏂欎骇绾块檮杩戠┖鎵樺簱鍖�+
+ if (endLoc == null)
+ {
+ endLoc = db.Queryable<TN_Location>().
+ Where(a => a.S_AREA_CODE == Settings.Areas[16] && a.N_LOCK_STATE == 0
+ && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()
+ ).First();
+ }// 鍐嶆壘 绌烘墭璐ф灦搴撳尯
+
+ if (endLoc == null)
+ {
+ endLoc = db.Queryable<TN_Location>().
+ Where(a => a.S_AREA_CODE == Settings.Areas[4] && a.N_LOCK_STATE == 0
+ && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0
+ && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()
+ ).First();
+ }// 鏈�悗鎵�绌烘墭缂撳瓨搴撳尯
+
if (endLoc == null)
{
--
Gitblit v1.9.1