Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomProcedureVersionServiceImpl.java

@@ -318,6 +318,16 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
                 }
             }
         }
+
+        //如果这个版本已经设为使用，需要需要重新调一次，把最新的数据更新过去
+        BomVersionInfo versionInfo = bomVersionInfoService.getById(bean.getVersionId());
+        if(versionInfo!=null&&"1".equals(versionInfo.getUseStatus())){
+            BomVersionInfoUpdateDTO dto = new BomVersionInfoUpdateDTO();
+            dto.setId(bean.getVersionId());
+            dto.setAuditStatus("2");
+            dto.setBomId(bean.getBomId());
+            bomVersionInfoService.updateUseStatus(dto);
+        }
         return procedureList;
     }
 
@@ -772,6 +782,7 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
         if(versionInfo!=null&&"1".equals(versionInfo.getUseStatus())){
             BomVersionInfoUpdateDTO dto = new BomVersionInfoUpdateDTO();
             dto.setId(bean.getVersionId());
+            dto.setAuditStatus("2");
             dto.setBomId(bean.getBomId());
             bomVersionInfoService.updateUseStatus(dto);
         }