From 6b43055b5aa32dbea0dacee5a0235b0d5a76c293 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 30 五月 2025 17:19:35 +0800
Subject: [PATCH] 优化后台报错信息，空箱入库容器号增加检查逻辑
---
wms/LocationHelper.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index db9d569..9e86b9c 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -127,21 +127,34 @@
}
/// <summary>
- /// 鍏ュ簱閿佸畾缁堢偣锛屽嚭搴撻攣瀹氳捣鐐�- /// 浣犲垱寤轰换鍔￠攣瀹氳揣浣嶇殑鏃跺�锛屾妸閿佺殑鏉ユ簮灏辨槸浠诲姟鍙蜂篃鍐欎笂鍘伙紙鍔犻攣鐨勬柟娉曞姞涓弬鏁帮紝鍙┖鐨勫弬鏁帮級锛岃В閿佺殑鏃跺�鎶婃潵婧愮疆绌恒�
+ /// 璧风偣鍑哄簱閿� /// </summary>
/// <param name="loc"></param>
- /// <param name="lockState">1:鍏ュ簱閿併�2:鍑哄簱閿併�3:鍏跺畠閿�/param>
- /// <param name="lockSource">閿佺殑鏉ユ簮=浠诲姟鍙�/param>
+ /// <param name="lockSource"></param>
/// <returns></returns>
- public static bool LockLoc(ref TN_Location loc, int lockState, string lockSource = "") {
+ public static bool LockStartLoc(ref TN_Location loc, string lockSource = "") {
if (loc == null || loc.N_LOCK_STATE != 0) {
return false;
}
if (loc != null && loc.N_LOCK_STATE == 0) {
- loc.N_LOCK_STATE = lockState;
- loc.S_LOCK_STATE = TN_Location.GetLockStateStr(lockState);
+ loc.N_LOCK_STATE = 2; // 璧风偣鍑哄簱閿�+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 璧风偣鍑哄簱閿�+ loc.S_LOCK_OP = lockSource;
+ loc.T_MODIFY = System.DateTime.Now;
+ }
+
+ return true;
+ }
+
+ public static bool LockEndLoc(ref TN_Location loc, string lockSource = "") {
+ if (loc == null || loc.N_LOCK_STATE != 0) {
+ return false;
+ }
+
+ if (loc != null && loc.N_LOCK_STATE == 0) {
+ loc.N_LOCK_STATE = 1; // 缁堢偣鍑哄簱閿�+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 缁堢偣鍑哄簱閿� loc.S_LOCK_OP = lockSource;
loc.T_MODIFY = System.DateTime.Now;
}
@@ -159,7 +172,7 @@
/// <param name="lockState">1:鍏ュ簱閿併�2:鍑哄簱閿併�3:鍏跺畠閿�/param>
/// <param name="lockSource">閿佺殑鏉ユ簮=浠诲姟鍙�/param>
/// <returns></returns>
- public static bool LockLoc(string loc, int lockState, string lockSource = "")
+ private static bool LockLoc(string loc, int lockState, string lockSource = "")
{
var res = false;
var db = new SqlHelper<object>().GetInstance();
--
Gitblit v1.9.1