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/Warehouse/MesItemQtrkManager.cs | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/service/Warehouse/MesItemQtrkManager.cs b/service/Warehouse/MesItemQtrkManager.cs
index ed9bae9..b9a1539 100644
--- a/service/Warehouse/MesItemQtrkManager.cs
+++ b/service/Warehouse/MesItemQtrkManager.cs
@@ -38,7 +38,8 @@
FROM MES_ITEM_QTRR_DETAIL A
LEFT JOIN MES_ITEM_QTRK B ON A.qtrkGuid = B.guid
LEFT JOIN MES_ITEMS C ON A.itemId = C.item_id
- WHERE B.qtck = @billNo AND QT015 = 1 AND QT028 = 1 AND QT032 = 1 AND QT014 = 0 ";
+ WHERE B.qtck = @billNo AND QT015 = 1 AND QT028 = 1 AND QT032 = 1 ";
+ //AND QT014 = 0
var sqlParams = new List<SugarParameter> {
new("@billNo", query.billNo)
@@ -123,17 +124,16 @@
var sqlParams = new List<SugarParameter> { new("@barcode", p_item_barcode), new("@billNo", p_bill_no) };
- var sql1 = @" SELECT TOP 1 A.rkCkId
-FROM MES_QA_ITEMS_DETECT_01 A
- LEFT JOIN MES_INV_ITEM_BARCODES B ON A.item_id = B.ITEM_ID
-WHERE order_type = '鍏跺畠鍏ュ簱妫�'
- AND A.lot_no = @billNo
- AND ITEM_BARCODE = @barcode ";
+// var sql1 = @" SELECT TOP 1 A.rkCkId
+//FROM MES_QA_ITEMS_DETECT_01 A
+// LEFT JOIN MES_INV_ITEM_BARCODES B ON A.item_id = B.ITEM_ID
+//WHERE order_type = '鍏跺畠鍏ュ簱妫�'
+// AND A.lot_no = @billNo
+// AND ITEM_BARCODE = @barcode ";
- var appDepotInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams).First();
+// var appDepotInfo = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams).First();
- if(appDepotInfo.rkCkId != c_depot_id)
- throw new Exception($"璇� {p_section_code} 瀵瑰簲鐨勪粨搴� 涓� 妫�楠屽垽瀹氱殑鍏ュ簱浠撳簱涓嶄竴鑷达紝璇风‘璁わ紒");
+
var mesDepost = Db.Queryable<MesDepots>()
@@ -172,6 +172,27 @@
if (qtrk == null) throw new Exception("鍏朵粬鍏ュ簱鐢宠鍗曚笉瀛樺湪锛�");
+
+ if (qtrk.Qt008 != c_depot_id.ToString())
+ throw new Exception($"璇� {p_section_code} 瀵瑰簲鐨勪粨搴� 涓� 妫�楠屽垽瀹氱殑鍏ュ簱浠撳簱涓嶄竴鑷达紝璇风‘璁わ紒");
+
+ var sql = @"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,
+ ISNULL(A.qd007,0) FQty,ISNULL(A.qd008,0) SQty,ISNULL(A.qd007,0) - ISNULL(A.qd008,0) DSQty
+ FROM MES_ITEM_QTRR_DETAIL A
+ LEFT JOIN MES_ITEM_QTRK B ON A.qtrkGuid = B.guid
+ LEFT JOIN MES_ITEMS C ON A.itemId = C.item_id
+ WHERE B.qtck = @billNo AND QT015 = 1 AND QT028 = 1 AND QT032 = 1 AND QT014 = 0 ";
+ //AND QT014 = 0
+
+ var sqlParams1 = new List<SugarParameter> {
+ new("@billNo", p_bill_no)
+ };
+
+ var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql, sqlParams1);
+
+ if (womdabs.Count < 1)
+ throw new Exception($"璇ュ叾浠栧叆搴撶敵璇峰崟 {query.billNo} 鏈叏閮ㄥ鏍告垨宸插畬缁擄紝璇风‘璁わ紒");
+
//// 楠岃瘉搴撲綅鏄惁灞炰簬鐢宠浠撳簱
//if (c_depot_id != Convert.ToInt32(qtrk.Qt008))
// throw new Exception($"鎵爜搴撲綅 {p_section_code} 涓嶅睘浜庣敵璇蜂粨搴�!");
--
Gitblit v1.9.3