From f147cfa91feec613eb304c78fecafdf43286034a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 30 三月 2024 11:12:24 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index c4d119e..3e4ae44 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -200,7 +200,7 @@
LotNo = m.LotNo,
LotText = m.LotText,
SupplierLot = m.SupplierLot,
- Qty = (int)m.Qty,
+ Qty = (decimal)m.Qty,
PalletNo = m.PalletNo
}).ToList();
@@ -641,7 +641,7 @@
BoxNo2 = l.BoxNo2,
BoxNo3 = l.BoxNo3,
PalletNo = l.PalletNo,
- Qty = (int)l.RealQty,
+ Qty = (decimal)l.RealQty,
FullQty = stockBoxInfo.FullQty,//婊＄鏁伴噺
Status = "2",
SkuNo = l.SkuNo,
@@ -658,12 +658,12 @@
};
Db.Insertable<DataBoxInfo>(databox).ExecuteCommand();
//搴撳瓨鏄庣粏澧炲姞鏁伴噺
- stockDetailInfo.Qty += (int)l.RealQty;
+ stockDetailInfo.Qty += l.RealQty;
}
else
{
//搴撳瓨鏄庣粏澧炲姞鏁伴噺
- stockDetailInfo.Qty = (int)l.RealQty;
+ stockDetailInfo.Qty = l.RealQty;
}
stockDetailInfo.Status = "0";
@@ -676,11 +676,11 @@
}
if (sku.Type != "4")
{
- de.Qty += (int)l.RealQty;
+ de.Qty += (decimal)l.RealQty;
}
else
{
- de.Qty += (int)(l.RealQty - l.Qty);
+ de.Qty += (decimal)(l.RealQty - l.Qty);
}
Db.Updateable(de).ExecuteCommand();
@@ -1553,7 +1553,7 @@
task.CancelDate = DateTime.Now;
Db.Updateable(task).ExecuteCommand();
- //淇敼鍌ㄤ綅淇℃伅
+ //淇敼璧峰鍌ㄤ綅淇℃伅
var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
if (locat == null)
{
@@ -1562,6 +1562,14 @@
locat.Status = "1"; //鏈夌墿鍝�
Db.Updateable(locat).ExecuteCommand();
+ //淇敼鐩爣鍌ㄤ綅淇℃伅
+ var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
+ if (locatEnd != null)
+ {
+ locatEnd.Status = "0"; //绌哄偍浣�
+ Db.Updateable(locatEnd).ExecuteCommand();
+ }
+
//淇敼搴撳瓨鏄庣粏
var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
if (stockDetail == null)
--
Gitblit v1.8.0