UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、移植耗材管理编辑功能的所有相关

Browse Source 
2、sql增加字段
dev_unify
qyt 6 months ago
parent f4c9afc4f5
commit 69e256dd37
5 changed files with 76 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -235,7 +235,7 @@ public class UdiProductEntity {
/**
* 产品类型 1:药品 2:耗材
* 产品类型 1:耗材 2:药品
*/
@TableField(value = "productsType")
private Integer productsType;

58
src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
Unescape Escape View File

@ -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;
/**

4
src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
Unescape Escape View File

@ -533,7 +533,7 @@ public class UdiProductServiceImpl implements UdiProductService {
*/
public void updateLevelCount(UdiRelevanceEntity udiRelevanceEntity) {
List<UdiProductEntity> udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid());
Integer curLevel = udiRelevanceEntity.getDistributeLevel();
Integer curLevel = Objects.isNull(udiRelevanceEntity.getDistributeLevel()) ? 1 : udiRelevanceEntity.getDistributeLevel();
List<DiLevelResponse> 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) {

27
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -1162,7 +1162,6 @@
<if test="hcType != null">
hcType=#{hcType},
</if>
<if test="useMuti != null">
useMuti=#{useMuti},
</if>
@ -1220,23 +1219,29 @@
<if test="isStack != null">
isStack=#{isStack},
</if>
<if test="distributeLevelDi != null">
distributeLevelDi=#{distributeLevelDi},
<if test="payFeeCode != null">
payFeeCode=#{payFeeCode},
</if>
<if test="autoCode != null">
autoCode=#{autoCode},
</if>
<if test="distributeLevelUnit != null">
distributeLevelUnit=#{distributeLevelUnit},
<if test="splitEnable != null">
splitEnable=#{splitEnable},
</if>
<if test="distributeLevelCount != null">
distributeLevelCount=#{distributeLevelCount},
</if>
<if test="useLevelDi != null">
useLevelDi=#{useLevelDi},
<if test="useLevel != null">
useLevel=#{useLevel},
</if>
<if test="distributeMaxLevel != null">
distributeMaxLevel=#{distributeMaxLevel},
</if>
<if test="useLevelUnit != null">
useLevelUnit=#{useLevelUnit},
<if test="useMaxLevel != null">
useMaxLevel=#{useMaxLevel},
</if>
<if test="useLeverCount != null">
useLeverCount=#{useLeverCount},
<if test="distributeLevel != null">
distributeLevel=#{distributeLevel},
</if>
</trim>
WHERE id = #{id}

28
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -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);

Write Preview
Loading…
Cancel
Save