2022-09-1 化学品管控-化学品申购-采购申请，申购单撤销或者被驳回时，编辑保存草稿后，申购编码发生变化

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActHxpapplyServiceImpl.java

@@ -293,7 +293,10 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
     public int insertActHxpapply(ActHxpapplyVo actHxpapplyVo)
     {
         //查询vo如果有id,就是修改，需要删除原来的数据，重新添加。
+        String historyNum = "";
         if(StringUtils.isNotNull(actHxpapplyVo.getId())){
+            ActHxpapplyInfoVo actHxpapplyInfoVo = actHxpapplyMapper.selectActHxpapplyById(actHxpapplyVo.getId());
+            historyNum = actHxpapplyInfoVo.getApplyNum();
             //删除原来的化学品申请单
             actHxpapplyDetailMapper.deleteActHxpapplyDetailByApplyId(actHxpapplyVo.getId());
             actHxpapplyMapper.deleteActHxpapplyById(actHxpapplyVo.getId());
@@ -302,7 +305,11 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
         BeanUtils.copyProperties(actHxpapplyVo,actHxpapply);
         //设置其他公共字段
         SaveUtil.setCommonAttr(actHxpapply);
-        actHxpapply.setApplyNum(generateApplyNum());
+        if(StringUtils.isNotEmpty(historyNum)){
+            actHxpapply.setApplyNum(historyNum);
+        }else{
+            actHxpapply.setApplyNum(generateApplyNum());
+        }
         actHxpapplyMapper.insertActHxpapply(actHxpapply);
         Optional.ofNullable(actHxpapplyVo.getActHxpapplyDetailList()).orElseGet(Collections::emptyList)
                 .stream()