From 611b793a87d3a0d6a2edacbf99318a678df3ad3f Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 12 十二月 2025 10:11:55 +0800
Subject: [PATCH] 关单CloseExportNotice增加校验库存信息并修改
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 84 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 9a1b206..75b2736 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1914,12 +1914,14 @@
{
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("鍙傛暟寮傚父,璇锋鏌ョ姸鎬佹槸鍚︿负鎵ц瀹屾垚鎴栬鍗曞叧闂�");
}
- //鎬诲簱瀛樹俊鎭�
- var stockList = Db.Queryable<DataStock>().ToList();
+ ////鎬诲簱瀛樹俊鎭�
+ //var stockList = Db.Queryable<DataStock>().ToList();
//鍑哄簱鍗曟槑缁�
var noticeDetail = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.SONo == notice.SONo).ToList();
@@ -1932,11 +1934,14 @@
notice.UpdateTime = DateTime.Now;
Db.Updateable(notice).ExecuteCommand();
- var skuList = noticeDetail.Select(d => d.SkuNo).ToList();
- var stocks = stockList.Where(s => skuList.Contains(s.SkuNo)).ToList();
+ //var skuList = noticeDetail.Select(d => d.SkuNo).ToList();
+ //var stocks = stockList.Where(s => skuList.Contains(s.SkuNo)).ToList();
+
+ List<string> sqlList = new List<string>();
foreach (var d in noticeDetail)
{
+ #region MyRegion
//鏇存敼搴撳瓨鏄庣粏閿佸畾鏁伴噺
//var orders = dataContext.WmsExportOrder.Where(o => o.ExportDetailId == d.Id
// && o.ExportExecuteFlag != "4" && o.ExportExecuteFlag == "3" && o.pickingType == 0).ToList();
@@ -1968,7 +1973,8 @@
//{
// throw new Exception("褰撳墠鍗曟嵁鏄庣粏涓鍒掓暟閲忎笌鎷ｈ揣鏁伴噺涓嶇锛岃鏍稿疄");
//}
- #region 搴撳瓨琛ㄥ噺鍘婚攣瀹氭暟閲忎笌鎬绘暟閲�(PDA鎷ｈ揣鐨勬椂鍊欏凡缁忓噺鍘绘暟閲忎簡)
+
+ //搴撳瓨琛ㄥ噺鍘婚攣瀹氭暟閲忎笌鎬绘暟閲�(PDA鎷ｈ揣鐨勬椂鍊欏凡缁忓噺鍘绘暟閲忎簡)
/*var sq = stocks.Where(s => s.SkuNo == d.SkuNo);
if (!string.IsNullOrWhiteSpace(d.LotNo))
{
@@ -1995,7 +2001,53 @@
Db.Updateable(st).UpdateColumns(it => new { it.Qty, it.LockQty }).ExecuteCommand();
}*/
#endregion
+ //瀹為檯鎷ｈ揣琛�
+ string completeSql = $@"select PalletNo,Qty-CompleteQty as lessQty
+ from BllExportAllot
+ where IsDel='0' and SONo='{d.SONo}' and SkuNo='{d.SkuNo}' and LotNo='{d.LotNo}'";
+ DataTable completeDt = Db.Ado.GetDataTable(completeSql);
+ //淇敼鎵樼洏鏄庣粏鐨勯攣瀹氭暟閲�
+ foreach (DataRow dr in completeDt.Rows)
+ {
+ decimal lessQty = Convert.ToDecimal(dr["lessQty"]);
+ if (lessQty > 0)
+ {
+ //鏌ョ湅搴撳瓨鏄庣粏閿佸畾鏁伴噺-lessQty
+ string stockDetailSql = $@"select LockQty-{lessQty} as morelockQty from DataStockDetail where IsDel='0' and SkuNo='{d.SkuNo}' and LotNo='{d.LotNo}' and PalletNo='{dr["PalletNo"] + ""}'";
+ decimal morelockQty = Db.Ado.GetDecimal(stockDetailSql);
+
+ if (morelockQty >= 0)
+ {
+ sqlList.Add($@"update DataStockDetail set LockQty=LockQty-{morelockQty} where IsDel='0' and SkuNo='{d.SkuNo}' and LotNo='{d.LotNo}' and PalletNo='{dr["PalletNo"] + ""}'");
+ }
+ }
+
+ }
}
+
+ //淇敼搴撳瓨鎬昏〃
+ string exportDetailSql = $@"select SkuNo,LotNo,sum(Qty)-sum(CompleteQty) as lessQty
+ from BllExportNoticeDetail
+ where IsDel='0' and SONo='{notice.SONo}'
+ group by SkuNo,LotNo";
+ DataTable exportDetailDt = Db.Ado.GetDataTable(exportDetailSql);
+
+ foreach (DataRow dr in exportDetailDt.Rows)
+ {
+ decimal lessQty = Convert.ToDecimal(dr["lessQty"]);
+ if (lessQty > 0)
+ {
+ //鏌ョ湅搴撳瓨閿佸畾鏁伴噺-lessQty
+ string stockDetailSql = $@"select LockQty-{lessQty} as morelockQty from DataStock where IsDel='0' and SkuNo='{dr["SkuNo"] + ""}' and LotNo='{dr["LotNo"] + ""}'";
+ decimal morelockQty = Db.Ado.GetDecimal(stockDetailSql);
+
+ if (morelockQty >= 0)
+ {
+ sqlList.Add($@"update DataStock set LockQty=LockQty-{morelockQty} where IsDel='0' and SkuNo='{dr["SkuNo"] + ""}' and LotNo='{dr["LotNo"] + ""}'");
+ }
+ }
+ }
+
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationSOServer().AddLogOperationSo("鍑哄簱浣滀笟", "鍑哄簱鍗曟嵁", notice.SONo, "鍏冲崟", $"鍏抽棴浜嗗崟鎹彿涓簕notice.SONo}鐨勫崟鎹俊鎭�", userId);
@@ -2880,7 +2932,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;
@@ -3336,7 +3390,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;
@@ -6525,19 +6581,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("鏈煡璇㈠埌鐩爣鍌ㄤ綅淇℃伅");
@@ -6601,7 +6660,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