From cc1ba9f94386561ce125d3af6da02667b61da6a8 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 02 九月 2025 10:09:32 +0800
Subject: [PATCH] 1.条码拆分优化，改为存储过程，只打印新条码。 2.携客云切换正式
---
service/base/MesPrintMangeer.cs | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/service/base/MesPrintMangeer.cs b/service/base/MesPrintMangeer.cs
index dc68505..5ee9f12 100644
--- a/service/base/MesPrintMangeer.cs
+++ b/service/base/MesPrintMangeer.cs
@@ -47,23 +47,11 @@
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;
}
@@ -75,6 +63,39 @@
// public List<dynamic> oldBarInfo { get; set; }
// }
+ public dynamic getCfBeforeInfo(dynamic query) // 浣跨敤鍏蜂綋绫诲瀷鏇夸唬dynamic
+ {
+ // 鍙傛暟鏍￠獙
+ if (string.IsNullOrEmpty(query?.cfBarcode))
+ throw new ArgumentException("鎷嗗垎鏉＄爜涓嶈兘涓虹┖");
+ if (string.IsNullOrEmpty(query?.barcode))
+ throw new ArgumentException("鍘熷鏉＄爜涓嶈兘涓虹┖");
+
+ // 浣跨敤寮虹被鍨嬪弬鏁�
+ var sqlParams = new List<SugarParameter> {
+ new("@cfBar", query.cfBarcode.Trim()),
+ 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,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
+ 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
+ WHERE B.ITEM_BARCODE = @oldBar";
+
+ var mergedData = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
+
+ if (mergedData.Count < 2) throw new Exception("鏉＄爜淇℃伅瀛樺湪寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+
+ return mergedData;
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3