From e0d89637030791ce1e7dd46ca5fdec9979977960 Mon Sep 17 00:00:00 2001
From: 杨前锦 <1010338399@qq.com>
Date: 星期三, 11 六月 2025 17:28:41 +0800
Subject: [PATCH] 印尼佳通-硫化流程出入库流程开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.TSSG/wms/WMSHelper.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.TSSG/wms/WMSHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.TSSG/wms/WMSHelper.cs
index 9fc75c5..8e12f8b 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.TSSG/wms/WMSHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.TSSG/wms/WMSHelper.cs
@@ -591,11 +591,15 @@
{
// 1銆佹煡璇㈠綋鍓嶅簱鍖�鎺�鐗╂枡 鏈夋墭鐩樼殑璐т綅
var db = new SqlHelper<object>().GetInstance();
- result = db.Queryable<Location>()
- .Where(l => l.N_CURRENT_NUM > 0 && l.S_AREA_CODE == area && l.N_ROW == row && l.N_LOCK_STATE == 0 && (l.C_ENABLE != "绂佺敤" && l.C_ENABLE != "N"))
- .Includes(l => l.LocCntrRel, l => l.CntrItemRel)
- .OrderByDescending(l => l.N_COL)
- .First();
+ var isLock = db.Queryable<Location>().Where(a => a.S_AREA_CODE == area && a.N_ROW == row && a.N_LOCK_STATE != 0).Count()> 0;
+ if (!isLock)
+ {
+ result = db.Queryable<Location>()
+ .Where(l => l.N_CURRENT_NUM > 0 && l.S_AREA_CODE == area && l.N_ROW == row && l.N_LOCK_STATE == 0 && (l.C_ENABLE != "绂佺敤" && l.C_ENABLE != "N"))
+ .Includes(l => l.LocCntrRel, l => l.CntrItemRel)
+ .OrderByDescending(l => l.N_COL)
+ .First();
+ }
}
catch (Exception ex)
{
--
Gitblit v1.9.1