From 8f28ca63dde584e5fefe51a07e69fd9b1af76fd2 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 09 六月 2025 12:28:27 +0800
Subject: [PATCH] 1.生产补料/超领优化 2.委外补料/超领优化 3.巡检检验新增工单查询选择 4.巡检优化新增时间段字段

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

diff --git a/service/QC/IpqcService.cs b/service/QC/IpqcService.cs
index 8964b18..d6c87f0 100644
--- a/service/QC/IpqcService.cs
+++ b/service/QC/IpqcService.cs
@@ -7,6 +7,7 @@
 using SqlSugar;
 using System.Data;
 using System.Data.SqlClient;
+using System.Text;
 using static Azure.Core.HttpHeader;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
@@ -152,6 +153,7 @@
                 a => a.Guid == parsedGuid.ToString())
             .Where(a => (a.FSubmit ?? 0) == 0)
             .OrderByDescending(a => a.CreateDate)
+            .OrderBy(a => a.checkTimeSlot)
             .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
 
         return (pageList, totalCount);
@@ -337,4 +339,34 @@
 
         return Db.Ado.ExecuteCommand(sql, sqlParams);
     }
+
+
+    public dynamic GetIpqcXjDaa(dynamic unity)
+    {
+
+        var sqlParams = new List<SugarParameter> { };
+        sqlParams.Add(new("@xt", unity.xt));
+
+        var sql2 = new StringBuilder(@"
+        SELECT '['+DAA001+']['+DAA021+']' AS daaInfo,DAA001,DAA021
+        FROM WOMDAA
+        WHERE DAA015 = @xt AND 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