From d944fda9f2fbf27d83e8fdf880e8fe5267e1f541 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 04 六月 2025 17:24:13 +0800
Subject: [PATCH] 优化空托空箱入库兼容出库容器回库场景，修复货位容器绑定的类型丢失问题
---
wms/LocationHelper.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index 9e86b9c..7be3946 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;
}
@@ -313,9 +325,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 cntrItemRel = db.Queryable<TN_Container_ItemType>()
+ .Where(c => c.S_CNTR_CODE == item).First();
+ if (cntrItemRel == 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 = cntrItemRel.S_CNTR_TYPE });
+ }
}
-
var log = JsonConvert.SerializeObject(bindLocCntList);
--
Gitblit v1.9.1