From 131347ad63bb534b5abb6dbc979f0a47d780d8ff Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 15 一月 2025 15:06:05 +0800
Subject: [PATCH] ·
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 30adf61..69e37ea 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -72,10 +72,10 @@
{
throw new Exception("鍗曟嵁鍙蜂笉鍙负绌�!");
}
- if (model.AsnDetailNo == 0)
- {
- throw new Exception("鍗曟嵁鏄庣粏涓嶅彲涓虹┖!");
- }
+ //if (model.AsnDetailNo == 0)
+ //{
+ // throw new Exception("鍗曟嵁鏄庣粏涓嶅彲涓虹┖!");
+ //}
//鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo && a.OrderCode == model.OrderCode);
if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
@@ -91,11 +91,13 @@
throw new Exception("鎵规涓嶈兘涓虹┖!");
}
// 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
- detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailNo && m.ASNNo == model.AsnNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
+ detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0"
+ && m.ASNNo == model.AsnNo && m.LotNo == model.LotNo && m.SkuNo == model.SkuNo);
if (detail == null)
{
throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
}
+ model.AsnDetailNo = detail.Id;
}
@@ -685,6 +687,7 @@
throw new Exception(ex.Message);
}
}
+
public List<BoxInfoDto> GetBoxInfoList(BoxInfoVm model, out int count)
{
@@ -1560,7 +1563,9 @@
throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
}
//楠岃瘉鏄惁涓哄钩搴撳叆搴�
- if (houseNo == "W02")
+ var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);//鑾峰彇浠撳簱绫诲瀷
+ //楠岃瘉鏄惁涓哄钩搴撳叆搴�
+ if (houseType.Type == "2")
{
throw new Exception("骞冲簱璇蜂娇鐢≒DA鎵嬫寔杩涜骞冲簱鍏ュ簱");
}
--
Gitblit v1.8.0