From 76a8ad8fa1b87975d1ad117e82be40eb35f41ef9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 12 六月 2025 08:26:53 +0800
Subject: [PATCH] 1.工单领料管控 2.生产退料申请优化
---
service/Wom/WomdaaManager.cs | 2 +-
service/Warehouse/MesItemTblManager.cs | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index 245d931..8464f91 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -168,11 +168,16 @@
if (c_mes_inv_item_barcodes.Memo != "鐢熶骇閫�鏂�")
throw new Exception("姝ゆ潯鐮佷笉鏄敓浜ч��鏂欐潯鐮侊紝涓嶅彲浣跨敤鐢熶骇閫�鏂欐ā鍧楋紒");
+ // 浣跨敤 String.Equals 鏂规硶杩涜瀛楃涓叉瘮杈冿紝鎸囧畾姣旇緝瑙勫垯涓哄拷鐣ュぇ灏忓啓锛屾彁楂樻瘮杈冪殑鐏垫椿鎬�
+ if (!string.Equals(c_mes_inv_item_barcodes.BillNo, p_bill_no, StringComparison.OrdinalIgnoreCase))
+ throw new Exception($"璇ユ潯鐮佸搴旂殑鐢宠鍙枫�恵c_mes_inv_item_barcodes.BillNo}銆戜笌 褰撳墠鐢宠鍗曞彿銆恵p_bill_no}銆戜笉涓�鑷达紝璇锋牳瀵癸紒");
// 鑾峰彇閫�鏂欏崟淇℃伅
var C_MES_ITEM_TBL = Db.Queryable<MesItemTbl>()
- .Where(a => a.BillNo == c_mes_inv_item_barcodes.BillNo
+ .Where(a => a.BillNo == p_bill_no
&& (a.Tbl013 ?? 0) == 1).First();
+
+
// 鑾峰彇閫�鏂欏崟淇℃伅
var tbWOMDAA = Db.Queryable<Womdaa>()
.Where(a => a.Guid.ToString() == C_MES_ITEM_TBL.Tbl002).First();
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 23dddc8..1436d92 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -902,7 +902,7 @@
var sql2 = new StringBuilder(@"
SELECT '['+DAA001+']['+DAA021+']' AS daaInfo,DAA001,DAA021
FROM WOMDAA
- WHERE daa018 NOT IN ('W:瀹屽伐', 'D:寰呭紑宸�')");
+ WHERE daa018 <>'W:瀹屽伐'");
if (!string.IsNullOrWhiteSpace(unity.selectKey?.ToString()))
{
--
Gitblit v1.9.3