From 63ab001b1d34729e63dc12e2cdc72f95260f1156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Fri, 22 May 2026 10:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E7=90=86=E5=8D=95=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/desk/produce/mapper/DisTaskingMapper.xml   | 2 +-
 .../desk/quality/service/impl/ReviewSheetServiceImpl.java      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml
index 54571556d..9f68e19f9 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DisTaskingMapper.xml
@@ -68,7 +68,7 @@
         LEFT JOIN BS_PROCESS_SET d ON a.PPS_ID = d.ID
         LEFT JOIN BS_TEAM_SET e ON a.MAKE_TEAM = e.ID
         LEFT JOIN BS_TEAM_SET f ON b.TS_ID = f.ID
-        WHERE a.WO_ID = #{id}
+        WHERE a.WO_ID = #{id} and a.STATUS in (3,5)
         ORDER BY a.ORDERS
     </select>
     <select id="queryByWpIdlLst" resultType="org.springblade.desk.produce.pojo.entity.MakeRec">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
index 96378d56f..a2215bbbc 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
@@ -66,6 +66,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -300,6 +301,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void reviewResult(String trialId, Short resultStatus, String reviewMan, String liabilityPart, Integer scrapQty, Integer reworkQty, Integer concedeQty, String memo) {
         ReviewSheet rs = getByTrialId(trialId);
         if (rs == null) {
@@ -440,6 +442,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteReviewOrder(String trialId) {
         ReviewSheet reviewSheet = getByTrialId(trialId);
         if (reviewSheet == null) {