From fddd1f3d621a1947d698652c72b6a16cc3f6ee2d Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期二, 24 六月 2025 17:07:51 +0800
Subject: [PATCH] 增加 审核表 审核逻辑优化 出入库逻辑修改
---
api/WmsSpaHelper.cs | 71 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index 5087be3..6589bf4 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -1750,15 +1750,21 @@
using (var db = new SqlHelper<object>().GetInstance())
{
Location endloc = new Location();
- var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == model.start).First();
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
if (hwbd!=null)
{
endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE).First();
+ if (endloc?.N_LOCK_STATE != 0)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"缁堢偣搴撲綅宸查攣/涓嶅瓨鍦�;
+ return result;
+ }
}
else
{
result.resultCode = 3;
- result.resultMsg = $"鎵樼洏鎵句笉鍒拌揣浣�;
+ result.resultMsg = $"{model.cntr_code}鎵樼洏鎵句笉鍒拌揣浣�;
return result;
}
@@ -2019,26 +2025,42 @@
if (!string.IsNullOrEmpty(model.cntr_code))
{
- #region MyRegion
- //var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
- //var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
- //start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
+ if (hwbd!=null)
+ {
+ end = db.Queryable<Location>().Where(s => s.S_CODE == hwbd.S_LOC_CODE).First();
+ }
+ else
+ {
- //// 鑾峰彇鎵�湁琚崰鐢ㄧ殑瀹瑰櫒缂栫爜
- //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
+ #region MyRegion
+ //var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
+ //var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
+ //start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();
- // 鑾峰彇鏈鍗犵敤鐨勫鍣ㄥ搴旂殑璐т綅缂栫爜
- var availableLocationCodes = db.Queryable<LocCntrRel>()
- .Select(s => s.S_LOC_CODE)
- .ToList();
+ //// 鑾峰彇鎵�湁琚崰鐢ㄧ殑瀹瑰櫒缂栫爜
+ //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
+ #endregion
+ // 鑾峰彇鏈鍗犵敤鐨勫鍣ㄥ搴旂殑璐т綅缂栫爜
+ var availableLocationCodes = db.Queryable<LocCntrRel>()
+ .Select(s => s.S_LOC_CODE)
+ .ToList();
// 鑾峰彇绗竴涓彲鐢ㄨ揣浣嶏紙濡傛灉娌℃湁鍒欒繑鍥瀗ull锛� end = db.Queryable<Location>()
.Where(it => !availableLocationCodes.Contains(it.S_CODE) && it.S_AREA_CODE == "HJQ")
.ToList().FirstOrDefault();
+ if (end!=null)
+ {
+ TN_Container_Code tN_Container_Code = new TN_Container_Code();
+ tN_Container_Code.S_CNTR_CODE= model.cntr_code;
+ tN_Container_Code.S_LOC_CODE = end.S_CODE;
+ var sss = db.Insertable<TN_Container_Code>(tN_Container_Code).ExecuteCommand();
+ }
- #endregion
+ }
+
}
else
{
@@ -2317,7 +2339,7 @@
else
{
db.Updateable(cir).UpdateColumns(it => new { it.F_QTY, it.S_CNTR_TYPE, it.F_ALLOC_QTY, it.T_MODIFY }).ExecuteCommand();
- //娣诲姞鍥炲簱浣滀笟
+
}
}
else
@@ -2370,11 +2392,18 @@
if (hwbd != null)
{
endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE).First();
+ if (endloc?.N_LOCK_STATE != 0)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"缁堢偣搴撲綅宸查攣/涓嶅瓨鍦�;
+ return result;
+ }
+
}
else
{
result.resultCode = 3;
- result.resultMsg = $"鎵樼洏鎵句笉鍒拌揣浣�;
+ result.resultMsg = $"{cntr_code}鎵樼洏鎵句笉鍒拌揣浣�;
return result;
}
@@ -2387,12 +2416,12 @@
S_START_AREA = startinfo.S_AREA_CODE,
S_START_WH = startinfo.S_WH_CODE,
- S_END_LOC = start,
- S_END_AREA = startinfo.S_AREA_CODE,
- S_END_WH = startinfo.S_AREA_CODE,
- //S_END_LOC = locs?.S_START_LOC,
- //S_END_AREA = locs?.S_START_AREA,
- //S_END_WH = locs?.S_START_WH,
+ //S_END_LOC = start,
+ //S_END_AREA = startinfo.S_AREA_CODE,
+ //S_END_WH = startinfo.S_AREA_CODE,
+ S_END_LOC = endloc?.S_CODE,
+ S_END_AREA = endloc?.S_AREA_CODE,
+ S_END_WH = endloc?.S_WH_CODE,
N_TYPE = 1,
// S_TYPE = WMSTask.GetTypeStr(1),
--
Gitblit v1.9.1