From 59a91fadefd16806964ab9f6e2ca0fb90c23854c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期一, 11 三月 2024 19:00:27 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index a9b7c7a..8a95a3a 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1230,17 +1230,23 @@
throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
}
skuNo = stockDetail.First().SkuNo;
- //else
- //{
- // //鍒ゆ柇鏄惁鏈夐浂绠�
- // var detailIdList = stockDetail.Select(m => m.Id).ToList();
- // var dataBoxInfo = Db.Queryable<DataBoxInfo>().Where(m => detailIdList.Contains(m.StockDetailId)).ToList();
- // if (dataBoxInfo.Count(m => m.BitBoxMark == "1")>0)
- // {
- // throw new Exception($"{palletNo}鎵樼洏涓婃湁闆剁锛屼笉鍙叆搴擄紒");
- // }
+ if (!string.IsNullOrWhiteSpace(stockDetail.First().WareHouseNo))
+ {
+ if (stockDetail.First().WareHouseNo == "W01")//绔嬪簱
+ {
+ throw new Exception($"{palletNo}鎵樼洏涓婂湪绔嬪簱涓湁搴撳瓨鍌ㄤ綅淇℃伅锛岃鏍稿疄锛�");
+ }
- //}
+ if (stockDetail.First().WareHouseNo == "W02")//骞冲簱
+ {
+ var locatePingKu = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == stockDetail.First().LocatNo);
+ if (locatePingKu != null)
+ {
+ locatePingKu.Status = "0";
+ Db.Updateable(locatePingKu).ExecuteCommand();
+ }
+ }
+ }
//鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
--
Gitblit v1.8.0