21188 【web端】监管业务>业务办理，一码通补录设备及登记后，登记证无法打印提示监管码为空

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -2059,9 +2059,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) {
         // 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程
-        if (!(FlowStatusEnum.TO_BE_FINISHED.getName().equals(jgUseRegistration.getStatus())
-                || FlowStatusEnum.TO_BE_DISCARD.getName().equals(jgUseRegistration.getStatus()))
-                || "1".equals(jgUseRegistration.getRegType())) {
+        if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())
+                || jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))
+                || jgUseRegistration.getRegType().equals("1")) {
             // 基本信息 + 制造信息
             Map<String, Object> detail = this.baseMapper.getDetail(record);
             // 设计信息
@@ -2158,6 +2158,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 更新使用登记业务表
                 jgUseRegistration.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
             }
+        }else {
+            jgUseRegistration.setSupervisoryCode(otherInfo.getSupervisoryCode());
         }
         otherInfo.setClaimStatus("已认领");
         otherInfoMapper.updateById(otherInfo);
@@ -2642,9 +2644,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
                 // 生成监管码 96333码
                 this.createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
-                map.put("EQU_CODE", registerInfo.getEquCode());
+                map.put("equCode", equCode);
                 // 更新es
                 this.updateEsData(usePlace, map, otherInfo, jgUseRegistration, map);
+                this.updateById(jgUseRegistration);
 
                 // 设备安装信息更新
                 this.historyEquUpdateInstallInfo(map);