From 4430f49d7a5ce2303633cbeac7ec0c9be05572d1 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期六, 17 八月 2024 11:24:07 +0800
Subject: [PATCH] 关联条件 物料编号改为物料id
---
MES.Service/service/Warehouse/OpeningReceiptServer.cs | 46 +++++++++++++---------------------------------
1 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/MES.Service/service/Warehouse/OpeningReceiptServer.cs b/MES.Service/service/Warehouse/OpeningReceiptServer.cs
index 74dc31e..e84e35e 100644
--- a/MES.Service/service/Warehouse/OpeningReceiptServer.cs
+++ b/MES.Service/service/Warehouse/OpeningReceiptServer.cs
@@ -18,37 +18,26 @@
public MesInvItemBarcodes ScanInBarcodeQC(WarehouseQuery query)
{
if (string.IsNullOrWhiteSpace(query.sectionCode))
- {
throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
- }
var depotCode = GetDepotCode(query.sectionCode);
if (depotCode == null)
- {
throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
- }
var checkBarcodeAlreadyReceived =
CheckBarcodeAlreadyReceived(query.barcode);
- if (checkBarcodeAlreadyReceived > 0)
- {
- throw new Exception("鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
- }
+ if (checkBarcodeAlreadyReceived > 0) throw new Exception("鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
if (CheckBarcodeInStock(query.barcode) > 0)
- {
throw new Exception("鏉＄爜宸插湪搴撳瓨涓紝璇锋牳瀵癸紒");
- }
var barcodeInfo = GetBarcodeInfo(query.barcode);
if (barcodeInfo == null || barcodeInfo.ComeFlg != 0)
- {
throw new Exception("鏉＄爜涓嶆槸鏈熷垵鏉＄爜锛屾棤娉曠敤鏈熷垵鍏ュ簱锛�");
- }
var inventoryItemInId = GetOrCreateInventoryItemInId(barcodeInfo,
- depotCode, query.userName, out string billNo);
+ depotCode, query.userName, out var billNo);
UseTransaction(db =>
{
@@ -71,15 +60,12 @@
var mesInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>()
.Where(s => s.ItemBarcode == query.barcode).Count();
- if (mesInvItemBarcodes <= 0)
- {
- throw new Exception("鏉＄爜涓嶅瓨鍦�");
- }
+ if (mesInvItemBarcodes <= 0) throw new Exception("鏉＄爜涓嶅瓨鍦�");
var mesInvItemInCDetails = Db.Queryable<MesInvItemInCDetails>()
.Where(s => s.ItemBarcode == query.barcode).Single();
- PurchaseInventory entity = new PurchaseInventory
+ var entity = new PurchaseInventory
{
ItemIns = GetMesInvItemIns(mesInvItemInCDetails.ItemInId),
InvItemInCDetails =
@@ -150,13 +136,11 @@
CbillNo = barcodeInfo.BillNo,
UrgentFlag = barcodeInfo.UrgentFlag,
BoardStyle = barcodeInfo.BoardStyle,
- TaskNo = barcodeInfo.TaskNo
+ TaskNo = barcodeInfo.TaskNo,
+ ItemId = barcodeInfo.ItemId,
}).ExecuteCommand();
- if (executeCommand <= 0)
- {
- throw new Exception("鍐欏叆澶辫触");
- }
+ if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
}
private decimal GetOrCreateInventoryItemInId(MesInvItemBarcodes barcodeInfo,
@@ -261,13 +245,11 @@
BoardStyle = barcodeInfo.BoardStyle,
WorkNo = barcodeInfo.WorkNo,
WorkLine = barcodeInfo.WorkLine,
- SuppNo = barcodeInfo.SuppNo
+ SuppNo = barcodeInfo.SuppNo,
+ ItemId = barcodeInfo.ItemId,
}).ExecuteCommand();
- if (executeCommand <= 0)
- {
- throw new Exception("鍐欏叆澶辫触");
- }
+ if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
}
private void InsertBusinessRecord(MesInvItemBarcodes barcodeInfo,
@@ -297,12 +279,10 @@
BillNo = billNo,
WorkNo = barcodeInfo.WorkNo,
WorkLine = barcodeInfo.WorkLine,
- SuppNo = barcodeInfo.SuppNo
+ SuppNo = barcodeInfo.SuppNo,
+ ItemId = barcodeInfo.ItemId,
}).ExecuteCommand();
- if (executeCommand <= 0)
- {
- throw new Exception("鍐欏叆澶辫触");
- }
+ if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
}
}
\ No newline at end of file
--
Gitblit v1.9.3