From fd2e2fb65f638239589d87661e447028686568fa Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 21 七月 2025 16:06:10 +0800
Subject: [PATCH] 1.生产补料/超领逻辑优化 2.采购入库防呆
---
service/Warehouse/MesItemBlManager.cs | 14 +++++++-------
service/Warehouse/MesInvItemInCDetailsManager.cs | 3 +++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 3ecf875..8dfc5d4 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -61,6 +61,9 @@
.Where(it => it.EbelnK3id == inventoryDetails.LineK3id)
.First();
+ if (cgddDetails == null)
+ throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲閲囪喘璁㈠崟鏄庣粏锛�");
+
if (inventoryDetails == null)
throw new Exception("姝ゆ潯鐮佹壘涓嶅埌瀵瑰簲鏀惰揣鍗曟槑缁嗭紒");
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index 26f8d2f..f7cc1d2 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -150,7 +150,7 @@
.First();
if (mesItemBl == null)
- throw new Exception($"鐢宠鍗� {query.blNo} 宸叉挙鍥烇紒");
+ throw new Exception($"鐢宠鍗� {query.blNo} 涓嶅瓨鍦紒");
if (mesItemBl.Bl018 != true)
throw new Exception($"鐢宠鍗� {query.blNo} 鏈鏍革紒");
@@ -288,7 +288,7 @@
// 妫�鏌ュ苟鏇存柊鍑哄簱鍗曠墿鏂欐槑缁�
var itemCount = db.Queryable<MesInvItemOutItems>()
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
+ i.ItemOutId == outId && i.ItemDabid == blDetail.Id && i.ItemId == stockBarcode.ItemId && i.DepotId == stockBarcode.DepotId.ToString())
.Count();
if (itemCount > 0)
@@ -297,7 +297,7 @@
.SetColumns(i =>
i.TlQty == i.TlQty + stockBarcode.Quantity)
.Where(i =>
- i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId && i.ItemOutId == outId && i.DepotId == stockBarcode.DepotsId.ToString())
+ i.ItemOutId == outId && i.ItemDabid == blDetail.Id && i.ItemId == stockBarcode.ItemId && i.DepotId == stockBarcode.DepotId.ToString())
.ExecuteCommand();
else
// 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
@@ -306,7 +306,7 @@
Guid = Guid.NewGuid(),
ItemOutId = outId,
ItemNo = blDetail.Bld002,
- Quantity = stockBarcode.Quantity,
+ Quantity = blDetail.Bld007,
TlQty = stockBarcode.Quantity,
CreateBy = query.userName,
CreateDate = DateTime.Now,
@@ -1317,7 +1317,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId,
+ DepotId = (int)stockBarcode.DepotId,
Dabid = womdab.Guid,
}).IgnoreColumns(true).ExecuteCommand();
@@ -1508,7 +1508,7 @@
EpFlag = stockBarcode.EpFlag,
CustomerNo = stockBarcode.CustomerNo,
DepotsCode = stockBarcode.DepotsCode,
- DepotsId = stockBarcode.DepotsId,
+ DepotsId = stockBarcode.DepotId,
DepotSectionsCode = stockBarcode.DepotSectionsCode,
CheckDate = stockBarcode.CheckDate,
ItemType = stockBarcode.ItemType,
@@ -1720,7 +1720,7 @@
PbillNo = query.billNo,
ItemId = blDetail.Bld012,
Unit = blDetail.Bld009,
- DepotId = (int)stockBarcode.DepotsId,
+ DepotId = (int)stockBarcode.DepotId,
LineK3id = workOrderDetail.Erpid,
EbelnK3id = workOrderDetail.Eid
}).IgnoreColumns(true).ExecuteCommand();
--
Gitblit v1.9.3