From 071a7efe34469cbfc0f5401291c6e3ba21f31b19 Mon Sep 17 00:00:00 2001
From: 18256738414 <634643841@qq.com>
Date: 星期四, 24 七月 2025 21:29:16 +0800
Subject: [PATCH] 双钱，空托自动上线优先空托货架区
---
core/Monitor.cs | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 06e1625..42f7747 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -380,11 +380,10 @@
&& o.N_LOCK_STATE == 0
&& o.S_LOCK_STATE == "鏃�
&& o.C_ENABLE == "Y"
- && o.N_CURRENT_NUM > 0
+ && o.N_CURRENT_NUM == o.N_CAPACITY
&& SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).Any()
).ToList().//绌烘墭鍫嗗彔搴撳尯
- OrderByDescending(o => o.N_CURRENT_NUM).
- First();
+ FirstOrDefault();
if (startLoc == null)
{
@@ -393,16 +392,15 @@
&& o.N_LOCK_STATE == 0
&& o.S_LOCK_STATE == "鏃�
&& o.C_ENABLE == "Y"
- && o.N_CURRENT_NUM > 0
+ && o.N_CURRENT_NUM == o.N_CAPACITY
&& SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).Any()
).ToList().//绌烘墭璐ф灦搴撳尯
- OrderByDescending(o => o.N_CURRENT_NUM).
- First();
+ FirstOrDefault();
}
if (startLoc == null)
{
- LogHelper.Info($"璧风偣娌℃湁鎵惧埌鍚堥�鐨勭┖鎵樿揣浣嶏紝瑕佹眰鏈夎揣");
+ LogHelper.Info($"妫�祴鍘熸潗鏂欎骇绾夸笅绾块檮杩戞槸鍚︽湁绌轰綅,璧风偣娌℃湁鎵惧埌鍚堥�鐨勭┖鎵樿揣浣嶏紝瑕佹眰鏈夎揣");
return;
}
@@ -410,7 +408,7 @@
if (cntrList.Count < 1)
{
- LogHelper.Info($"璧风偣{startLoc.S_CODE}鏈壘鍒拌揣浣嶅鍣ㄥ叧绯讳俊鎭�);
+ LogHelper.Info($"妫�祴鍘熸潗鏂欎骇绾夸笅绾块檮杩戞槸鍚︽湁绌轰綅,璧风偣{startLoc.S_CODE}鏈壘鍒拌揣浣嶅鍣ㄥ叧绯讳俊鎭�);
return;
}
@@ -432,16 +430,16 @@
LocationHelper.LockLoc(startLoc.S_CODE, 2);//璧风偣鍑哄簱閿侊紝
LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�
- LogHelper.Info($"鐢熸垚绌烘墭鑷姩涓婄嚎浠诲姟鎴愬姛锛屽鍣細{cntrString}锛岃捣鐐癸細{startLoc.S_CODE}");
+ LogHelper.Info($"妫�祴鍘熸潗鏂欎骇绾夸笅绾块檮杩戞槸鍚︽湁绌轰綅,鐢熸垚绌烘墭鑷姩涓婄嚎浠诲姟鎴愬姛锛屽鍣細{cntrString}锛岃捣鐐癸細{startLoc.S_CODE}");
}
else
{
- LogHelper.Info($"鐢熸垚绌烘墭鑷姩涓婄嚎浠诲姟澶辫触锛屽鍣細{cntrString}锛岃捣鐐癸細{startLoc.S_CODE}");
+ LogHelper.Info($"妫�祴鍘熸潗鏂欎骇绾夸笅绾块檮杩戞槸鍚︽湁绌轰綅,鐢熸垚绌烘墭鑷姩涓婄嚎浠诲姟澶辫触锛屽鍣細{cntrString}锛岃捣鐐癸細{startLoc.S_CODE}");
}
}
catch (Exception ex)
{
-
+ LogHelper.Error(ex.Message, ex);
}
}
@@ -803,14 +801,14 @@
}
else
{
- LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_DayProDetail璺宠繃");
+ //LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_DayProDetail璺宠繃");
}
}
}
}
else
{
- LogHelper.Info("褰撳ぉ鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_DayProDetail璺宠繃");
+ //LogHelper.Info("褰撳ぉ鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_DayProDetail璺宠繃");
}
// 鍚屾 TN_WeekProSpcDetail
@@ -841,14 +839,14 @@
}
else
{
- LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_WeekProSpcDetail璺宠繃");
+ //LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_WeekProSpcDetail璺宠繃");
}
}
}
}
else
{
- LogHelper.Info("褰撳懆鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_WeekProSpcDetail璺宠繃");
+ //LogHelper.Info("褰撳懆鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_WeekProSpcDetail璺宠繃");
}
// 鍚屾 TN_MonthProSpcDetail
@@ -879,14 +877,14 @@
}
else
{
- LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_MonthProSpcDetail璺宠繃");
+ //LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_MonthProSpcDetail璺宠繃");
}
}
}
}
else
{
- LogHelper.Info("褰撴湀鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_MonthProSpcDetail璺宠繃");
+ //LogHelper.Info("褰撴湀鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_MonthProSpcDetail璺宠繃");
}
// 鍚屾 TN_YearProSpcDetail
@@ -918,14 +916,14 @@
}
else
{
- LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_YearProSpcDetail璺宠繃");
+ //LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_YearProSpcDetail璺宠繃");
}
}
}
}
else
{
- LogHelper.Info("褰撳勾鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_YearProSpcDetail璺宠繃");
+ //LogHelper.Info("褰撳勾鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_YearProSpcDetail璺宠繃");
}
}
catch (Exception ex)
--
Gitblit v1.9.1