2026-04-02

刀具的状态调整为判断status，在流程关闭时修改status_code为“05”

src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java

@@ -200,7 +200,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
         if (toolApplyHeaderData == null) {
             throw new RuntimeException("申请单不存在!");
         }
-        if (!"05".equals(toolApplyHeaderData.getStatusCode())) {
+        if (!"草稿".equals(toolApplyHeaderData.getStatus())) {
             throw new RuntimeException("申请单不是草稿状态!");
         }
         // 关闭调用OA接口时
@@ -301,7 +301,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
         if(toolApplyHeaderData==null){
             throw new RuntimeException("申请单不存在!");
         }
-        if(!"05".equals(toolApplyHeaderData.getStatusCode())){
+        if(!"草稿".equals(toolApplyHeaderData.getStatus())){
             throw new RuntimeException("申请单不是草稿状态!");
         }
         // //修改原来的标记

src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java

@@ -229,7 +229,8 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
 
     void updateDocumentStatusToDraft(@Param("tableName") String tableName, @Param("keyField") String keyField,
                                      @Param("statusField") String statusField, @Param("draftStatus") String draftStatus,
-                                     @Param("site") String site, @Param("docNo") String docNo, @Param("userName") String userName);
+                                     @Param("site") String site, @Param("docNo") String docNo, @Param("userName") String userName,
+                                     @Param("statusCodeField") String statusCodeField, @Param("statusCodeValue") String statusCodeValue);
 
     Integer countDocumentByStatus(@Param("tableName") String tableName, @Param("keyField") String keyField,
                                   @Param("statusField") String statusField, @Param("approvedStatus") String approvedStatus,

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -2447,6 +2447,8 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
     public void closeProcess(CloseProcessVo vo) {
         for (String docNo : vo.getDocumentNos()) {
             String tableName, keyField, statusField, approvedStatus, draftStatus;
+            String statusCodeField = null;
+            String statusCodeValue = null;
             switch (vo.getDocumentType()) {
                 case Constant.QUOTATION:
                     tableName = "plm_quotation_information";
@@ -2482,6 +2484,8 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                     statusField = "status";
                     approvedStatus = "审批中";
                     draftStatus = "草稿";
+                    statusCodeField = "status_code";
+                    statusCodeValue = "05";
                     break;
                 case Constant.ECN:
                     tableName = "plm_change_request";
@@ -2536,7 +2540,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             changeManagementMapper.updateProcessFormCloseFlag(vo.getSite(), docNo, vo.getUserName());
 
             // 更新单据状态为草稿
-            changeManagementMapper.updateDocumentStatusToDraft(tableName, keyField, statusField, draftStatus, vo.getSite(), docNo, vo.getUserName());
+            changeManagementMapper.updateDocumentStatusToDraft(tableName, keyField, statusField, draftStatus, vo.getSite(), docNo, vo.getUserName(), statusCodeField, statusCodeValue);
         }
     }
 }

src/main/resources/mapper/change/ChangeManagementMapper.xml

@@ -1715,6 +1715,9 @@
     <update id="updateDocumentStatusToDraft">
         UPDATE ${tableName}
         SET ${statusField} = #{draftStatus},
+            <if test="statusCodeField != null and statusCodeValue != null">
+                ${statusCodeField} = #{statusCodeValue},
+            </if>
             step_id = 10,
             update_date = getDate(),
             update_by = #{userName}