From 402382718b6dadd81ae6ab712131f49835279950 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 28 五月 2025 15:22:50 +0800
Subject: [PATCH] 1.现场收料字段优化

---
 service/Wom/WomdaaManager.cs |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 6eec2ea..4f8343e 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -1,5 +1,6 @@
 锘縰sing System.Data;
 using System.Data.SqlClient;
+using System.Text;
 using Masuit.Tools;
 using Microsoft.SqlServer.Server;
 using NewPdaSqlServer.DB;
@@ -690,6 +691,7 @@
        ISNULL(Sub.JS_Sum, 0) AS JS_Num, -- 浣跨敤LEFT JOIN瀛愭煡璇㈢殑缁撴灉
        C.item_no,
        C.item_name,
+       C.item_model,
        D.USER_NAME
 FROM MES_INV_ITEM_OUTS A
          LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
@@ -710,6 +712,7 @@
 GROUP BY A.item_out_no,
          C.item_no,
          C.item_name,
+         C.item_model,
          D.USER_NAME,
          C.item_id,
          ISNULL(Sub.JS_Sum, 0);";
@@ -888,4 +891,33 @@
         }
     }
 
+    public dynamic GetXcslDaa(dynamic unity)
+    {
+
+        var sqlParams = new List<SugarParameter> { };
+
+        var sql2 = new StringBuilder(@"
+        SELECT '['+DAA001+']['+DAA021+']' AS daaInfo,DAA001,DAA021
+        FROM WOMDAA
+        WHERE daa018 NOT IN ('W:瀹屽伐', 'D:寰呭紑宸�')");
+
+        if (!string.IsNullOrWhiteSpace(unity.selectKey?.ToString()))
+        {
+            sqlParams.Add(new("@selectKey", unity.selectKey));
+            sql2.Append(@"
+            AND (DAA001 LIKE '%' + @selectKey + '%' 
+            OR DAA021 LIKE '%' + @selectKey + '%')");
+        }
+
+        var XcslItem = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
+
+        if (XcslItem == null)
+        {
+            throw new Exception("璇ユ潯浠朵笅鏃犲搴斿伐鍗曚俊鎭紝璇烽噸鏂拌緭鍏ワ紒");
+        }
+
+        return XcslItem;
+    }
+
+
 }
\ No newline at end of file

--
Gitblit v1.9.3