From ba9f3df626153f9081b75d23204f988d141fbfbb Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 06 三月 2024 16:21:16 +0800
Subject: [PATCH] 修改出库单页面
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 59a7019..d8a85e7 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1426,43 +1426,52 @@
string toLocation = string.Empty;//鐩爣浣嶇疆
string unstackingMode2 = unstackingMode;//鎷嗗灈鏂瑰紡锛�0:鏈哄櫒浜烘媶鍨� 1:PDA鎷嗗灈
#region 鍒ゆ柇鏄惁闇�瑕佹媶绠�
- string isChai = "0";//鏄惁闇�瑕佹媶绠憋紝0:鍚� 1:鏄�
- var skuInfo = skuList.First(w => w.SkuNo == item.SkuNo);
- if (skuInfo == null)
+ if (notice.Type == "0")//鎴愬搧鍑哄簱
{
- throw new Exception("鐗╂枡淇℃伅涓嶅瓨鍦紒");
- }
- var packagInfo = packagList.First(w => w.PackagNo == skuInfo.PackagNo);
- if (packagInfo == null)
- {
- throw new Exception("鍖呰淇℃伅涓嶅瓨鍦紒");
- }
- if (packagInfo.L2Name == "绠�")
- {
- if (item.Qty % (decimal)packagInfo.L2Num != 0)//鑳芥暣闄よ鏄庝笉鐢ㄦ媶绠憋紝涓嶈兘鏁撮櫎璇存槑闇�瑕佹媶绠�
+ string isChai = "0";//鏄惁闇�瑕佹媶绠憋紝0:鍚� 1:鏄�
+ var skuInfo = skuList.First(w => w.SkuNo == item.SkuNo);
+ if (skuInfo == null)
{
- isChai = "1";
- unstackingMode2 = "1";//闇�瑕佹媶绠遍渶璧癙DA鎷嗗灈
+ throw new Exception("鐗╂枡淇℃伅涓嶅瓨鍦紒");
+ }
+ var packagInfo = packagList.First(w => w.PackagNo == skuInfo.PackagNo);
+ if (packagInfo == null)
+ {
+ throw new Exception("鍖呰淇℃伅涓嶅瓨鍦紒");
+ }
+ if (packagInfo.L2Name == "绠�")
+ {
+ if (item.Qty % (decimal)packagInfo.L2Num != 0)//鑳芥暣闄よ鏄庝笉鐢ㄦ媶绠憋紝涓嶈兘鏁撮櫎璇存槑闇�瑕佹媶绠�
+ {
+ isChai = "1";
+ unstackingMode2 = "1";//闇�瑕佹媶绠遍渶璧癙DA鎷嗗灈
+ }
+ }
+ if (isChai == "0")
+ {
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == item.PalletNo && w.BitBoxMark == "1").ToList();
+ if (boxInfo != null)//鎵樼洏涓婃湁闆剁闇�瑕佹媶绠�
+ {
+ isChai = "1";
+ unstackingMode2 = "1";//闇�瑕佹媶绠遍渶璧癙DA鎷嗗灈
+ }
+ }
+
+ if (unstackingMode2 == "0")//鏈哄櫒浜烘媶鍨�
+ {
+ toLocation = loadingAddre;//瑁呰溅鍙�
+ }
+ else //PDA鎷嗗灈
+ {
+ toLocation = outMode;//鍑哄簱鍙�
}
}
- if (isChai == "0")
+ else
{
- var boxInfo = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.PalletNo == item.PalletNo && w.BitBoxMark == "1").ToList();
- if (boxInfo != null)//鎵樼洏涓婃湁闆剁闇�瑕佹媶绠�
- {
- isChai = "1";
- unstackingMode2 = "1";//闇�瑕佹媶绠遍渶璧癙DA鎷嗗灈
- }
- }
- #endregion
- if (unstackingMode2 == "0")//鏈哄櫒浜烘媶鍨�
- {
- toLocation = loadingAddre;//瑁呰溅鍙�
- }
- else //PDA鎷嗗灈
- {
+ unstackingMode2 = "1";//闈炴垚鍝佸嚭搴撹蛋PDA鎷嗗灈
toLocation = outMode;//鍑哄簱鍙�
- }
+ }
+ #endregion
// 鍌ㄤ綅鍙�
var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo).LocatNo;
--
Gitblit v1.8.0