From 145f894535e510213095184d408f1795759346bf Mon Sep 17 00:00:00 2001 From: wxw <Administrator@DESKTOP-5BIMHQ3> Date: 星期五, 20 六月 2025 16:13:45 +0800 Subject: [PATCH] 入库批次号改为选择性填写 --- Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs index 3aa92c5..57e902e 100644 --- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs +++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs @@ -597,9 +597,13 @@ { throw new Exception("鍗曟嵁鏁伴噺涓嶈兘灏忎簬绛変簬0"); } - if (string.IsNullOrWhiteSpace(asnList.LotNo)) + //if (string.IsNullOrWhiteSpace(asnList.LotNo)) + //{ + // throw new Exception("鍗曟嵁鎵规鍙蜂笉鑳戒负绌�"); + //} + if (string.IsNullOrWhiteSpace(asnList.BoxCodeStr)) { - throw new Exception("鍗曟嵁鎵规鍙蜂笉鑳戒负绌�"); + throw new Exception("鍗曟嵁绠辩爜甯稿�间笉鑳戒负绌�"); } var asn = Db.Queryable<BllArrivalNotice>().First(m => m.ASNNo == asnList.ASNNo && m.IsDel == "0"); if (asn == null) @@ -723,9 +727,16 @@ string maxLotNoStr = ""; //鎵规鍙� string maxBoxCode = ""; //绠辩爜鍙� - - maxLotNoStr = asnList.LotNo; - maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo); + + maxLotNoStr = asnList.BoxCodeStr;//asnList.LotNo; + if (string.IsNullOrEmpty(asnList.LotNo)) + { + maxBoxCode = label.Where(m => m.ASNDetailNo == asnList.Id).Max(a => a.BoxNo); + } + else + { + maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo); + } #endregion for (int i = 1; i <= labelNum; i++) @@ -772,7 +783,7 @@ Status = "0", SkuNo = asnList.SkuNo, SkuName = asnList.SkuName, - LotNo = maxLotNoStr, + LotNo = asnList.LotNo,//maxLotNoStr, Standard = asnList.Standard, PackageStandard = packStr, SupplierLot = supplierLot, -- Gitblit v1.8.0