diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index e1c6b536..825357b4 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -249,6 +249,7 @@ public class UdiRelevanceController extends BaseController { UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse); BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse); + udiRelevanceResponse.setFlbm(udiProductEntity.getFlbm()); udiRelevanceResponses.add(udiRelevanceResponse); } } @@ -367,6 +368,8 @@ public class UdiRelevanceController extends BaseController { udiProductEntity.setCatalogname2(udiRelevanceSaveRequest.getCatalogname2()); udiProductEntity.setCatalogname3(udiRelevanceSaveRequest.getCatalogname3()); udiProductEntity.setMatrial(udiRelevanceSaveRequest.getMatrial()); + udiProductEntity.setRequireScanCode(udiRelevanceSaveRequest.getRequireScanCode()); + udiProductEntity.setFlbm(udiRelevanceSaveRequest.getFlbm()); // udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); if (StrUtil.isNotEmpty(udiRelevanceSaveRequest.getOriginUuid())) { udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index ebf3e13b..81239057 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -30,6 +30,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.CustomerInfoService; import com.glxp.api.service.basic.*; +import com.glxp.api.service.system.ClassifyCodeService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.IntUtil; import com.glxp.api.util.SupplementVailUtil; @@ -80,6 +81,8 @@ public class UdiRlSupController extends BaseController { private CustomerInfoService customerInfoService; @Resource private IBasicBussinessTypeService basicBussinessTypeService; + @Resource + private com.glxp.api.service.system.ClassifyCodeService classifyCodeService; @AuthRuleAnnotation("") @GetMapping("/sale/info/company/product/relevance/filter") @@ -270,6 +273,8 @@ public class UdiRlSupController extends BaseController { udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiProductEntity udiProductEntity = new UdiProductEntity(); BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity); + //处理是否需要扫码字段 + classifyCodeService.updateRequireScanCode(udiProductEntity); udiProductEntity.setId(IdUtil.getSnowflakeNextId()); udiProductService.insertUdiInfo(udiProductEntity); return ResultVOUtils.success("选入成功！"); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index ce596882..41d16ee4 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -160,5 +160,7 @@ public class UdiProductEntity { @ApiModelProperty(value = "三级分类名称(部位、功能、品种）") private Integer catalogCode3; + private Integer requireScanCode; + } diff --git a/src/main/java/com/glxp/api/entity/system/ClassifyCodeEntity.java b/src/main/java/com/glxp/api/entity/system/ClassifyCodeEntity.java index 38b86981..4f8f2f56 100644 --- a/src/main/java/com/glxp/api/entity/system/ClassifyCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/system/ClassifyCodeEntity.java @@ -10,5 +10,6 @@ public class ClassifyCodeEntity { private String name; private String level; private String qxlb; + private Integer requireScanCode; } diff --git a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java index 964dc25f..33aec00e 100644 --- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java @@ -64,4 +64,8 @@ public class SupplementRequest { private String matrial; private String catalogcode; + + private String flbm; + + private String requireScanCode; } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 6fa02f3a..c2ff002c 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -144,4 +144,6 @@ public class UdiRelevanceSaveRequest { private String matrial; private String catalogcode; + + private Integer requireScanCode; } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 7d79bccb..b0be501d 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -175,6 +175,8 @@ public class UdiRelevanceResponse { @ApiModelProperty(value="耗材材质") private String matrial; + private Integer requireScanCode; + public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index 82ca5979..5e92d12f 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -139,4 +139,6 @@ public class UdiRlSupResponse { * 产品分类高值 ：1：高值耗材；2.普通耗材 */ private Integer hcType; + + private Integer requireScanCode; } diff --git a/src/main/java/com/glxp/api/service/system/ClassifyCodeService.java b/src/main/java/com/glxp/api/service/system/ClassifyCodeService.java index e6b11b2c..790f4146 100644 --- a/src/main/java/com/glxp/api/service/system/ClassifyCodeService.java +++ b/src/main/java/com/glxp/api/service/system/ClassifyCodeService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.system; +import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.system.ClassifyCodeEntity; import com.glxp.api.req.system.FilterClassifyCodeRequest; @@ -12,4 +13,5 @@ public interface ClassifyCodeService { ClassifyCodeEntity findByCode(String code); + void updateRequireScanCode(UdiProductEntity udiProductEntity); } diff --git a/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java index 2e0d0263..395df3d9 100644 --- a/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.ClassifyCodeDao; +import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.system.ClassifyCodeEntity; import com.glxp.api.req.system.FilterClassifyCodeRequest; import com.glxp.api.service.system.ClassifyCodeService; @@ -54,4 +55,18 @@ public class ClassifyCodeServiceImpl implements ClassifyCodeService { } return null; } + + @Override + public void updateRequireScanCode(UdiProductEntity udiProductEntity) { + udiProductEntity.setRequireScanCode(0); + String flbm = udiProductEntity.getFlbm(); + if (StrUtil.isNotEmpty(flbm)){ + FilterClassifyCodeRequest filterClassifyCodeRequest = new FilterClassifyCodeRequest(); + filterClassifyCodeRequest.setCode(flbm); + List classifyCodeEntities = classifyCodeDao.filteClassifyCode(filterClassifyCodeRequest); + if (classifyCodeEntities.size() > 0){ + udiProductEntity.setRequireScanCode(classifyCodeEntities.get(0).getRequireScanCode()); + } + } + } } diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 06cf825d..4e8eb2ac 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -742,10 +742,12 @@ matrial=#{matrial}, - remark=#{remark}, + + requireScanCode=#{requireScanCode}, + where uuid = #{uuid} diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index a331d04e..8209b827 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -470,7 +470,9 @@ basic_products.catalogname1, basic_products.catalogname2, basic_products.catalogname3, - basic_products.matrial + basic_products.matrial, + basic_products.requireScanCode + FROM basic_products inner JOIN basic_udirel ON basic_products.uuid = basic_udirel.uuid diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 4e8135c9..1e7e3e44 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -113,6 +113,7 @@ basic_products.mjfs, basic_products.categoryName, basic_products.cphhhbh, + basic_products.requireScanCode, basic_udirel.hcType, basic_udirel.groupBuy, basic_udirel.id as uid, diff --git a/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml b/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml index e7c9c007..49300f36 100644 --- a/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml +++ b/src/main/resources/mybatis/mapper/system/ClassifyCodeDao.xml @@ -6,23 +6,25 @@ - \ No newline at end of file + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index a74e244c..bd80acc1 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -589,3 +589,20 @@ CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item` CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目' ROW_FORMAT = Dynamic; + +CREATE TABLE IF NOT EXISTS `thr_medical_product_category` ( + `id` int NOT NULL AUTO_INCREMENT, + `materialId` int DEFAULT NULL COMMENT '物资分类编码', + `materialName` varchar(255) DEFAULT NULL COMMENT '物资分类的名称', + `firstLevelCategoryCode` int DEFAULT NULL COMMENT '一级分类的编码', + `firstLevelCategoryName` varchar(255) DEFAULT NULL COMMENT '一级分类的名称', + `secondLevelCategoryCode` int DEFAULT NULL COMMENT '二级分类的编码', + `secondLevelCategoryName` varchar(255) DEFAULT NULL COMMENT '二级分类的名称', + `managementType` int DEFAULT NULL COMMENT '管理类别 ', + `materialCode` varchar(255) DEFAULT NULL COMMENT '标识', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=160 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='医疗产品分类标识'; + +CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode', + 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''', + 1);