From a949debc0abbe90adfda1af653b7b5c2ab27d997 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 06 六月 2025 17:14:55 +0800
Subject: [PATCH] 使用Container表优化容器与物料类型绑定的逻辑
---
wms/LocationHelper.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 9e86b9c..7e4e291 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -127,13 +127,19 @@
}
/// <summary>
- /// 璧风偣鍑哄簱閿�+ /// 璧风偣鍑哄簱閿侊紙鍙兘瀵规棤閿佽揣浣嶄笂閿侊級
/// </summary>
/// <param name="loc"></param>
/// <param name="lockSource"></param>
/// <returns></returns>
public static bool LockStartLoc(ref TN_Location loc, string lockSource = "") {
- if (loc == null || loc.N_LOCK_STATE != 0) {
+ if (loc == null) {
+ LogHelper.Info($"璧风偣鍑哄簱閿侊細浼犲叆鐨勮揣浣嶅弬鏁颁负null");
+ return false;
+ }
+
+ if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "鏃�) {
+ LogHelper.Info($"璧风偣鍑哄簱閿侊細璐т綅褰撳墠宸叉湁閿�{loc.N_LOCK_STATE},{loc.S_LOCK_STATE})");
return false;
}
@@ -148,7 +154,13 @@
}
public static bool LockEndLoc(ref TN_Location loc, string lockSource = "") {
- if (loc == null || loc.N_LOCK_STATE != 0) {
+ if (loc == null) {
+ LogHelper.Info($"缁堢偣鍏ュ簱閿侊細浼犲叆鐨勮揣浣嶅弬鏁颁负null");
+ return false;
+ }
+
+ if (loc.N_LOCK_STATE != 0 || loc.S_LOCK_STATE != "鏃�) {
+ LogHelper.Info($"缁堢偣鍏ュ簱閿侊細璐т綅褰撳墠宸叉湁閿�{loc.N_LOCK_STATE},{loc.S_LOCK_STATE})");
return false;
}
@@ -237,7 +249,6 @@
}
cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
-
var log = JsonConvert.SerializeObject(cntrs);
var location = db.Queryable<TN_Location>().First(a => a.S_CODE == loc);
if (location != null)
@@ -246,8 +257,30 @@
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,
+ });
+ }
+ }
+
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 (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
{
LogHelper.Info($"鍒犻櫎璐т綅瀹瑰櫒鍏崇郴琛ㄦ垚鍔燂紝{log}");
@@ -313,9 +346,17 @@
var bindLocCntList = new List<TN_Loc_Container>();
foreach (var item in cntrs)
{
- bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
+ // 閽堝瀹瑰櫒绫诲瀷娣诲姞鐨勬柊閫昏緫
+ var cntr = db.Queryable<TN_Container>()
+ .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 });
+ }
+ else {
+ bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item, S_CNTR_TYPE = cntr.S_TYPE });
+ }
}
-
var log = JsonConvert.SerializeObject(bindLocCntList);
--
Gitblit v1.9.1