fix(JG)：车用气瓶-监管码功能开发-生成设备代码

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/JgVehicleInformationServiceImpl.java

@@ -108,6 +108,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     private IdxBizJgFactoryInfoMapper idxBizJgFactoryInfoMapper;
     @Autowired
     private IdxBizJgOtherInfoMapper otherInfoMapper;
+    @Autowired
+    private JgUseRegistrationServiceImpl jgUseRegistrationService;
 
     /**
      * 新增（提交）车用气瓶
@@ -635,6 +637,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
                 // 更新注册登记信息表
                 LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateRegisterWrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
+                // 新增页面选择无设备代码后，在审批通过后自动生成设备代码
+                jgUseRegistrationService.justGenerateEquCode(updateRegisterWrapper, registerInfo, jgVehicleInformation.getReceiveCompanyCode(), mapData, jgRegistrationHistory);
                 updateRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, registerInfo.getRecord());
                 updateRegisterWrapper.set(true, IdxBizJgRegisterInfo::getUseOrgCode, code);
                 updateRegisterWrapper.set(IdxBizJgRegisterInfo::getRegisterState, this.getRegCode());
@@ -749,7 +753,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         jgVehicleInformation.setIsXixian(isXiXian);
         useInfo.setIsNotXiXian(isXiXian);
         useInfo.setProvince("610000");
-        useInfo.setProvinceName("陕西省");
+        useInfo.setAddress(jgVehicleInformation.getUseUnitAddress());
         LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
         lambda.eq(IdxBizJgUseInfo::getRecord, map.get("record"));