From 02b26bfaca24386f7b4f4a5e9f336812370ed49b Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 09:45:46 +0800
Subject: [PATCH] 获取BOM参数调整

---
 service/Wom/WomdaaManager.cs |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 5256320..c516c2d 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -500,27 +500,37 @@
     /// </summary>
     /// <param name="query"></param>
     /// <returns></returns>
-    public dynamic getKbBarInfo(dynamic query)
+public dynamic getKbBarInfo(dynamic query)
+{    
+    if (string.IsNullOrEmpty(query.Kbbarcode?.ToString()))
+        throw new ArgumentException("鍗℃澘鏉$爜涓嶅厑璁镐负绌�", nameof(query.Kbbarcode));
+
+    var parameters = new[]
     {
-        if (string.IsNullOrEmpty(query.Kbbarcode?.ToString()))
-            throw new ArgumentException("鍗℃澘鏉$爜涓嶅厑璁镐负绌�", nameof(query.userName));
-
-        var sql = string.Format(@"SELECT QUANTITY,agvPostion,
-       ISNULL((SELECT COUNT(1) FROM MES_INV_ITEM_BARCODES_TBMX WHERE ABOUT_TB_BARCODE = '{0}'), 0) AS YSum,
-       DAA001
-FROM MES_INV_ITEM_BARCODES A LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
-left join MES_WORKSHOP_LINE C ON DAA015 = C.id AND iSAgV = 1
-WHERE ITEM_BARCODE = '{0}' ",  query.Kbbarcode);
-
-        var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
-
+        new SugarParameter("@pi_kbbarcode", query.Kbbarcode),
+        new SugarParameter("@inP1", null),
+        new SugarParameter("@inP2", null),
+        new SugarParameter("@inP3", null),
+        new SugarParameter("@inP4", null)
+    };
+    
+    try
+    {
+        var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(
+            "EXEC prc_pda_getKbBarInfo @pi_kbbarcode,@inP1,@inP2,@inP3,@inP4", parameters);
+        
         if (ZsBarInfo.Count < 1)
         {
-            throw new Exception($"璇ュ崱鏉跨爜{query.Zsbarcode}涓嶅瓨鍦紒");
+            throw new Exception($"璇ュ崱鏉跨爜{query.Kbbarcode}涓嶅瓨鍦紒");
         }
-
+        
         return ZsBarInfo;
     }
+    catch (Exception ex)
+    {
+        throw new Exception($"{ex.Message}");
+    }
+}
 
     /// <summary>
     /// 鑾峰彇鍗℃澘鏄庣粏淇℃伅
@@ -1413,7 +1423,7 @@
         var sqlParams = new List<SugarParameter> { };
 
         var sql2 = new StringBuilder(@"
-SELECT NAME,line_no FROM MES_WORKSHOP_LINE WHERE isAgv = 1 ORDER BY line_no");
+SELECT NAME,line_no,agvPostion FROM MES_WORKSHOP_LINE WHERE isAgv = 1 ORDER BY line_no");
 
 
         var XtItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
@@ -1495,6 +1505,7 @@
                 {
                     new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                     new("@pi_xtNum", SqlDbType.NVarChar, 100) { Value = query.XtNum },
+                    new("@in1", SqlDbType.NVarChar, 100) { Value = query.AgvDw },
                     new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
                     new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
                 };

--
Gitblit v1.9.3