From 59af98c2aeb6c40d820e8d5c2f9f6764f57721bd Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:11:23 +0800
Subject: [PATCH] 覆盖祈禧的代码
---
service/base/MesPrintMangeer.cs | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/service/base/MesPrintMangeer.cs b/service/base/MesPrintMangeer.cs
index dd0a641..b73c912 100644
--- a/service/base/MesPrintMangeer.cs
+++ b/service/base/MesPrintMangeer.cs
@@ -47,23 +47,37 @@
new("@oldBar", query.barcode.Trim())
};
- var sql = @"SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.OLDQTY as QUANTITY,B.CREATE_DATE, '鎷嗗垎鏉＄爜' AS BarType,A.ITEM_BARCODE,GETDATE() as print_date
- FROM MES_INV_ITEM_STOCKS A
- LEFT JOIN MES_INV_ITEM_BARCODES B ON A.ITEM_BARCODE = B.ITEM_BARCODE
- LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
- WHERE A.ITEM_BARCODE = @cfBar
-
- UNION ALL
-
- SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,A.QUANTITY as QUANTITY,B.CREATE_DATE, '鍘熷鏉＄爜' AS BarType,A.ITEM_BARCODE,GETDATE() as print_date
- FROM MES_INV_ITEM_STOCKS A
- LEFT JOIN MES_INV_ITEM_BARCODES B ON A.ITEM_BARCODE = B.ITEM_BARCODE
- LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
- WHERE A.ITEM_BARCODE = @oldBar";
+ var sql = @"EXEC prc_pda_base_selBarCfInfo @cfBar,@oldBar";
var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
- if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+
+ return mergedData;
+ }
+
+ /// <summary>
+ /// PDA閲嶆墦鏉＄爜
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="ArgumentException"></exception>
+ public dynamic getPrintBarInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
+ {
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query?.barcode))
+ throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
+
+ // 浣跨敤寮虹被鍨嬪弬鏁�
+ var sqlParams = new List<SugarParameter> {
+ new("@pi_Bar", query.barcode.Trim())
+ };
+
+ var sql = @"EXEC prc_pda_basePrint_selBarInfo @pi_Bar ";
+
+ var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
+
+ //if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
return mergedData;
}
@@ -93,9 +107,9 @@
FROM MES_INV_ITEM_BARCODES B
LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
WHERE B.ITEM_BARCODE = @cfBar
-
+
UNION ALL
-
+
SELECT TOP 1 C.ITEM_NO,C.item_name,C.item_model,B.QUANTITY as QUANTITY,B.CREATE_DATE, '鍘熷鏉＄爜' AS BarType,B.ITEM_BARCODE,GETDATE() as print_date
FROM MES_INV_ITEM_BARCODES B
LEFT JOIN MES_ITEMS C ON C.item_id = B.ITEM_ID
@@ -109,6 +123,5 @@
}
-
-}
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3