From 156e0d593769d1c4438eb1c6d4547063f76331b3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 19 十一月 2025 15:52:31 +0800
Subject: [PATCH] 修改拣货拼托bug
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 0a3894e..2bbd99e 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -274,19 +274,8 @@
// 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�
var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.LotNo == detail.LotNo && m.SkuNo == detail.SkuNo);// && m.ASNDetailNo == bind.ASNDetailNo
var sdId1 = 0;
- if (sd1 != null)
+ if (sd1 == null)
{
- sdId1 = sd1.Id;
- // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
- sd1.Qty += bind.Qty;
- sd1.CompleteTime = comTime;
- sd1.UpdateUser = userId;
- sd1.UpdateTime = comTime;
-
- Db.Updateable(sd1).ExecuteCommand();
- }
- else
- {
// 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
sd1 = new DataStockDetail()
{
@@ -296,7 +285,7 @@
SkuNo = sku.SkuNo,
SkuName = sku.SkuName,
Standard = sku.Standard,
- Qty = bind.Qty,
+ Qty = 0,
LockQty = 0,
FrozenQty = 0,
InspectQty = 0,
@@ -317,7 +306,7 @@
InspectMark = bind.InspectMark,
InspectStatus = sku.IsInspect,
BitPalletMark = bind.BitPalletMark,
- PackagNo = sku.PackagNo,
+ PackagNo = sku.PackagNo,
IsBale = bind.IsBale,
IsBelt = bind.IsBelt,
@@ -358,20 +347,19 @@
//淇敼鍚堟牸涓嶅悎鏍兼暟閲�
if (quality.IsQualified == "1") //鍚堟牸
{
- //澧炲姞鍚堟牸鏁伴噺
- quality.PassQty += bind.Qty;
sd1.InspectStatus = "1";
}
else if (quality.IsQualified == "0") //涓嶅悎鏍�
{
- //澧炲姞涓嶅悎鏍兼暟閲�
- quality.FailQty += bind.Qty;
sd1.InspectStatus = "2";
}
- Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
}
//娣诲姞搴撳瓨鏄庣粏
sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
+ }
+ else
+ {
+ sdId1 = sd1.Id;
}
#endregion
@@ -524,10 +512,13 @@
#endregion
#region 搴撳瓨鏄庣粏
- if (sd1.Qty <= 0)
- {
- sd1.Qty = bind.Qty;
- }
+
+ // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
+ sd1.Qty += bind.Qty;
+ sd1.CompleteTime = comTime;
+ sd1.UpdateUser = userId;
+ sd1.UpdateTime = comTime;
+
//鏇存敼搴撳瓨鏄庣粏鏁伴噺
Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
#endregion
@@ -6297,6 +6288,10 @@
{
throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨锛岃鏍告煡!");
}
+ if (storageLocat.WareHouseNo != "W04")
+ {
+ throw new Exception("璇ュ偍浣嶄笉鏄钩搴撳偍浣嶏紝璇锋鏌�!");
+ }
if (storageLocat.Status != "0")
{
var detailInfo=Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo);
@@ -6304,6 +6299,11 @@
{
throw new Exception("鍌ㄤ綅涓嶆槸绌洪棽鐘舵�侊紝璇锋牳鏌�!");
}
+ var logIng = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.EndLocat == storageLocat.LocatNo && w.Status == "1" && w.PalletNo != model.PalletNo);
+ if (logIng != null)
+ {
+ throw new Exception("璇ュ偍浣嶆湁姝ｅ湪鎵ц鐨勫叆搴撲换鍔★紝璇锋牳鏌�!");
+ }
}
#endregion
--
Gitblit v1.8.0