From 2416f77980c0fd145a743a79b4fa0ca3ca0b3118 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期一, 08 十二月 2025 16:32:44 +0800
Subject: [PATCH] CloseExportNotice少拣货也可以正常关单
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 4f2bb47..e5a8e05 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -450,8 +450,8 @@
WaveNo = "",
IsIssueLotNo = string.IsNullOrWhiteSpace(d.lotNo) ? "0" : "1",
IsMixBox = "0",
-
OrderDetailCode = d.lineNo,
+ Status = "0",//榛樿绛夊緟鎵ц
CreateUser = 0,
};
@@ -580,7 +580,7 @@
WaveNo = "",
IsIssueLotNo = string.IsNullOrWhiteSpace(d.lotNo) ? "0" : "1",
IsMixBox = "0",
-
+ Status = "0",//榛樿绛夊緟鎵ц
CreateUser = 0,
};
list.Add(item);
@@ -613,11 +613,11 @@
CreateUser = 0,
};
- if (houseNo == "1000" || houseNo == "1001" || houseNo == "2000" || houseNo == "2002" || houseNo == "2003" || houseNo == "2004")
+ if (houseNo == "1000" || houseNo == "1001" || houseNo == "1002" || houseNo == "1003" || houseNo == "1098" || houseNo == "2000" || houseNo == "2001" || houseNo == "2002" || houseNo == "2003" || houseNo == "2004" || houseNo == "3101" || houseNo == "3102" || houseNo == "3103" || houseNo == "3104")
{
notice.WareHouseNo = "W02";
}
- else if (houseNo == "4000")
+ else if (houseNo == "4000" | houseNo == "4001")
{
notice.WareHouseNo = "W01";
}
@@ -753,12 +753,12 @@
//绯荤粺瀵规帴鍚庢斁寮�
var jsonData = JsonConvert.SerializeObject(soInfo);
- var response = HttpHelper.DoPost(url, jsonData, "鍑哄簱鍗曞畬鎴愪笂浼�", "ERP");
+ var response = HttpHelper.DoPost(url, jsonData, "鍑哄簱鍗曞畬鎴愪笂浼�", "SAP");
- var obj = JsonConvert.DeserializeObject<ErpModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
- if (obj.Success != 0)
+ var obj = JsonConvert.DeserializeObject<SapResultModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.RESULT != true)
{
- throw new Exception("涓婁紶澶辫触" + obj.Message);
+ throw new Exception("涓婁紶澶辫触" + obj.MESSAGE);
}
#endregion
}
@@ -1452,7 +1452,8 @@
{
throw new Exception("鏈煡璇㈠埌鍑哄簱鍗曟嵁淇℃伅");
}
- if (notice.Origin != "WMS" || notice.Status != "0")
+ //if (notice.Origin != "WMS" || notice.Status != "0")
+ if (notice.Status != "0")
{
throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︽湭绛夊緟鎵ц鎴栨潵婧愭槸鍚︽槸WMS");
}
@@ -1509,7 +1510,7 @@
//鏇存柊鍑哄簱鍗�
foreach (var d in model.Detail)
{
- if (d.Qty < 1)
+ if (d.Qty <= 0)
{
throw new Exception("鍑哄簱鏁版嵁蹇呴』澶т簬0");
}
@@ -1913,7 +1914,9 @@
{
throw new Exception("鏈煡璇㈠埌鍑哄簱鍗曟嵁淇℃伅");
}
- if (notice.Status != "4")
+ //2025骞�12鏈�08鏃ュ彲鎴疯姹傚皯鎷ｈ揣涔熷彲浠ユ甯稿叧鍗�
+ List<string> statusList = new List<string>() { "3", "4" };
+ if (!statusList.Contains(notice.Status))
{
throw new Exception("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︿负鎵ц瀹屾垚鎴栬鍗曞叧闂�");
}
@@ -2792,7 +2795,7 @@
decimal needQty = detail.Qty - (detail.AllotQty == null ? 0 : decimal.Parse(detail.AllotQty.ToString()));
//搴撳瓨鏄庣粏 Status 0锛氬緟鍒嗛厤 1锛氶儴鍒嗗垎閰� 2锛氬凡鍒嗛厤
var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.SkuNo == detail.SkuNo && (m.Qty - m.FrozenQty - m.LockQty + m.InspectQty) > 0 && (m.Status == "0" || m.Status == "1") && m.IsDel == "0"
- && m.AreaNo != "B06" && m.AreaNo != "B07" && m.AreaNo != "B09" && m.AreaNo != "B24")//鎺掗櫎杞﹂棿搴撳瓨
+ && m.AreaNo != "B06" && m.AreaNo != "B07" && m.AreaNo != "B09" && m.AreaNo != "B24" && m.AreaNo != "B26" && m.AreaNo != "B27" && m.AreaNo != "B28")//鎺掗櫎杞﹂棿搴撳瓨
.ToList();
@@ -2879,7 +2882,9 @@
CreateUser = userId,
CreateTime = DateTime.Now
};
- if (s.WareHouseNo == "W04")
+ //2025骞�12鏈�08鏃ヨ揣鏋跺簱鍜屽钩搴擄紝鐩存帴寰呮嫞璐�
+ List<string> wareHouseList = new List<string>() { "W02", "W04" };
+ if (wareHouseList.Contains(s.WareHouseNo))
{
allot.Status = "2";//寰呮嫞璐�
xQty += allot.Qty;
@@ -3335,7 +3340,9 @@
CreateUser = userId,
CreateTime = DateTime.Now
};
- if (stock.WareHouseNo == "W04")
+ //2025骞�12鏈�08鏃ヨ揣鏋跺簱鍜屽钩搴擄紝鐩存帴寰呮嫞璐�
+ List<string> wareHouseList = new List<string>() { "W02", "W04" };
+ if (wareHouseList.Contains(stock.WareHouseNo))
{
allot.Status = "2";//寰呮嫞璐�
xQty += allot.Qty;
@@ -4763,7 +4770,9 @@
}
- var endLocateList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && (m.AreaNo == "B02" || m.AreaNo == "B05")).Select(m => m.LocatNo).ToList();
+ //鎵�灞炲尯鍩熼泦鍚�
+ List<string> areNolist = new List<string>() { "B01", "B02", "B05" };
+ var endLocateList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && areNolist.Contains(m.AreaNo)).Select(m => m.LocatNo).ToList();
//鍒ゆ柇鏄惁鏄師杈呮枡鍑哄簱浠诲姟 璐ф灦鍌ㄤ綅=銆嬪钩搴撳偍浣�
if (endLocateList.Contains(task.EndLocat) && PalletType == "0")
{
@@ -6522,19 +6531,22 @@
throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
}
//鑾峰彇瀵瑰簲搴撲綅淇℃伅
- var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+ //var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+ var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.StartLocat);
if (startlocat == null)
{
throw new Exception("鏈煡璇㈠埌鍌ㄤ綅淇℃伅");
}
startlocat.Status = "0";//淇敼鍒嗛厤淇℃伅鐘舵��
//鑾峰彇鍌ㄤ綅淇℃伅
- var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+ //var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
+ var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.StartLocat);
//鑾峰彇绉诲簱浠籨鍔″搴旂洰鏍囧偍浣嶄俊鎭�
SysStorageLocat endlocat = new SysStorageLocat();
if (task.Type == "2")
{
- endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.EndLocat);
+ //endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.EndLocat);
+ endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == task.EndLocat);
if (endlocat == null)
{
throw new Exception("鏈煡璇㈠埌鐩爣鍌ㄤ綅淇℃伅");
@@ -6598,7 +6610,8 @@
//鑾峰彇搴撳瓨
var datastock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo);
//鑾峰彇鍌ㄤ綅淇℃伅
- var locate = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == stockDetail.LocatNo);
+ //var locate = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == stockDetail.LocatNo);
+ var locate = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.LocatNo == stockDetail.LocatNo);
//鍒ゆ柇鏄惁涓虹┖鎵樼洏
if (stockDetail.SkuNo == "100099")
--
Gitblit v1.8.0