From 8f71eba2be4e76eeb427620f9a09428d43c0e193 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 22 九月 2025 09:07:54 +0800
Subject: [PATCH] 修改出库单删除功能，SAP下发的单子也可删除
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 139e9d3..c28c5bc 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -948,6 +948,7 @@
WaveNo = a.WaveNo,
IsDespatch = a.IsDespatch,
Demo = a.Demo,
+ OrderCode = a.OrderCode,
CreateUserName = c.RealName,
UpdateUserName = c.RealName,
@@ -1067,10 +1068,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 +1188,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"))
@@ -1830,9 +1831,9 @@
{
throw new Exception("鏈煡璇㈠埌鍑哄簱鍗曟嵁淇℃伅");
}
- if (notice.Origin != "WMS" || notice.Status != "0")
+ if (notice.Status != "0")//notice.Origin != "WMS" ||
{
- throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︽湭绛夊緟鎵ц鎴栨潵婧愭槸鍚︽槸WMS");
+ throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︽湭绛夊緟鎵ц");
}
//鎬诲簱瀛樹俊鎭�
@@ -3338,6 +3339,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