From 88dd0bb81e2d4e6d560e7b62bbe0a9c141c84a41 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 20 九月 2025 16:21:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 139e9d3..706d873 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1067,10 +1067,10 @@
inspectStatus = "0,1";
break;
case "9"://鐢熶骇棰嗘枡鍑哄簱
- if (house != "W02")
- {
- throw new Exception("鐢熶骇棰嗘枡鍑哄簱鍙兘閫夋嫨鍘熸枡搴�");
- }
+ //if (house != "W02")
+ //{
+ // throw new Exception("鐢熶骇棰嗘枡鍑哄簱鍙兘閫夋嫨鍘熸枡搴�");
+ //}
skuType = "(0,1,3)";
inspectStatus = "1";
break;
@@ -1187,10 +1187,10 @@
switch (model.WareHouseNo)
{
case "W01"://鎴愬搧搴�
- if (skuList.Any(m => m.Type != "2"))
- {
- throw new Exception("浠撳簱涓庡嚭搴撶墿鏂欎笉绗�");
- }
+ //if (skuList.Any(m => m.Type != "2"))
+ //{
+ // throw new Exception("浠撳簱涓庡嚭搴撶墿鏂欎笉绗�");
+ //}
break;
case "W02"://鍘熸枡搴�
if (skuList.Any(m => m.Type == "2"))
@@ -3338,6 +3338,22 @@
throw new Exception(e.Message);
}
}
+ public string GetHouseByPalletNo(string palletNo)
+ {
+ try
+ {
+ var datail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ if (datail == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅");
+ }
+ return datail.WareHouseNo;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
public List<OutCommandDto> IssueOutHouseLk(string soNo, string outMode, int userId, string url, out string str)
{
--
Gitblit v1.8.0