From 7c274192786484237d4260aa2590cbbb6a64a95d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 19 十二月 2025 11:42:29 +0800
Subject: [PATCH] 修改成品拣货逻辑
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 66196cd..3db3f78 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -280,7 +280,7 @@
sd1 = new DataStockDetail()
{
LotNo = bind.LotNo,
- LotText = bind.LotText,
+ //LotText = bind.LotText,
SupplierLot = bind.SupplierLot,
SkuNo = sku.SkuNo,
SkuName = sku.SkuName,
@@ -304,7 +304,7 @@
ExpirationTime = bind.ExpirationTime,
Status = "0",
InspectMark = bind.InspectMark,
- InspectStatus = sku.IsInspect,
+ //InspectStatus = sku.IsInspect,
BitPalletMark = bind.BitPalletMark,
PackagNo = sku.PackagNo,
IsBale = bind.IsBale,
@@ -314,13 +314,28 @@
CreateUser = 0,
CreateTime = comTime
};
+
+ //2025骞�12鏈�04鏃ョ敳鏂硅姹傗�滅敓浜ч��鏂欏叆搴撯�濋粯璁よ川妫�鍚堟牸
+ if (notice.Type == "8")
+ {
+ sd1.InspectStatus = "1";
+ sd1.LotText = "";
+ }
+ else
+ {
+ sd1.InspectStatus = sku.IsInspect;
+ sd1.LotText = bind.LotText;
+ }
+
+ //鐢熶骇鏃ユ湡
if (!string.IsNullOrEmpty(detail.Lot1))
{
- sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);//鐢熶骇鏃ユ湡
+ sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);
}
+ //鍒版湡鏃ユ湡
if (!string.IsNullOrEmpty(detail.Lot2))
{
- sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);//鍒版湡鏃ユ湡
+ sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);
}
var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == sd1.PalletNo && !string.IsNullOrEmpty(w.LocatNo));
if (palletData != null)
@@ -428,7 +443,7 @@
Standard = sku.Standard,
ProductionTime = box.ProductionTime,
SupplierLot = box.SupplierLot,
- InspectStatus = sku.IsInspect,
+ //InspectStatus = sku.IsInspect,
InspectMark = box.InspectMark,
BitBoxMark = box.BitBoxMark,
ExpirationTime = box.ExpirationTime,
@@ -436,6 +451,9 @@
CreateUser = 0,
CreateTime = comTime
};
+ //2025骞�12鏈�04鏃ョ敳鏂硅姹傗�滅敓浜ч��鏂欏叆搴撯�濋粯璁よ川妫�鍚堟牸
+ box2.InspectStatus = (notice.Type == "8") ? "1" : sku.IsInspect;
+
//娣诲姞搴撳瓨绠辩爜鏄庣粏
Db.Insertable(box2).ExecuteCommand();
#endregion
@@ -514,7 +532,7 @@
#region 搴撳瓨鏄庣粏
// 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
- sd1.Qty += bind.Qty;
+ sd1.Qty += factQty;
sd1.CompleteTime = comTime;
sd1.UpdateUser = userId;
sd1.UpdateTime = comTime;
@@ -1350,7 +1368,8 @@
{
sdId1 = sd1.Id;
// 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
- sd1.Qty += bind.Qty;
+ //sd1.Qty += bind.Qty;
+ sd1.Qty += model.SkuQty;
sd1.CompleteTime = comTime;
sd1.UpdateUser = userId;
sd1.UpdateTime = comTime;
@@ -1461,6 +1480,8 @@
bind.BitPalletMark = "0";
sd1.BitPalletMark = "0";
}
+ Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
+
//if (bind.Qty > pNum && isTextTable == 0)
if (bind.Qty > pNum)
{
@@ -1515,9 +1536,9 @@
#region 鏇存敼搴撳瓨鏄庣粏鏁伴噺
- sd1.Qty = bind.Qty;
- //鏇存敼搴撳瓨鏄庣粏鏁伴噺
- Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
+ //sd1.Qty = bind.Qty;
+ ////鏇存敼搴撳瓨鏄庣粏鏁伴噺
+ //Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
#endregion
@@ -2273,7 +2294,7 @@
BoxNo = obj.Data.BoxNo,
BoxNo2 = box.BoxNo2,
BoxNo3 = box2.BoxNo3,
- Qty = obj.Data.Qty,
+ Qty = 1,//obj.Data.Qty,
BitBoxMark = obj.Data.BitBoxMark,
ASNNo = "",
@@ -2286,7 +2307,7 @@
SkuNo = sku.SkuNo,
SkuName = sku.SkuName,
LotNo = box2.LotNo,
- LotText = obj.Data.LotNoBoxNum,
+ LotText = "",
ProductionTime = DateTime.Parse(box2.ProductionTime),
ExpirationTime = DateTime.Parse(box2.ExpirationTime),
//CompleteTime = "",
@@ -3023,6 +3044,11 @@
CreateTime = comTime
};
+ //鐪嬭缁戝畾鐨勬墭鐩樺湪搴撳瓨鏄庣粏鏄惁鏈夊偍浣嶄俊鎭�
+ string locatNoSql = $@"select LocatNo from DataStockDetail where PalletNo='{palletNo}' and isnull(LocatNo,'')!='' group by LocatNo";
+ string locatNoStr = Db.Ado.GetString(locatNoSql);
+ sd1.LocatNo = string.IsNullOrWhiteSpace(locatNoStr) ? "" : locatNoStr;
+
//娣诲姞搴撳瓨鏄庣粏
sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
}
--
Gitblit v1.8.0