From c9fe2c53364abe0e0e495a1b756267f865159e2e Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 25 六月 2025 12:17:26 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index ace488b..e57b70b 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -514,7 +514,7 @@
CreateTime = a.CreateTime,
UpdateTime = a.UpdateTime
- }).OrderByDescending(a => a.CreateTime).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
+ }).OrderByDescending(a => a.ASNNo).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
count = total;
return data;
}
@@ -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,
@@ -1027,6 +1038,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = dataList.Sum(m => m.Qty);// 鏁伴噺
@@ -1082,6 +1094,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data1.Sum(m => m.Qty);// 鏁伴噺
@@ -1134,6 +1147,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
@@ -1186,6 +1200,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
@@ -1252,6 +1267,7 @@
model1.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = dataList.Sum(m => m.Qty);// 鏁伴噺
model1.BoxNo = data.BoxNo; // 绠卞彿
@@ -1271,6 +1287,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = data.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Qty;// 鏁伴噺
model.BoxNo = data.BoxNo3; // 鏀彿
@@ -1318,6 +1335,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1340,6 +1358,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model1.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
@@ -1386,6 +1405,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1410,6 +1430,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty; // 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
@@ -1478,6 +1499,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = boxData.ProductionTime;//鐢熶骇鏃ユ湡
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
model.BoxNo = boxData.BoxNo; // 鏀彿
@@ -1506,6 +1528,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
+ model.ProductionTime = item.ProductionTime;//鐢熶骇鏃ユ湡
model1.Qty = item.Qty;// 鏁伴噺
model1.BoxNo = item.BoxNo3; // 鏀彿
--
Gitblit v1.8.0