From 6b3c4d87c500442f9774904c6a1117fe7cee5b5f Mon Sep 17 00:00:00 2001
From: 如洲 陈 <1278080563@qq.com>
Date: 星期三, 24 九月 2025 17:50:40 +0800
Subject: [PATCH] 退货检验平板优化、任务单加序列号

---
 MES.Service/service/QC/THJService.cs |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/MES.Service/service/QC/THJService.cs b/MES.Service/service/QC/THJService.cs
index f837801..187bb27 100644
--- a/MES.Service/service/QC/THJService.cs
+++ b/MES.Service/service/QC/THJService.cs
@@ -50,6 +50,7 @@
                 a.SL as Sl,
                 a.FCHECK_BY as StatusUser,
                 a.FCHECK_RESU as Result,
+                a.TJ as Tj,
                 COALESCE(m.ITEM_NAME, '') as ItemName,
                 COALESCE(m.ITEM_MODEL, '') as ItemModel,
                 a.SL as WorkQty,
@@ -77,17 +78,13 @@
             parameters.Add(new SugarParameter(":Id", queryObj.Id.Value));
         }
 
-        // 鏍规嵁鐘舵�佺瓫閫�
-        if (!string.IsNullOrEmpty(queryObj.Result))
+        // 鏍规嵁鏄惁瀹屾垚绛涢�夛紙涓ユ牸鎸塗J锛�
+        if (queryObj.Tj.HasValue)
         {
-            if (queryObj.Result == "鏈畬鎴�")
-            {
-                sql += " AND a.FCHECK_RESU IS NULL";
-            }
-            else if (queryObj.Result == "宸插畬鎴�")
-            {
-                sql += " AND a.FCHECK_RESU IS NOT NULL";
-            }
+            if (queryObj.Tj.Value == 1)
+                sql += " AND a.TJ = 1";
+            else
+                sql += " AND NVL(a.TJ,0) <> 1";
         }
 
         // 鏍规嵁妫�楠屼汉绛涢��

--
Gitblit v1.9.3