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 @@
AND rs.BIZ_TYPE = #{q.bizType}
+
+
+ AND yo.YO_CODE = #{q.docCode}
+
+
AND rs.REVIEW_ORDER_MODE = #{q.reviewOrderMode}
@@ -158,19 +163,19 @@
AND rs.RS_CODE = #{q.rsCode}
- AND wo.XXXX = #{q.prodCode}
+ AND yo.PART_CODE = #{q.prodCode}
- AND wo.XXXX = #{q.prodName}
+ AND yo.PART_NAME like '%' || #{q.prodName} || '%'
- AND wo.XXXX = #{q.prodTypeName}
+ AND par.PRODUCT_TYPE = '%' || #{q.prodTypeName} || '%'
- AND wo.XXXX = #{q.prodIdent}
+ AND yo.PRODUCT_IDENT = #{q.prodIdent}
- AND rs.BATCH_NO = #{q.batchNo}
+ AND wo.batch_no = #{q.batchNo}
AND wo.CARD_NO = #{q.cardNo}
@@ -191,7 +196,7 @@
AND rs.RS_CODE = #{q.rsCode}
- AND rs.WO_CODE = #{q.woCode}
+ AND wo.WO_CODE = #{q.woCode}
AND rs.PART_CODE = #{q.partCode}