From f978872b6de4e7e20d992a2ee7cda902c11347b9 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 30 六月 2025 15:31:56 +0800
Subject: [PATCH] 优化配置文件读取逻辑，将ERP反馈接口写入配置文件中配置
---
wms/LocationHelper.cs | 90 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 7e4e291..67fcff2 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -153,6 +153,12 @@
return true;
}
+ /// <summary>
+ /// 缁堢偣鍏ュ簱閿侊紙鍙兘瀵规棤閿佽揣浣嶄笂閿侊級
+ /// </summary>
+ /// <param name="loc"></param>
+ /// <param name="lockSource"></param>
+ /// <returns></returns>
public static bool LockEndLoc(ref TN_Location loc, string lockSource = "") {
if (loc == null) {
LogHelper.Info($"缁堢偣鍏ュ簱閿侊細浼犲叆鐨勮揣浣嶅弬鏁颁负null");
@@ -175,32 +181,26 @@
}
/// <summary>
- /// 鍏ュ簱閿佸畾缁堢偣锛屽嚭搴撻攣瀹氳捣鐐�+ /// 鏋勫缓璐т綅鏌ヨ琛ㄨ揪寮忥細褰撳墠鏁伴噺銆佽揣鍖恒�鍚嶇О
/// </summary>
- /// <remarks>
- /// 鍒涘缓浠诲姟閿佸畾璐т綅鐨勬椂鍊欙紝鎶婇攣鐨勬潵婧愬氨鏄换鍔″彿涔熷啓涓婂幓锛堝姞閿佺殑鏂规硶鍔犱釜鍙傛暟锛屽彲绌虹殑鍙傛暟锛夛紝瑙ｉ攣鐨勬椂鍊欐妸鏉ユ簮缃┖
- /// </remarks>
- /// <param name="loc"></param>
- /// <param name="lockState">1:鍏ュ簱閿併�2:鍑哄簱閿併�3:鍏跺畠閿�/param>
- /// <param name="lockSource">閿佺殑鏉ユ簮=浠诲姟鍙�/param>
+ /// <param name="db"></param>
+ /// <param name="nCurrentNum"></param>
+ /// <param name="areas"></param>
+ /// <param name="name"></param>
/// <returns></returns>
- private static bool LockLoc(string loc, int lockState, string lockSource = "")
- {
- var res = false;
- var db = new SqlHelper<object>().GetInstance();
- var model = db.Queryable<TN_Location>().Where(a => a.S_CODE == loc).First();
- LogHelper.Info($"閿佽揣浣峽loc},鐘舵�{lockState},淇℃伅" + JsonConvert.SerializeObject(model));
- if (model != null && model.N_LOCK_STATE == 0)
- {
- model.N_LOCK_STATE = lockState;
- model.S_LOCK_STATE = TN_Location.GetLockStateStr(lockState);
- model.S_LOCK_OP = lockSource;
- model.T_MODIFY = System.DateTime.Now;
- res = db.Updateable<TN_Location>(model).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY }).ExecuteCommand() > 0;
- }
- LogHelper.Info($"閿佽揣浣峽loc}杩斿洖{res}");
+ public static ISugarQueryable<TN_Location> GetLocQuery(SqlSugarClient db, int nCurrentNum = 0, List<string> areas = null, string name = null) {
+ var query = db.Queryable<TN_Location>()
+ .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == nCurrentNum);
- return res;
+ if (areas != null && !areas.Any()) {
+ query = query.Where(l => areas.Contains(l.S_AREA_CODE));
+ }
+
+ if (!string.IsNullOrEmpty(name)) {
+ query = query.Where(l => l.S_CODE == name);
+ }
+
+ return query;
}
/// <summary>
@@ -257,29 +257,29 @@
location.S_LOCK_STATE = "鏃�;
location.N_LOCK_STATE = 0;
- var containerList = new List<TN_Container>();
- foreach (var item in lcrList) {
- // 閽堝瀹瑰櫒绫诲瀷娣诲姞鐨勬柊閫昏緫
- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == item.S_CNTR_CODE).First();
- if (cntr == null) {
- LogHelper.Info($"璐т綅瑙ｇ粦鏃讹紝瀹瑰櫒{item.S_CNTR_CODE}娌℃湁鍦ㄥ鍣ㄤ俊鎭〃涓煡鍒帮紝杩欓噷鏍规嵁璐т綅瀹瑰櫒鍏崇郴娣诲姞");
- containerList.Add(new TN_Container {
- S_CODE = item.S_CNTR_CODE,
- S_TYPE = item.S_CNTR_TYPE,
- });
- }
- }
+ //var containerList = new List<TN_Container>();
+ //foreach (var item in lcrList) {
+ // // 閽堝瀹瑰櫒绫诲瀷娣诲姞鐨勬柊閫昏緫
+ // var cntr = db.Queryable<TN_Container>()
+ // .Where(c => c.S_CODE == item.S_CNTR_CODE).First();
+ // if (cntr == null) {
+ // LogHelper.Info($"璐т綅瑙ｇ粦鏃讹紝瀹瑰櫒{item.S_CNTR_CODE}娌℃湁鍦ㄥ鍣ㄤ俊鎭〃涓煡鍒帮紝杩欓噷鏍规嵁璐т綅瀹瑰櫒鍏崇郴娣诲姞");
+ // containerList.Add(new TN_Container {
+ // S_CODE = item.S_CNTR_CODE,
+ // S_TYPE = item.S_CNTR_TYPE,
+ // });
+ // }
+ //}
using (var tran = db.Ado.UseTran())
{
- if (containerList.Count > 0) {
- if (db.Insertable<TN_Container>(containerList).ExecuteCommand() <= 0) {
- LogHelper.Info($"鎻掑叆瀹瑰櫒淇℃伅琛ㄥけ璐� + JsonConvert.SerializeObject(containerList));
- tran.RollbackTran();
- return "璐т綅瑙ｇ粦瀹瑰櫒澶辫触锛� + logs;
- }
- }
+ //if (containerList.Count > 0) {
+ // if (db.Insertable<TN_Container>(containerList).ExecuteCommand() <= 0) {
+ // LogHelper.Info($"鎻掑叆瀹瑰櫒淇℃伅琛ㄥけ璐� + JsonConvert.SerializeObject(containerList));
+ // tran.RollbackTran();
+ // return "璐т綅瑙ｇ粦瀹瑰櫒澶辫触锛� + logs;
+ // }
+ //}
if (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
{
@@ -348,7 +348,9 @@
{
// 閽堝瀹瑰櫒绫诲瀷娣诲姞鐨勬柊閫昏緫
var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == item).First();
+ .Where(c => c.S_CODE == item)
+ .First();
+
if (cntr == null) {
LogHelper.Info($"璐т綅瑙ｇ粦鏃讹紝瀹瑰櫒{item}娌℃湁鍦ㄥ鍣ㄤ俊鎭〃涓煡鍒帮紝涓嶈褰曞鍣ㄧ被鍨�);
bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
--
Gitblit v1.9.1