From 602d10c38bdbee8c3989f8f9a84143d199c942cf Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Mon, 30 Mar 2026 10:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=A4=84=E7=BD=AE=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/quality/constant/ReviewSheetConst.java |  2 +-
 .../desk/quality/mapper/ReviewSheetMapper.xml   | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java
index c8a9d68a..630550d7 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java
@@ -24,7 +24,7 @@ public interface ReviewSheetConst {
         /**
          * 初始化
          */
-        Integer S_INIT = -1;
+        Integer S_INIT = 1;
         /**
          * 新建 内部 ERP 都用
          */
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml
index 71b80fd2..623ad036 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml
@@ -148,6 +148,11 @@
         <if test="q.bizType != null">
             AND rs.BIZ_TYPE = #{q.bizType}
         </if>
+
+        <if test="q.docCode != null">
+            AND yo.YO_CODE = #{q.docCode}
+        </if>
+
         <if test="q.reviewOrderMode != null">
             AND rs.REVIEW_ORDER_MODE = #{q.reviewOrderMode}
         </if>
@@ -158,19 +163,19 @@
             AND rs.RS_CODE = #{q.rsCode}
         </if>
         <if test="q.prodCode != null and q.prodCode != ''"> <!-- todo -->
-            AND wo.XXXX = #{q.prodCode}
+            AND yo.PART_CODE = #{q.prodCode}
         </if>
         <if test="q.prodName != null and q.prodName != ''"> <!-- todo -->
-            AND wo.XXXX = #{q.prodName}
+            AND yo.PART_NAME like '%' || #{q.prodName} || '%'
         </if>
         <if test="q.prodTypeName != null and q.prodTypeName != ''"> <!-- todo -->
-            AND wo.XXXX = #{q.prodTypeName}
+            AND par.PRODUCT_TYPE = '%' || #{q.prodTypeName} || '%'
         </if>
         <if test="q.prodIdent != null and q.prodIdent != ''"> <!-- todo -->
-            AND wo.XXXX = #{q.prodIdent}
+            AND yo.PRODUCT_IDENT = #{q.prodIdent}
         </if>
         <if test="q.batchNo != null"> <!-- todo -->
-            AND rs.BATCH_NO = #{q.batchNo}
+            AND wo.batch_no = #{q.batchNo}
         </if>
         <if test="q.cardNo != null"> <!-- todo -->
             AND wo.CARD_NO = #{q.cardNo}
@@ -191,7 +196,7 @@
             AND rs.RS_CODE = #{q.rsCode}
         </if>
         <if test="q.woCode != null and q.woCode != ''">
-            AND rs.WO_CODE = #{q.woCode}
+            AND wo.WO_CODE = #{q.woCode}
         </if>
         <if test="q.partCode != null and q.partCode != ''">
             AND rs.PART_CODE = #{q.partCode}