diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java index 8d4113c58..0bae61295 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java @@ -222,5 +222,11 @@ public class SysWorkplaceDocumentEntity { @TableField(value = "uploadYb") private Integer uploadYb; + /** + * 业务类型 1器械业务 2药品业务 + */ + @TableField(value = "busType") + private Integer busType; + } diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java index b0a6ebdd3..17f71fb2e 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java @@ -43,4 +43,6 @@ public class CollectOrderCodeManResponse { private String productDate; private String expireDate; private String serialNo; + private Integer productsType; + } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml index e936d9a4b..65c585b40 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderCodeManMapper.xml @@ -9,7 +9,8 @@ bp.bzgg, bp.prepnSpec, bp.zczbhhzbapzbh, - bp.manufactory + bp.manufactory, + bp.productsType FROM io_collect_order_code_man icocm left join basic_udirel bu on icocm.relId = bu.id left join basic_products bp on bu.uuid = bp.uuid diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 5a86c4761..df76dc493 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5315,3 +5315,6 @@ CALL Pro_Temp_ColumnWork('io_code_temp', 'queueCode', ' varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''槽位编码''', 1); +CALL Pro_Temp_ColumnWork('sys_workplace_document', 'busType', + 'tinyint NULL DEFAULT NULL COMMENT ''业务类型 1器械业务 2药品业务''', + 1);