From a4a05d4756b6d90ffdcb21b9284194bc35eeae79 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 29 Jul 2024 17:24:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8D=AF=E5=93=81=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86=E3=80=81=E6=B1=87=E6=80=BB=E3=80=81?= =?UTF-8?q?=E5=85=A5=E8=B4=A6=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/req/inv/FilterInvProductRequest.java | 4 + .../glxp/api/res/inv/InvProductResponse.java | 86 +++++++++++++++++++ .../mybatis/mapper/inv/invProductDao.xml | 19 +++- .../mapper/inv/invProductDetailDao.xml | 19 +++- src/main/resources/schemas/schema_v2.4.sql | 2 +- 5 files changed, 127 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java index 899613b5e..617d74ce2 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java @@ -135,5 +135,9 @@ public class FilterInvProductRequest extends ListPageRequest { private Integer highValue; + /** + * 产品类型 1:耗材 2:药品 + */ + private Integer productsType = 1;//默认是耗材 } diff --git a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java index 345810518..6df213c00 100644 --- a/src/main/java/com/glxp/api/res/inv/InvProductResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvProductResponse.java @@ -1,8 +1,10 @@ package com.glxp.api.res.inv; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * 库存数据VO @@ -137,4 +139,88 @@ public class InvProductResponse { * 第三方产品编码 */ private String thrCode; + + + + /** + * 产品类型 1:药品 2:耗材 + */ + @TableField(value = "productsType") + private Integer productsType; + + + /** + * 每个层级的单位（例如：箱，盒，支） + */ + @TableField(value = "levelUnit") + private String levelUnit; + + /** + * 制剂单位 + */ + @TableField(value = "prepnUnit") + private String prepnUnit; + + /** + * 包装材质 + */ + @TableField(value = "packMatrial") + private String packMatrial; + + /** + * 使用属性 + */ + @TableField(value = "useAttribute") + private String useAttribute; + + /** + * 运输条件 + */ + @TableField(value = "transportCondition") + private String transportCondition; + + /** + * 存储条件 + */ + @TableField(value = "storageCondition") + private String storageCondition; + + /** + * 特殊分类码 + */ + @TableField(value = "specialCode") + private String specialCode; + + + /** + * 使用属性 + */ + @TableField(value = "indate") + private Date indate; + + + /** + * 药品类型(详见码表) 1：特殊药品原料药，2：特殊药品制剂，3：普通药品，9：未分类 + */ + @TableField(value = "physicType") + private Integer physicType; + + + /** + *制剂规格 + */ + @TableField(value = "prepnSpec") + private String prepnSpec; + /** + * 药品分类 + */ + @TableField(value = "majorType") + private Integer majorType; + + /** + * 医保分类 1:甲类;2:乙类;3:丙类 + */ + @TableField(value = "medicareType") + private Integer medicareType; + } diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 9f22881ea..d4f3e9de2 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -28,7 +28,21 @@ ip.deptCode, ip.invCode, as.name spaceName, - ip.price + ip.price, + bp.productsType, + bp.levelUnit, + bp.prepnUnit, + bp.prepnSpec, + bp.specialCode, + bp.storageCondition, + bp.transportCondition, + bp.indate, + bp.useAttribute, + bp.packMatrial, + bp.majorType, + bp.majorStatus, + bp.physicType, + bp.medicareType from inv_product ip inner join basic_udirel on ip.relIdFk = basic_udirel.id inner join basic_products bp on basic_udirel.uuid = bp.uuid @@ -37,6 +51,9 @@ left join auth_warehouse on auth_warehouse.code = ip.invCode left join auth_space `as` on ip.invSpaceCode = `as`.code + + AND bp.productsType = #{productsType} + AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml index 0ed90fdb3..dbac0f098 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml @@ -27,7 +27,21 @@ ipp.deptCode, ipp.invCode, ipp.invSpaceCode, - ipp.code as code + ipp.code as code, + bp.productsType, + bp.levelUnit, + bp.prepnUnit, + bp.prepnSpec, + bp.specialCode, + bp.storageCondition, + bp.transportCondition, + bp.indate, + bp.useAttribute, + bp.packMatrial, + bp.majorType, + bp.majorStatus, + bp.physicType, + bp.medicareType from inv_product_detail ipp inner join basic_udirel on ipp.relId = basic_udirel.id inner join basic_products bp on basic_udirel.uuid = bp.uuid @@ -45,6 +59,9 @@ AND ipp.relId = #{relIdFk} + + AND bp.productsType = #{productsType} + AND bp.ggxh like concat('%', #{ggxh}, '%') diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 497cc7b62..72138e419 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3877,7 +3877,7 @@ CREATE TABLE IF NOT EXISTS `sys_workplace` CALL Pro_Temp_ColumnWork('basic_products', 'productsType', - ' tinyint NULL DEFAULT NULL COMMENT ''产品类型 1:药品 2:耗材''', + ' tinyint NULL DEFAULT b''1'' COMMENT ''产品类型 1:耗材 2:药品''', 1);