From 59a91fadefd16806964ab9f6e2ca0fb90c23854c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期一, 11 三月 2024 19:00:27 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 5afee30..1d8d751 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1809,6 +1809,10 @@
{
model.LotNo = model.LotNo.Substring(indexOfDash + 1);
}
+ else
+ {
+ model.LotNo = "";
+ }
}
//鍒ゆ柇鐗╂枡鏁伴噺鏄惁涓�0 涓�0鍒ゆ柇绠辩爜淇℃伅 涓嶄负0缁х画
if (model.SkuQty == 0)
@@ -1890,7 +1894,7 @@
throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳瀹烇紒");
}
// 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
- var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && model.LotNo.Contains(m.LotNo));
+ var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
if (detail == null)
{
throw new Exception("-1:褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
@@ -1957,7 +1961,7 @@
}
}
#endregion
- var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
+ var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo && m.Status != "2");
var bindId = 0;
if (bind == null)
{
@@ -1974,7 +1978,7 @@
Type = "0",
LotNo = model.LotNo,
LotText = detail.LotText,
- SupplierLot = "",
+ SupplierLot = detail.SupplierLot,
InspectMark = "0",
BitPalletMark = "1",
IsBale = "0",
--
Gitblit v1.8.0