From f3ad86fe50a0d2ba81b203517184264eea7bf0c0 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期四, 05 六月 2025 17:04:44 +0800
Subject: [PATCH] 入库审核逻辑更改 代码修改
---
api/WmsSpaHelper.cs | 224 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 129 insertions(+), 95 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index a677c7d..ca8958c 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -451,17 +451,6 @@
}
foreach (var item in items.ITEM)
{
- bool v = MaterPanduan(item.WLBM, item.SL);
- if (!v)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = items.HEAD.WLPZH;
- result.resultCode = 1;
- result.WLPZND = items.HEAD.WLPZND;
- result.resultMsg = $"鐗╂枡{item.WLBM}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
- simpleResults.Add(result);
- continue;
- }
///鍒ゆ柇鏄惁閮芥湁鍐查攢鍑瘉缂栧彿
if (string.IsNullOrEmpty(item.CXPZH))
{
@@ -1227,17 +1216,7 @@
foreach (var a in itemwlpz.ITEM)
{
- bool v = MaterPanduan(a.WLBM, a.SL);
- if (!v)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = itemwlpz.HEAD.WLPZH;
- result.resultCode = 1;
- result.WLPZND = itemwlpz.HEAD.ND;
- result.resultMsg = $"鐗╂枡{a.WLBM}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
- simpleResults.Add(result);
- continue;
- }
+
po.Details.Add(new TN_Inbound_Detail
{
S_IO_NO = itemwlpz.HEAD.WLPZH,
@@ -1275,17 +1254,6 @@
{
foreach (var a in itemwlpz.ITEM)
{
- bool v = MaterPanduan(a.WLBM, a.SL);
- if (!v)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = itemwlpz.HEAD.WLPZH;
- result.resultCode = 1;
- result.WLPZND = itemwlpz.HEAD.ND;
- result.resultMsg = $"鐗╂枡{a.WLBM}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
- simpleResults.Add(result);
- continue;
- }
if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).Count() > 0)
{
var poq = po.Details.Where(s => s.S_ITEM_CODE == a.WLBM).FirstOrDefault();
@@ -1396,17 +1364,7 @@
foreach (var a in itemwlpz.ITEM)
{
- bool v = MaterPanduan(a.WLBH, a.SL);
- if (!v)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = itemwlpz.HEAD.WLPZBH;
- result.resultCode = 1;
- result.WLPZND = itemwlpz.HEAD.WLPZNF;
- result.resultMsg = $"鐗╂枡{a.WLBH}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
- simples.Add(result);
- continue;
- }
+
#region 涓嶉渶瑕� //if (a.ITEM1.Select(s => s.XLH).Count() > 0)//鍒ゆ柇搴忓垪鍙锋槸鍚︿负澶氫釜
//{
@@ -1473,17 +1431,6 @@
foreach (var a in itemwlpz.ITEM)
{
- bool v = MaterPanduan(a.WLBH, a.SL);
- if (!v)
- {
- result.resultMsg = "澶辫触";
- result.WLPZBH = itemwlpz.HEAD.WLPZBH;
- result.resultCode = 1;
- result.WLPZND = itemwlpz.HEAD.WLPZNF;
- result.resultMsg = $"鐗╂枡{a.WLBH}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
- simples.Add(result);
- continue;
- }
if (po.Details.Where(s => s.S_ITEM_CODE == a.WLBH).Count() > 0)
{
var poq = po.Details.Where(s => s.S_ITEM_CODE == a.WLBH).FirstOrDefault();
@@ -1817,6 +1764,15 @@
internal static SimpleResult InboundOrderSorting(MPSorting model)
{
var result = new SimpleResult();
+ foreach (var a in model.MaterList)
+ {
+ bool v = MaterPanduan(a.item_code, a.qty);
+ if (v)
+ {
+ result.resultMsg = $"鐗╂枡{a.item_code}鏁伴噺瓒呰繃 搴撳瓨鎬绘暟";
+ return result;
+ }
+ }
//鍒ゆ柇璧峰搴撲綅鏄惁閿佸畾
// var db = new SqlHelper<object>().GetInstance();
using (var db = new SqlHelper<object>().GetInstance())
@@ -3336,7 +3292,7 @@
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- break ;
+ continue;
}
po.Details.Add(new TN_Ll_detail
{
@@ -3344,7 +3300,7 @@
S_AREA_CODE = "HJQ",
N_ROW_NO = "",
S_ITEM_CODE = a.WLBM,
- S_ITEM_NAME = item.S_ITEM_NAME,
+ S_ITEM_NAME = item?.S_ITEM_NAME,
F_QTY = a.XQSL,
S_ZJBM = a.ZJBM,
S_YLBH = a.YLBH,
@@ -3364,8 +3320,23 @@
}
if (po.Details.Count()>0)
{
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛";
+ iTEMs.Add(lLDReturnRoot1);
var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0;
db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
+ }
+ else
+ {
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛,鏃犳暟鎹坊鍔�;
+ iTEMs.Add(lLDReturnRoot1);
}
}
@@ -3388,7 +3359,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鎵ц涓鏂欏崟锛岀墿鏂檣a.WLBM}鐗╂枡涓嶅厑璁稿垹闄�;
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
@@ -3404,7 +3375,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -3448,7 +3419,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鏇存柊澶辫触锛屾洿鏂版暟閲忓繀椤诲ぇ浜庡綋鍓嶇墿鏂欐暟閲弡a.WLBM}";
iTEMs.Add(lLDReturnRoots);
- break;
+ continue;
}
}
}
@@ -3533,16 +3504,26 @@
//娣诲姞鏁版嵁
if (listtn.Count() > 0)
{
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛";
+ iTEMs.Add(lLDReturnRoot1);
db.Insertable<TN_Ll_detail>(listtn).ExecuteCommand();
+ }
+ else
+ {
+ LLDReturnRoot.ITEM lLDReturnRoot1 = new LLDReturnRoot.ITEM();
+ lLDReturnRoot1.GC = itemscddll.GC;
+ lLDReturnRoot1.LLDH = itemscddll.LLDH;
+ lLDReturnRoot1.MSGCODE = 0;
+ lLDReturnRoot1.MSGDESP = $"鎴愬姛,鏃犳暟鎹坊鍔�;
+ iTEMs.Add(lLDReturnRoot1);
}
}
-
- lLDReturnRoots.GC = itemscddll.GC;
- lLDReturnRoots.LLDH = itemscddll.LLDH;
- lLDReturnRoots.MSGCODE = 0;
- lLDReturnRoots.MSGDESP = $"鎴愬姛";
- iTEMs.Add(lLDReturnRoots);
+
db.CommitTran();
}
@@ -4100,6 +4081,10 @@
result.resultMsg = "鏁版嵁涓嶅瓨鍦�;
return result;
}
+ po.Details= po.Details.Where(d => model.Wlist.Any(w =>
+ w.S_ITEM_CODE == d.S_ITEM_CODE &&
+ w.N_ROW_NO == d.N_ROW_NO))
+ .ToList();
if (po.S_IN_TYPE == "鍐呴噰鍏ュ簱")
{
List<NcRkDto.ITEM> listitem = new List<NcRkDto.ITEM>();
@@ -4221,22 +4206,39 @@
//娣诲姞鍑瘉璁板綍琛� result.resultMsg = data.ROOT.ITEM.MSGDESP;
result.resultCode = data.ROOT.ITEM.MSGCODE;
- MaterialVoucher materialVoucher = new MaterialVoucher();
+ //MaterialVoucher materialVoucher = new MaterialVoucher();
if (data.ROOT.ITEM.MSGCODE == 0)
{
- materialVoucher.S_NO = model.S_NO;
- materialVoucher.S_TYPE = po.S_IN_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
- materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
- materialVoucher.STATUS = 0;
- db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ //materialVoucher.S_NO = model.S_NO;
+ //materialVoucher.S_TYPE = po.S_IN_TYPE;
+ //materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
+ //materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
+ //materialVoucher.STATUS = 0;
+ //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ List<MaterialVoucher> materials = new List<MaterialVoucher>();
+ foreach (var item in model.Wlist)
+ {
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ materialVoucher.S_WLBM = item.S_ITEM_CODE;
+ materialVoucher.S_WLH = item.N_ROW_NO;
+ materialVoucher.S_TYPE = po.S_IN_TYPE;
+ materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
+ materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
+ materialVoucher.STATUS = 0;
+ materials.Add(materialVoucher);
+ }
+
+ if (materials.Count() > 0)
+ {
+
+ db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
+ }
}
}
- else
-
- if (po.S_IN_TYPE == "璁″垝澶栭�鏂欏叆搴�)
+ else if (po.S_IN_TYPE == "璁″垝澶栭�鏂欏叆搴�)
{
DateTime dateTime;
DateTime dateTime1;
@@ -4361,13 +4363,25 @@
result.resultCode = data.ROOT.ITEM.MSGCODE;
if (data.ROOT.ITEM.MSGCODE == 0)
{
- MaterialVoucher materialVoucher = new MaterialVoucher();
- materialVoucher.S_NO = po.S_NO;
- materialVoucher.S_TYPE = po.S_IN_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
- materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
- materialVoucher.STATUS = 0;
- db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ List< MaterialVoucher > materials = new List< MaterialVoucher >();
+ foreach (var item in model.Wlist)
+ {
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ materialVoucher.S_WLBM = item.S_ITEM_CODE;
+ materialVoucher.S_WLH = item.N_ROW_NO;
+ materialVoucher.S_TYPE = po.S_IN_TYPE;
+ materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
+ materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
+ materialVoucher.STATUS = 0;
+ materials.Add( materialVoucher );
+ }
+
+ if (materials.Count() > 0)
+ {
+
+ db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
+ }
}
#endregion
@@ -4492,15 +4506,34 @@
result.resultCode = data.ROOT.ITEM.MSGCODE;
if (data.ROOT.ITEM.MSGCODE == 0)
{
- MaterialVoucher materialVoucher = new MaterialVoucher();
- materialVoucher.S_NO = model.S_NO;
- materialVoucher.S_TYPE = po.S_IN_TYPE;
- materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH;
- LogHelper.Info("鍊�: " + data.ROOT.ITEM?.WLPZH);
- LogHelper.Info("鍊�: " + materialVoucher.S_WLPZBH);
- materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
- materialVoucher.STATUS = 0;
- db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ //MaterialVoucher materialVoucher = new MaterialVoucher();
+ //materialVoucher.S_NO = model.S_NO;
+ //materialVoucher.S_TYPE = po.S_IN_TYPE;
+ //materialVoucher.S_WLPZBH = data.ROOT.ITEM?.WLPZH;
+ //LogHelper.Info("鍊�: " + data.ROOT.ITEM?.WLPZH);
+ //LogHelper.Info("鍊�: " + materialVoucher.S_WLPZBH);
+ //materialVoucher.S_WLPZND = data.ROOT.ITEM?.WLPZND;
+ //materialVoucher.STATUS = 0;
+ //db.Insertable<MaterialVoucher>(materialVoucher).ExecuteCommand();
+ List<MaterialVoucher> materials = new List<MaterialVoucher>();
+ foreach (var item in model.Wlist)
+ {
+ MaterialVoucher materialVoucher = new MaterialVoucher();
+ materialVoucher.S_NO = po.S_NO;
+ materialVoucher.S_WLBM = item.S_ITEM_CODE;
+ materialVoucher.S_WLH = item.N_ROW_NO;
+ materialVoucher.S_TYPE = po.S_IN_TYPE;
+ materialVoucher.S_WLPZBH = data.ROOT.ITEM.WLPZH;
+ materialVoucher.S_WLPZND = data.ROOT.ITEM.WLPZND;
+ materialVoucher.STATUS = 0;
+ materials.Add(materialVoucher);
+ }
+ if (materials.Count() > 0)
+ {
+
+ db.Insertable<MaterialVoucher>(materials).ExecuteCommand();
+ }
+
}
//else
//{
@@ -4713,17 +4746,18 @@
var po = db.Queryable<CntrItemRel>().Where(a => a.S_CNTR_CODE == S_CNTR_CODE && a.S_BS_NO == taskno).ToList();
LogHelper.Info("娣诲姞鍏ュ簱璁板綍琛╬o" + po.Count());
- var pz = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == taskno).First();
- var ass = pz == null;
+ var pzs = db.Queryable<MaterialVoucher>().Where(a => a.S_NO == taskno).ToList();
+ var ass = pzs == null;
LogHelper.Info("娣诲姞鍏ュ簱璁板綍琛╬z" + ass);
List<OutboundRecord> records = new List<OutboundRecord>();
foreach (var item in po)
{
+ var pz= pzs.Where(s=>s.S_WLBM==item.S_ITEM_CODE&&s.S_WLH==item.N_BS_ROW_NO).First();
OutboundRecord outboundRecord = new OutboundRecord();
outboundRecord.S_NO = item.S_BS_NO;
outboundRecord.S_TYPE = pz?.S_TYPE;
- outboundRecord.S_WLPZBH = pz?.S_WLPZBH;
+ outboundRecord.S_WLPZBH = pz?.S_WLBM;
outboundRecord.S_WLPZND = pz?.S_WLPZND;
outboundRecord.S_WLBM = item.S_ITEM_CODE;
outboundRecord.S_SL = item.F_QTY;
--
Gitblit v1.9.1