fix(register): 启用出厂编号唯一性检查逻辑

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

@@ -5232,19 +5232,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             //checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空；", result);
 //            checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空；", result);
             //checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空；", result);
-//            if ("0".equals(data.getWhetherVehicleCylinder())) {
-////                checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
-//                if (!StringUtils.isEmpty(data.getFactoryNum()) && !StringUtils.isEmpty(data.getProduceUnitCreditCode())){
-//                    checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(), data.getProduceUnitName(), result);
-//                    if (factoryNumList.contains(data.getProduceUnitCreditCode() + "_" +data.getFactoryNum())){
-//                        result.append("同一制造单位下，出厂编码不能重复！；");
-//                    }
-//                }
-//            } else {
-//                if (!StringUtils.isEmpty(data.getFactoryNum())){
-//                    checkFactoryNumUniquenessForVehicleCylinder(data.getFactoryNum(), result);
-//                }
-//            }
+            if ("0".equals(data.getWhetherVehicleCylinder())) {
+//                checkNotBlank(data.getCylinderCategory(), "气瓶分类不能为空；", result);
+                if (!StringUtils.isEmpty(data.getFactoryNum()) && !StringUtils.isEmpty(data.getProduceUnitCreditCode())){
+                    checkFactoryNumUnique(data.getFactoryNum(), data.getProduceUnitCreditCode(), data.getProduceUnitName(), result);
+                    if (factoryNumList.contains(data.getProduceUnitCreditCode() + "_" +data.getFactoryNum())){
+                        result.append("同一制造单位下，出厂编码不能重复！；");
+                    }
+                    factoryNumList.add(data.getProduceUnitCreditCode() + "_" +data.getFactoryNum());
+                }
+            } else {
+                if (!StringUtils.isEmpty(data.getFactoryNum())){
+                    checkFactoryNumUniquenessForVehicleCylinder(data.getFactoryNum(), result);
+                }
+            }
 //            checkNotBlank(data.getProduceDate(), "制造日期不能为空；", result);
             Optional.ofNullable(data.getProduceDate()).ifPresent(v -> checkDateFormatCorrect(v, "制造日期格式不正确；", result));
             //checkNotBlank(data.getInspectOrgName(), "检测机构名称不能为空；", result);