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 3aa2246c..2e4767bb 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -235,7 +235,7 @@ public class UdiProductEntity { /** - * 产品类型 1:药品 2:耗材 + * 产品类型 1:耗材 2:药品 */ @TableField(value = "productsType") private Integer productsType; diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 0e67ccc3..dbe5db06 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -213,18 +213,18 @@ public class UdiRelevanceEntity { private Boolean newNeedUpload; - /** - * 流通计量层层级标识 - */ - @TableField(value = "distributeLevelDi") - private String distributeLevelDi; - - /** - * 流通计量层级单位 - */ - @TableField(value = "distributeLevelUnit") - private String distributeLevelUnit; - +// /** +// * 流通计量层层级标识 +// */ +// @TableField(value = "distributeLevelDi") +// private String distributeLevelDi; +// +// /** +// * 流通计量层级单位 +// */ +// @TableField(value = "distributeLevelUnit") +// private String distributeLevelUnit; +// /** * 流通时最小包装层级包含计量单元的数量 */ @@ -238,23 +238,23 @@ public class UdiRelevanceEntity { private Integer distributeLevel; - /** - * 使用计量层级标识 - */ - @TableField(value = "useLevelDi") - private String useLevelDi; - - /** - * 使用计量层级单位 - */ - @TableField(value = "useLevelUnit") - private String useLevelUnit; - - /** - * 使用是当前层级包含计量单元数量 - */ - @TableField(value = "useLeverCount") - private Integer useLeverCount; +// /** +// * 使用计量层级标识 +// */ +// @TableField(value = "useLevelDi") +// private String useLevelDi; +// +// /** +// * 使用计量层级单位 +// */ +// @TableField(value = "useLevelUnit") +// private String useLevelUnit; +// +// /** +// * 使用是当前层级包含计量单元数量 +// */ +// @TableField(value = "useLeverCount") +// private Integer useLeverCount; /** diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index a7840020..ce3951a0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -533,7 +533,7 @@ public class UdiProductServiceImpl implements UdiProductService { */ public void updateLevelCount(UdiRelevanceEntity udiRelevanceEntity) { List udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid()); - Integer curLevel = udiRelevanceEntity.getDistributeLevel(); + Integer curLevel = Objects.isNull(udiRelevanceEntity.getDistributeLevel()) ? 1 : udiRelevanceEntity.getDistributeLevel(); List diLevelResponses = findLevelByRelId(udiRelevanceEntity.getId()); //更新各个层级流通时包含计量单元数量 @@ -551,7 +551,7 @@ public class UdiProductServiceImpl implements UdiProductService { udiProductEntity.setBhltcjsl(bhltsl); } } - curLevel = udiRelevanceEntity.getUseLevel(); + curLevel = Objects.isNull(udiRelevanceEntity.getUseLevel()) ? 1 : udiRelevanceEntity.getUseLevel(); //更新各个层级使用时包含计量单元数量 if (CollUtil.isNotEmpty(udiProductEntities)) { for (UdiProductEntity udiProductEntity : udiProductEntities) { diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index b429594e..8f304965 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1162,7 +1162,6 @@ hcType=#{hcType}, - useMuti=#{useMuti}, @@ -1220,23 +1219,29 @@ isStack=#{isStack}, - - distributeLevelDi=#{distributeLevelDi}, + + payFeeCode=#{payFeeCode}, + + + autoCode=#{autoCode}, - - distributeLevelUnit=#{distributeLevelUnit}, + + splitEnable=#{splitEnable}, distributeLevelCount=#{distributeLevelCount}, - - useLevelDi=#{useLevelDi}, + + useLevel=#{useLevel}, + + + distributeMaxLevel=#{distributeMaxLevel}, - - useLevelUnit=#{useLevelUnit}, + + useMaxLevel=#{useMaxLevel}, - - useLeverCount=#{useLeverCount}, + + distributeLevel=#{distributeLevel}, WHERE id = #{id} diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 8f750777..210699d2 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -981,3 +981,31 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType', CALL Pro_Temp_ColumnWork('basic_udirel', 'isStack', 'tinyint', 1); + +# 2024 1015增加字段 +CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadFlag', ' tinyint DEFAULT NULL', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadMsg', ' varchar(1024) DEFAULT NULL', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'distributeMaxLevel', ' int DEFAULT NULL COMMENT ''配送时允许采集的最大层级:''', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'useMaxLevel', ' int DEFAULT NULL COMMENT ''使用时允许采集的最大层级''', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'splitEnable', ' tinyint DEFAULT NULL', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'useLevel', ' int DEFAULT NULL COMMENT ''使用层级''', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'distributeLevel', ' int DEFAULT NULL COMMENT ''流通层级''', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'autoCode', ' tinyint DEFAULT ''0'' COMMENT ''是否自动赋码 0否 1是''', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'unpackUseTime', ' datetime DEFAULT NULL COMMENT ''拆包后可用时长(小时)''', 1); + +CALL Pro_Temp_ColumnWork('thr_products', 'type', 'tinyint DEFAULT NULL' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'prcitmcode', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'invCode', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'catalogname1', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''一级分类名称(学科,品名)''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'catalogname2', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''二级分类名称(用途、品目)''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'catalogname3', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''三级分类名称(部位、功能、品种)''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'catalogCode1', 'bigint DEFAULT NULL COMMENT ''一级分类名称(学科,品名)''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'catalogCode2', 'bigint DEFAULT NULL COMMENT ''二级分类名称(用途、品目)''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'catalogCode3', 'bigint DEFAULT NULL COMMENT ''三级分类名称(部位、功能、品种)''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'matrial', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''耗材材质''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'productType', 'tinyint DEFAULT ''1'' COMMENT ''产品类型 1:耗材 2:药品''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'prepnSpec', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''采集规格''' ,1); +CALL Pro_Temp_ColumnWork('thr_products', 'prepnUnit', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''制剂单位''' ,1); + +CALL Pro_Temp_ColumnWork('basic_products', 'zxxsdycpbs', ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''最小销售产品标识''' ,1); +CALL Pro_Temp_ColumnWork('basic_products', 'xjdw', ' varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''最小销售产品标识''' ,1);