fix(jg)：监管业务系统，历史设备导入气瓶，校验重复是错误使用了使用单位统一代码+产品编号，预期结果是制造单位的统一代码+产品编号在全局唯一

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -130,7 +130,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      */
     Integer checkFactoryNumUnique(@Param("factoryNum") String factoryNum,
                                   @Param("sequenceNbr") String sequenceNbr,
-                                  @Param("useUnitCreditCode") String useUnitCreditCode);
+                                  @Param("produceUnitCreditCode") String produceUnitCreditCode);
 
     /**
      * 使用登记证编号全库唯一校验

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -909,12 +909,11 @@
         FROM
         "idx_biz_jg_factory_info" ibjfi
         JOIN idx_biz_jg_register_info ibjri ON ibjfi."RECORD" = ibjri."RECORD"
-        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjri."RECORD" = ibjui."RECORD"
         WHERE
         ibjri."EQU_LIST" = '2000'
         AND ibjri."EQU_CATEGORY" = '2300'
         AND ibjfi."FACTORY_NUM" = #{factoryNum}
-        AND ibjui."USE_UNIT_CREDIT_CODE" = #{useUnitCreditCode}
+        AND ibjfi."PRODUCE_UNIT_CREDIT_CODE" = #{produceUnitCreditCode}
     </select>
 
     <select id="useRegistrationCertificateAccountUnique" resultType="java.lang.Integer">

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

@@ -450,9 +450,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
     }
 
-    private void checkFactoryNumUnique(String factoryNum, String useUnitCreditCode, StringBuilder result) {
+    private void checkFactoryNumUnique(String factoryNum, String produceUnitCreditCode, StringBuilder result) {
         // 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
-        if (commonMapper.checkFactoryNumUnique(factoryNum, null, useUnitCreditCode) > 0) {
+        if (commonMapper.checkFactoryNumUnique(factoryNum, null, produceUnitCreditCode) > 0) {
             result.append("出厂编号/产品编码在该企业中已存在！");
         }
     }
@@ -3348,7 +3348,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     result.append("出厂编号/产品编码不能重复；");
                 }
                 checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
-                checkFactoryNumUnique(data.getFactoryNum(), company.getCompanyCode(), result);
+                checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(), result);
             } else {
                 checkFactoryNumUniquenessForVehicleCylinder(data.getFactoryNum(), result);
             }