From 076b32f9fa1dc8dc39ca345b2b94a58c8e50040e Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期四, 26 六月 2025 14:40:48 +0800
Subject: [PATCH] 出库 分拣逻辑修改
---
api/WmsSpaHelper.cs | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index 6589bf4..05cf173 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -1750,10 +1750,10 @@
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.cntr_code).First();
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
if (hwbd!=null)
{
- endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE).First();
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
if (endloc?.N_LOCK_STATE != 0)
{
result.resultCode = 3;
@@ -2025,10 +2025,10 @@
if (!string.IsNullOrEmpty(model.cntr_code))
{
- var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == model.cntr_code).First();
if (hwbd!=null)
{
- end = db.Queryable<Location>().Where(s => s.S_CODE == hwbd.S_LOC_CODE).First();
+ end = db.Queryable<Location>().Where(s => s.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
}
else
{
@@ -2127,16 +2127,25 @@
{
var result = new SimpleResult();
-
// var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
{
try
{
-
-
- result.resultMsg = "鎴愬姛";
+ var start = "";
+ var startloc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == model.cntr_code).First();
+ if (startloc!=null)
+ {
+ start = startloc.S_LOC_CODE;
+ }
+ else
+ {
+ result.resultMsg = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
+ result.resultCode = 1;
+ return result;
+ }
+ result.resultMsg = "鎴愬姛";
result.resultCode = 0;
if (string.IsNullOrEmpty(model.arrival_no))
{
@@ -2159,27 +2168,27 @@
//鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
{
- result = await CXAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await CXAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
}
else
if (po.S_OUT_TYPE == "鍑哄簱")//鏅�鍑哄簱
{
LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
- result = await AddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await AddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
}
else if (po.S_OUT_TYPE == "璁″垝澶栧彂鏂欏嚭搴�)
{
- result = await jhwtlAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await jhwtlAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
}
else if (po.S_OUT_TYPE == "鎴愭湰涓績鍑哄簱")
{
- result = await CBAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
+ result = await CBAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, start);
}
//閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛
- result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, model.start, po.S_OUT_TYPE, model.cntr_type);
+ result = await TYAddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.IsHK, start, po.S_OUT_TYPE, model.cntr_type);
if (result.resultCode == 1)
- {
+ {
return result;
}
#region 鍗囬檷閲�@@ -2316,9 +2325,10 @@
//鍥炲弬鐗╂枡淇℃伅
List<OutboundRecord> records = new List<OutboundRecord>();
- var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).First();
+ var pzlist = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == arrival_no).ToList();
foreach (var item in MaterList)
{
+ var pz=pzlist.Where(s=>s.S_WLBM== item.item_code).FirstOrDefault();
// 鎻掑叆鍒版墭鐩樻槑缁嗚〃
var cntr = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntr_code).ToList();
if (cntr.Count() > 0)
@@ -2388,10 +2398,12 @@
return result;
}
Location endloc = new Location();
- var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE == cntr_code).First();
+
+ LogHelper.Info($"鑾峰彇鎵樼洏淇℃伅{cntr_code}瀹瑰櫒");
+ var hwbd = db.Queryable<TN_Container_Code>().Where(a => a.S_CNTR_CODE.Trim() == cntr_code).First();
if (hwbd != null)
{
- endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE).First();
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE == hwbd.S_LOC_CODE.Trim()).First();
if (endloc?.N_LOCK_STATE != 0)
{
result.resultCode = 3;
@@ -4569,7 +4581,7 @@
}
string combinedIds = string.Join(",", po.Details.Select(x => x.N_ROW_NO));
var KEY = WCSHelper.Generate13DigitIds();
- var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).First();
+ var s_key = db.Queryable<TN_InBounder_Sh>().Where(a => a.S_NO == model.S_NO && a.N_ROW_NO == combinedIds).ToList().FirstOrDefault();
if (s_key != null)
{
KEY = s_key.S_KEY;
--
Gitblit v1.9.1