bugfix:29829

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

@@ -1475,7 +1475,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
                     .eq(JgUseRegistrationManage::getIsDelete, 0)
                     .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName()).one();
-            changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
+            changeRecord.setCertificateNo(ValidationUtil.isEmpty(manage) ? this.genCertificateNo(registerInfo, jgUseRegistration) : manage.getCertificateNo());//登记证书唯一码
         }
         changeRecord.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());//使用单位统一信用代码
         changeRecord.setUseUnitName(jgUseRegistration.getUseUnitName());//使用单位名称
@@ -1486,6 +1486,18 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         certificateChangeRecordService.save(changeRecord);
     }
 
+    public String genCertificateNo(IdxBizJgRegisterInfo registerInfo, JgUseRegistration jgUseRegistration) {
+        String ym = "";
+        try {
+            ym = Optional.of(DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM)).orElse(DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM));
+        } catch (ParseException e) {
+            log.error("日期转换失败：", e);
+        }
+        String equCode = Optional.ofNullable(registerInfo.getEquDefine()).orElse(registerInfo.getEquCategory());
+        String registrationCode = equCode + jgUseRegistration.getReceiveCompanyOrgCode() + ym;
+        return tzsServiceFeignClient.deviceRegistrationCode(registrationCode).getResult();
+    }
+
     /**
      * 更新登记证管理表数据
      *