Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -482,6 +482,8 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         exportParamsMap.put("fullAddress", manage.getEquUseAddress());
         exportParamsMap.put("applyNo", manage.getApplyNo());
         exportParamsMap.put("factoryNum", deviceList.get(0).get("FACTORY_NUM"));
+        exportParamsMap.put("useInnerCode", deviceList.get(0).get("USE_INNER_CODE"));
+        exportParamsMap.put("carNumber", manage.getCarNumber());
 
         if ("0".equals(printType)) {
             // 调用生成使用登记证
@@ -514,7 +516,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         useFlagParamDto.setReceiveOrgName(manage.getReceiveOrgName());
         useFlagParamDto.setUseRegistrationCode(exportParamsMap.get("useRegistrationCode").toString());
         useFlagParamDto.setFactoryNumber(exportParamsMap.get("factoryNum").toString());
-        useFlagParamDto.setCarNumber(exportParamsMap.get("carNumber").toString());
+        useFlagParamDto.setCarNumber(manage.getCarNumber());
         useFlagParamDto.setApplyNo(manage.getApplyNo());
         // 检验信息字段设置
         setInspectField((String) deviceList.get(0).get("SEQUENCE_NBR"), useFlagParamDto);