From e9ef6afe836784d7fbd3e3ca6ad813e86866a6a8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 25 十二月 2024 17:52:27 +0800
Subject: [PATCH] 生成补料和生成超领
---
service/Warehouse/MesItemBlManager.cs | 192 ++++++++++++++++++++++--------------------------
1 files changed, 88 insertions(+), 104 deletions(-)
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index a89cb7e..46d86b9 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -30,8 +30,9 @@
/// </summary>
/// <param name="billNo">琛ユ枡鍗曞彿</param>
/// <returns>琛ユ枡鍗曟槑缁嗗垪琛�</returns>
- public List<MesItemBlDetail> GetMesItemBlDetailByBillNo(
- WarehouseQuery query)
+ public (string bl001, List<MesItemBlDetail> item)
+ GetMesItemBlDetailByBillNo(
+ WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
@@ -63,7 +64,7 @@
})
.ToList();
- return blDetails;
+ return (mesItemBl.Bl001, blDetails);
}
/// <summary>
@@ -78,11 +79,10 @@
/// - userName: 鐢ㄦ埛鍚�
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList) SctlScanBarcode(
- WarehouseQuery query)
+ public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
+ SctlScanBarcode(
+ WarehouseQuery query)
{
- #region 鍙傛暟鏍￠獙
-
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒");
@@ -95,7 +95,6 @@
if (string.IsNullOrEmpty(query.blNo))
throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
- #endregion
// 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -164,17 +163,22 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (false, pendingList);
+
+ query.Num = stockBarcode.Quantity;
+ query.Fum = quantity;
+
+ return (query, pendingList);
}
// 寮�鍚簨鍔″鐞�
@@ -267,12 +271,12 @@
ErpId = womdab.Eid,
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
+ ItemId = blDetail.Bld012
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
}
-
+
// 鎻掑叆鍑哄簱鍗曟潯鐮佹槑缁�
db.Insertable(new MesInvItemOutCDetails
{
@@ -332,7 +336,7 @@
WorkNo = blDetail.Bld001, // Matches C_QTCK_D.Bld001
WorkLine = blDetail.Bld013, // Matches C_QTCK_D.Bld013
SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// CkDepot = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -363,13 +367,11 @@
.First();
if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0))
- {
// 鏇存柊鏄庣粏瀹屾垚鐘舵��
db.Updateable<MesItemBlDetail>()
.SetColumns(it => it.Bld011 == 1)
.Where(it => it.Id == blDetail1.Id)
.ExecuteCommand();
- }
// 鏇存柊搴撳瓨鏁伴噺涓�0
db.Updateable<MesInvItemStocks>()
@@ -386,7 +388,6 @@
.First();
if (unfinishedDetail == null)
- {
// 濡傛灉娌℃湁鏈畬鎴愮殑鏄庣粏锛屾洿鏂拌ˉ鏂欏崟鐘舵�佷负宸插畬鎴�
db.Updateable<MesItemBl>()
.SetColumns(it => new MesItemBl
@@ -397,7 +398,6 @@
})
.Where(it => it.Id == mesItemBl.Id)
.ExecuteCommand();
- }
return 1;
});
@@ -408,17 +408,18 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (true, finalPendingList);
+ return (query, finalPendingList);
}
/// <summary>
@@ -434,11 +435,9 @@
/// - Num: 鍙戞枡鏁伴噺(蹇呭～,蹇呴』澶т簬0)
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList) SplitBarcode(
+ public (bool success, List<MesItemBlDetail> pendingList) SplitBarcode(
WarehouseQuery query)
{
- #region 鍙傛暟鏍￠獙
-
if (string.IsNullOrEmpty(query.userName))
throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
@@ -454,7 +453,6 @@
if (string.IsNullOrEmpty(query.blNo))
throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
- #endregion
// 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -471,7 +469,7 @@
if (stockBarcode == null)
throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮�,璇锋牳瀵癸紒{query.barcode}");
-
+
var totalQty = stockBarcode.Quantity;
string newBarcode = null;
@@ -527,7 +525,7 @@
// Memo = stockBarcode.Memo,
SuppNo = stockBarcode.SuppNo,
// InsDate = stockBarcode.InsDate, // Added InsDate
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
}).IgnoreColumns(true).ExecuteCommand();
@@ -567,7 +565,7 @@
WorkNo = stockBarcode.WorkNo,
WorkLine = stockBarcode.WorkLine,
SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// UnitId = stockBarcode.ItemUnit
}).IgnoreColumns(true).ExecuteCommand();
@@ -601,7 +599,7 @@
WorkLine = stockBarcode.WorkLine,
SuppNo = stockBarcode.SuppNo,
SuppId = stockBarcode.SuppId,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// CkDepot = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
}
@@ -611,7 +609,7 @@
}
if (string.IsNullOrEmpty(newBarcode)) newBarcode = query.barcode;
-
+
// 妫�鏌ヨˉ鏂欏崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
.Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
@@ -652,7 +650,8 @@
throw new Exception($"宸ュ崟 {query.billNo} 涓嶅瓨鍦紝璇风‘璁わ紒");
var womdab = Db.Queryable<Womdab>()
- .Where(b => b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
+ .Where(b =>
+ b.Dab001 == query.billNo && b.Erpid == blDetail.Bld014)
.First();
if (womdab == null)
@@ -660,13 +659,13 @@
// 妫�鏌ュ凡鍙戞枡鏁伴噺鏄惁瓒呰繃寰呭彂鏂欐暟閲�
var sumQty = db.Queryable<MesInvItemOutCDetails>()
- .Where(it => it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
+ .Where(it =>
+ it.TaskNo == query.blNo && it.ItemId == stockBarcode.ItemId)
.Sum(it => it.Quantity);
if (sumQty > remainingQty)
- {
- throw new Exception($"鎷嗗垎鏁伴噺锛歿sumQty} 澶т簬寰呭彂鏂欐暟閲忥細{remainingQty}锛岃鏍稿锛�");
- }
+ throw new Exception(
+ $"鎷嗗垎鏁伴噺锛歿sumQty} 澶т簬寰呭彂鏂欐暟閲忥細{remainingQty}锛岃鏍稿锛�");
// 鑾峰彇鎴栧垱寤哄嚭搴撳崟
var itemOut = db.Queryable<MesInvItemOuts>()
@@ -720,7 +719,6 @@
.Count();
if (itemOutItemCount == 0)
- {
// 鎻掑叆鏂扮殑鍑哄簱鍗曟槑缁�
executeCommand += db.Insertable(new MesInvItemOutItems
{
@@ -742,13 +740,11 @@
ErpId = womdab.Eid,
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
+ ItemId = blDetail.Bld012
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
// 鏇存柊宸叉湁鍑哄簱鍗曟槑缁嗘暟閲�
executeCommand += db.Updateable<MesInvItemOutItems>()
.SetColumns(it => it.Quantity == it.Quantity + query.Num)
@@ -756,7 +752,6 @@
it.ItemOutId == itemOut.Guid &&
it.ItemId == stockBarcode.ItemId)
.ExecuteCommand();
- }
// 鎻掑叆鍑哄簱鏉＄爜鏄庣粏
executeCommand += db.Insertable(new MesInvItemOutCDetails
@@ -816,7 +811,7 @@
WorkNo = blDetail.Bld001,
WorkLine = blDetail.Bld013,
SuppNo = stockBarcode.SuppNo,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// CkDepot = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -848,13 +843,11 @@
.First();
if ((updatedDetail.Bld007 ?? 0) <= (updatedDetail.Bld008 ?? 0))
- {
// 鏇存柊鏄庣粏瀹屾垚鐘舵��
executeCommand += db.Updateable<MesItemBlDetail>()
.SetColumns(it => new MesItemBlDetail { Bld011 = 1 })
.Where(it => it.Id == blDetail.Id)
.ExecuteCommand();
- }
// 妫�鏌ユ槸鍚﹁繕鏈夋湭瀹屾垚鐨勬槑缁�
@@ -863,7 +856,6 @@
.First();
if (unfinishedDetail == null)
- {
// 濡傛灉娌℃湁鎵惧埌鏈畬鎴愭槑缁嗭紝鍒欐洿鏂拌ˉ鏂欏崟鐘舵�佷负宸插畬鎴�
executeCommand += db.Updateable<MesItemBl>()
.SetColumns(it => new MesItemBl
@@ -874,8 +866,7 @@
})
.Where(it => it.Id == mesItemBl.Id)
.ExecuteCommand();
- }
-
+
if (executeCommand <= 1) throw new Exception("鏇存柊澶辫触");
return executeCommand;
@@ -886,13 +877,14 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
@@ -919,7 +911,7 @@
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>鐢熶骇瓒呴鍗曟槑缁嗗垪琛�</returns>
- public List<MesItemBlDetail> GetMesItemBlDetailBySccBillNo(
+ public (string bl001,List<MesItemBlDetail> item) GetMesItemBlDetailBySccBillNo(
WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.billNo))
@@ -967,7 +959,7 @@
})
.ToList();
- return pendingDetails;
+ return (mesItemBl.Bl001,pendingDetails);
}
/// <summary>
@@ -982,7 +974,7 @@
/// - userName: 鐢ㄦ埛鍚�(蹇呭～)
/// - blNo: 瓒呴鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList)
+ public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
ScanBarcodeForOverPicking(
WarehouseQuery query)
{
@@ -1020,7 +1012,7 @@
// 妫�鏌ヨ秴棰嗗崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && a.Bl008 == "鐢熶骇瓒呴")
+ .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
.First();
if (mesItemBl == null)
@@ -1086,24 +1078,28 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (false, pendingList);
+ query.Num = stockBarcode.Quantity;
+ query.Fum = quantity;
+
+ return (query, pendingList);
}
// 鎵ц鏁版嵁搴撲簨鍔�
UseTransaction(db =>
{
// 鐢熸垚鎴栬幏鍙栧嚭搴撳崟
- Guid outId = Guid.Empty;
+ var outId = Guid.Empty;
var outNo = "";
var outRecord = db.Queryable<MesInvItemOuts>()
.Where(a => a.BbillNo == query.blNo
@@ -1157,7 +1153,6 @@
.First();
if (outItem == null)
- {
// 鎻掑叆鍑哄簱鍗曟槑缁�
db.Insertable(new MesInvItemOutItems
{
@@ -1177,13 +1172,11 @@
ErpId = womdab.Eid,
ErpAutoid = womdab.Erpid,
PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
+ ItemId = blDetail.Bld012
// Unit = blDetail.Bld009,
// DepotId = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
// 鏇存柊鍑哄簱鍗曟槑缁嗘暟閲�
db.Updateable<MesInvItemOutItems>()
.SetColumns(it => new MesInvItemOutItems
@@ -1194,7 +1187,6 @@
it.ItemOutId == outId &&
it.ItemId == stockBarcode.ItemId)
.ExecuteCommand();
- }
// 鎻掑叆鍑哄簱鏉＄爜鏄庣粏
db.Insertable(new MesInvItemOutCDetails
@@ -1247,7 +1239,7 @@
WorkLine = blDetail.Bld013,
SuppNo = stockBarcode.SuppNo,
SuppId = stockBarcode.SuppId,
- ItemId = stockBarcode.ItemId,
+ ItemId = stockBarcode.ItemId
// CkDepot = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
@@ -1287,12 +1279,10 @@
// 濡傛灉鎵�鏈夋槑缁嗗畬鎴�,鏇存柊瓒呴鍗曠姸鎬佷负宸插畬鎴�
if (!hasUnfinished)
- {
db.Updateable<MesItemBl>()
.SetColumns(it => it.Bl019 == true)
.Where(it => it.Id == mesItemBl.Id)
.ExecuteCommand();
- }
return 1;
});
@@ -1303,25 +1293,26 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (true, finalPendingList);
+ return (query, finalPendingList);
}
/// <summary>
- /// 鐢熶骇瓒呴鎵撳嵃鏉＄爜
+ /// 鐢熶骇瓒呴鎵撳嵃鏉＄爜
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊缁撴灉</returns>
- public (bool success, List<PendingMaterialDto> pendingList)
+ public (bool success, List<MesItemBlDetail> pendingList)
PrintBarcodeForOverPicking(WarehouseQuery query)
{
UseTransaction(db =>
@@ -1560,7 +1551,6 @@
.Count();
if (itemOutItemCount == 0)
- {
// 鎻掑叆鏂扮殑鍑哄簱鍗曟槑缁�
db.Insertable(new MesInvItemOutItems
{
@@ -1582,13 +1572,11 @@
ErpId = workOrderDetail.Eid,
ErpAutoid = workOrderDetail.Erpid,
PbillNo = query.billNo,
- ItemId = blDetail.Bld012,
+ ItemId = blDetail.Bld012
// Unit = blDetail.Bld009,
// DepotId = stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
- }
else
- {
// 鏇存柊宸叉湁鍑哄簱鍗曟槑缁嗘暟閲�
db.Updateable<MesInvItemOutItems>()
.SetColumns(it => it.Quantity == it.Quantity + query.Num)
@@ -1596,7 +1584,6 @@
it.ItemOutId == itemOut.Guid &&
it.ItemId == stockBarcode.ItemId)
.ExecuteCommand();
- }
// 鎻掑叆鍑哄簱鏄庣粏璁板綍
db.Insertable(new MesInvItemOutCDetails
@@ -1685,13 +1672,11 @@
.First();
if ((blDetail1.Bld007 ?? 0) <= (blDetail1.Bld008 ?? 0))
- {
// 鏇存柊鏄庣粏瀹屾垚鐘舵��
db.Updateable<MesItemBlDetail>()
.SetColumns(it => it.Bld011 == 1)
.Where(it => it.Id == blDetail1.Id)
.ExecuteCommand();
- }
// 妫�鏌ユ槸鍚︽墍鏈夋槑缁嗛兘宸插畬鎴�
var hasUnfinished = db.Queryable<MesItemBlDetail>()
@@ -1700,12 +1685,10 @@
// 濡傛灉鎵�鏈夋槑缁嗗畬鎴�,鏇存柊琛ユ枡鍗曠姸鎬佷负宸插畬鎴�
if (!hasUnfinished)
- {
db.Updateable<MesItemBl>()
.SetColumns(it => it.Bl019 == true)
.Where(it => it.Id == mesItemBl.Id)
.ExecuteCommand();
- }
return 1;
});
@@ -1716,13 +1699,14 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
--
Gitblit v1.9.3