From 5e2454c2a75cb70afc0d1933e5c29e02e21231e6 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期一, 19 八月 2024 17:01:31 +0800
Subject: [PATCH] 测试流程，修改问题
---
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 28b7459..889ab1e 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -1332,22 +1332,23 @@
var endLocate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
if (endLocate != null)
{
- if (endLocate.Status != "0")
+ if (endLocate.Status != "4")
{
- throw new Exception("鐩爣鍌ㄤ綅鐘舵�侀潪绌哄偍浣�");
+ throw new Exception("鐩爣鍌ㄤ綅鐘舵�侀潪绉诲叆涓�");
}
}
//鏇存敼搴撳瓨鏄庣粏
foreach (var item in stockDetail)
{
- item.Status = "0";//寰呭垎閰�
- item.LockQty = 0;//閿佸畾鏁伴噺鏀逛负0
+ //item.Status = "0";//寰呭垎閰�
+ //item.LockQty = 0;//閿佸畾鏁伴噺鏀逛负0
if (endLocate != null)//鏈夌洰鏍囧偍浣嶈鏄庣Щ鍒板叾浠栧尯鍩熷偍浣�
{
item.LocatNo = endLocate.LocatNo;//鍌ㄤ綅鏇存敼
item.WareHouseNo = endLocate.WareHouseNo;//鎵�灞炰粨搴撴洿鏀�
item.RoadwayNo = endLocate.RoadwayNo;//鎵�灞炲贩閬撴洿鏀�
- item.AreaNo = endLocate.AreaNo;//鎵�灞炲尯鍩熸洿鏀�
+ item.AreaNo = endLocate.AreaNo;//鎵�灞炲尯鍩熸洿鏀�
+
}
else//娌℃湁鐩爣鍌ㄤ綅璇存槑绉诲埌鍏ュ簱鍙�
{
@@ -1355,13 +1356,44 @@
item.WareHouseNo = "";//鎵�灞炰粨搴撴洿鏀癸紙鏀逛负绌猴級
item.RoadwayNo = "";//鎵�灞炲贩閬撴洿鏀癸紙鏀逛负绌猴級
item.AreaNo = "";//鎵�灞炲尯鍩熸洿鏀癸紙鏀逛负绌猴級
- }
+ }
+ if (item.Qty == item.LockQty && item.LockQty>0)
+ {
+ item.Status = "2";
+ }
+ else if (item.Qty > item.LockQty && item.LockQty > 0)
+ {
+ item.Status = "1";
+ }
+ else if (item.Qty > item.LockQty && item.LockQty == 0)
+ {
+ item.Status = "0";
+ }
Db.Updateable(item).ExecuteCommand();
- //鏇存敼搴撳瓨鎬昏〃
- var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
- stock.LockQty -= (decimal)item.Qty;
- Db.Updateable(stock).ExecuteCommand();
+
+
+
+ if (endLocate != null && endLocate.AreaNo == "B12") //鏄惁鏄�3妤肩紦瀛樺尯 鏄細鍒犻櫎搴撳瓨
+ {
+ //搴撳瓨绠辩爜鏄庣粏鍒犻櫎
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).ToList();
+ Db.Deleteable(boxInfo).ExecuteCommand();
+ //鍒犻櫎搴撳瓨鎵樼洏淇℃伅
+ Db.Deleteable(item).ExecuteCommand();
+ //鏇存敼搴撳瓨鎬昏〃
+ var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+ stock.LockQty -= (decimal)item.Qty;
+ stock.Qty -= (decimal)item.Qty;
+ Db.Updateable(stock).ExecuteCommand();
+ //鏇存敼鎵樼洏鐘舵��
+ var pallet = Db.Queryable<SysPallets>().First(m=>m.IsDel =="0" && m.PalletNo == task.PalletNo);
+ if (pallet != null)
+ {
+ pallet.Status = "0";
+ Db.Updateable(pallet).ExecuteCommand();
+ }
+ }
}
if (endLocate != null)
{
--
Gitblit v1.8.0