diff --git a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java index 0b24a0e..bbaf4cd 100644 --- a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java +++ b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java @@ -1045,8 +1045,8 @@ public class InspectionRequestServiceImpl extends ServiceImpl 草稿(允许重新编辑)- rqrq + if ("Confirmed".equals(currentStatusDb) || "Audited".equals(currentStatusDb)) { + // 待审核/已下达 -> 草稿(未进入排程,无需走变更审批)- rqrq targetStatus = "草稿"; targetStatusDb = "Draft"; targetRemark = header.getRemark(); @@ -1056,7 +1056,7 @@ public class InspectionRequestServiceImpl extends ServiceImpl() .eq(InspectionRequestHeader::getSite, site) .eq(InspectionRequestHeader::getRequestNo, requestNo) + .eq(InspectionRequestHeader::getStatusDb, currentStatusDb) .set(InspectionRequestHeader::getStatus, targetStatus) .set(InspectionRequestHeader::getStatusDb, targetStatusDb) .set(InspectionRequestHeader::getRemark, targetRemark) ); if (headerUpdateCount == 0) { - throw new RuntimeException("申请变更失败,主表状态未更新"); + throw new RuntimeException("申请单状态已变化,请刷新后重试"); } // 4) 同步明细状态,保证主从状态一致 - rqrq diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml index 8935f0b..ae78dd9 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml @@ -193,6 +193,7 @@ status_db = 'Audited' WHERE site = #{site} AND request_no = #{requestNo} + AND status_db = 'Confirmed' diff --git a/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml index 640255b..daafc33 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml @@ -475,6 +475,7 @@ status_db = 'Audited' WHERE site = #{site} AND request_no = #{requestNo} + AND status_db = 'Confirmed'