diff --git a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java index dd17c78a4..71a430f33 100644 --- a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java +++ b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java @@ -132,6 +132,13 @@ public class SysWorkplace implements Serializable { @TableField(value = "jobMode") public Integer jobMode; + /** + * 是否只允许采集最小销售单元 + */ + @TableField(value = "isUseMinUnit") + public Boolean isUseMinUnit; + + @TableField(exist = false) private String invName; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java index af0ebb671..4c6eb7349 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java @@ -191,4 +191,6 @@ public class SysWorkplaceResponse { */ private Integer jobMode; + private Boolean isUseMinUnit; + } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 588641cd3..79159be7c 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4816,6 +4816,10 @@ CALL Pro_Temp_ColumnWork('sys_workplace_layer', 'height', 1); +CALL Pro_Temp_ColumnWork('sys_workplace_layer', 'name', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''名字''', + 1); + CALL Pro_Temp_ColumnWork('io_code_temp', 'parentCode', ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''父级编码''', @@ -5317,3 +5321,9 @@ CALL Modify_index('io_code_temp', 'code', 'idex_code_temp_query', 'BTREE'); CALL Pro_Temp_ColumnWork('sys_workplace', 'jobMode', ' tinyint NULL DEFAULT b''0''COMMENT ''作业模式 0:药房发药模式 1:药库统一模式''', 1); + + +CALL Pro_Temp_ColumnWork('sys_workplace', 'isUseMinUnit', + ' tinyint NULL DEFAULT b''0''COMMENT ''是否只允许采集最小销售单元''', + 1); +