From 716435e1177c454a9cd652fae35769a0ef9a3b7c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 13 二月 2025 10:10:39 +0800
Subject: [PATCH] 1.成品入库（初步） 2.仓库入参新增字段备注 3.采购入库，其他入库主表新增仓库id 4.其他出库优化
---
service/Warehouse/MesItemTblManager.cs | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index 5bbbd4d..10fbaac 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -8,26 +8,27 @@
namespace NewPdaSqlServer.service.Warehouse;
/// <summary>
-/// MES鐗╂枡琛ㄧ鐞嗙被
+/// MES鐗╂枡琛ㄧ鐞嗙被
/// </summary>
public class MesItemTblManager : Repository<MesItemTbl>
{
/// <summary>
- /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛�
+ /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛�
/// </summary>
/// <returns>閫�鏂欏崟鍙峰垪琛�</returns>
- public List<string> GetSCTLBillNo()
+ public List<string> GetSCTLBillNo(WarehouseQuery query)
{
var list = Db.Queryable<MesItemTbl>()
- .Where(s => (s.Tbl013 ?? 0) == 1 // 瀹℃牳閫氳繃
- && (s.Tbl020 ?? 0) == 0) // 鏈畬鎴�
+ .Where(s => (s.Tbl013 ?? 0) == 1 // 瀹℃牳閫氳繃
+ && (s.Tbl020 ?? 0) == 0
+ && s.Tbl008 == query.Type)
.Select(s => s.BillNo).ToList();
return list;
}
/// <summary>
- /// 鏍规嵁鍗曞彿鑾峰彇MES鐗╂枡琛ㄦ槑缁�
+ /// 鏍规嵁鍗曞彿鑾峰彇MES鐗╂枡琛ㄦ槑缁�
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>鐗╂枡鏄庣粏鍒楄〃</returns>
@@ -48,12 +49,12 @@
BillNo = a.BillNo,
Tlid = b.Tlid,
Tlmid = b.Tlmid,
- Tld005 = b.Tld005 ?? 0, // 寰呴��鏁伴噺
- Tld006 = b.Tld006 ?? 0, // 宸查��鏁伴噺
+ Tld005 = b.Tld005 ?? 0, // 寰呴��鏁伴噺
+ Tld006 = b.Tld006 ?? 0, // 宸查��鏁伴噺
Tld009 = b.Tld009,
- ItemNo = c.ItemNo, // 鐗╂枡缂栧彿
- ItemName = c.ItemName, // 鐗╂枡鍚嶇О
- ItemModel = c.ItemModel // 鐗╂枡鍨嬪彿
+ ItemNo = c.ItemNo, // 鐗╂枡缂栧彿
+ ItemName = c.ItemName, // 鐗╂枡鍚嶇О
+ ItemModel = c.ItemModel // 鐗╂枡鍨嬪彿
}).ToList();
// 绛涢�夊嚭寰呴��鏁伴噺澶т簬宸查��鏁伴噺鐨勮褰�
@@ -64,7 +65,7 @@
}
/// <summary>
- /// 鐢熶骇閫�鏂欐壂鎻忓簱浣�
+ /// 鐢熶骇閫�鏂欐壂鎻忓簱浣�
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>搴撲綅淇℃伅</returns>
@@ -91,19 +92,19 @@
}
/// <summary>
- /// 鐢熶骇閫�鏂欐壂鎻忔潯鐮�
+ /// 鐢熶骇閫�鏂欐壂鎻忔潯鐮�
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊缁撴灉</returns>
public WarehouseQuery SctlScanBarcode(WarehouseQuery query)
{
- var p_item_barcode = query.barcode; // 鐗╂枡鏉＄爜
- var p_bill_no = query.billNo; // 鍗曟嵁鍙�
- var p_section_code = query.DepotCode; // 搴撲綅缂栫爜
- var c_user = query.userName; // 鐢ㄦ埛鍚�
+ var p_item_barcode = query.barcode; // 鐗╂枡鏉＄爜
+ var p_bill_no = query.billNo; // 鍗曟嵁鍙�
+ var p_section_code = query.DepotCode; // 搴撲綅缂栫爜
+ var c_user = query.userName; // 鐢ㄦ埛鍚�
- var p_bill_type_id = 100; // 鍗曟嵁绫诲瀷ID
- var p_transction_no = 104; // 浜ゆ槗缂栧彿
+ var p_bill_type_id = 100; // 鍗曟嵁绫诲瀷ID
+ var p_transction_no = 104; // 浜ゆ槗缂栧彿
// 楠岃瘉搴撲綅鏉＄爜
if (p_section_code.IsNullOrEmpty()) throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
@@ -442,7 +443,11 @@
.Where(it => it.BillNo == p_bill_no)
.ExecuteCommand();
- if (totalResult < 3) throw new Exception("鎻掑叆澶辫触");
+ // 妫�鏌ュ繀瑕佺殑鎻掑叆鎿嶄綔鏄惁閮芥垚鍔熸墽琛�
+ var minimumExpectedOperations = 3; // 鑷冲皯闇�瑕佹墽琛岀殑鎻掑叆鎿嶄綔鏁�
+ if (totalResult < minimumExpectedOperations)
+ throw new Exception(
+ $"鍏抽敭鏁版嵁鎻掑叆澶辫触锛岄鏈熻嚦灏憑minimumExpectedOperations}涓搷浣滐紝瀹為檯鎵ц{totalResult}涓搷浣�");
return totalResult;
});
--
Gitblit v1.9.3