7/27 1.1

src/main/java/com/glxp/api/controller/basic/UdiContrastController.java

@@ -324,6 +324,15 @@ public class UdiContrastController {
 
     }
 
+    @PostMapping("/udi/udirel/updatetDrug")
+    public BaseResponse updatetDrug(@RequestBody AddProductRequest addProductRequest) {
+        UdiProductEntity udiProductEntity = new UdiProductEntity();
+        BeanUtils.copyProperties(addProductRequest, udiProductEntity);
+        udiProductService.updateUdiInfo(udiProductEntity);
+        return ResultVOUtils.success();
+
+    }
+
     public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) {
         List<UdiProductEntity> udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key);
         List<UdiProductEntity> originProductEntities = udiProductService.findByUuids(udiRelevanceEntity.getUuid());

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -105,6 +105,7 @@ public class PurApplyController {
         purApplyEntity.setUpdateTime(new Date());
         purApplyEntity.setBillType(ConstantStatus.BUS_ORDER_CPSG);
         purApplyEntity.setStatus(postPurApplyRequest.getEditStatus());    //草稿状态
+        purApplyEntity.setProductType(purApplyEntity.getProductType());    //草稿状态
         if (postPurApplyRequest.getType() != null) {
             String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
             purApplyEntity.setBillNo(billNo);
@@ -576,4 +577,17 @@ public class PurApplyController {
     }
 
 
+    @GetMapping("/purchase/apply/drug/list/detail")
+    public BaseResponse drugDetailList(PurApplyDetailRequest purApplyDetailRequest) {
+        List<PurOrderDetailResponse> purApplyDetailEntities = purApplyDetailService.joinQueryListDrug(purApplyDetailRequest);
+        PageInfo<PurOrderDetailResponse> pageInfo;
+        pageInfo = new PageInfo<>(purApplyDetailEntities);
+        PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(purApplyDetailEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+
+    }
+
+
 }

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -489,4 +489,22 @@ public class PurOrderController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    /**
+     * 药品采购订单明细
+     * @param purApplyDetailRequest
+     * @return
+     */
+    @GetMapping("/purchase/order/drug/list/detail")
+    public BaseResponse drugDetailList(PurOrderDetailRequest purApplyDetailRequest) {
+
+        List<PurOrderDetailResponse> purOrderDetailResponseList = purOrderDetailService.joinDrugQueryList(purApplyDetailRequest);
+        PageInfo<PurOrderDetailResponse> pageInfo;
+        pageInfo = new PageInfo<>(purOrderDetailResponseList);
+        PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(purOrderDetailResponseList);
+        return ResultVOUtils.success(pageSimpleResponse);
+
+    }
+
 }

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -209,6 +209,18 @@ public class PurOrderReceiveController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/receive/drug/order/detail")
+    public BaseResponse filterReceiveDrugDetail(FilterReceiveDetailRequest filterReceiveDetailRequest) {
+        List<ReceiveDetailResponse> data = receivedetailService.filterDrugList(filterReceiveDetailRequest);
+        PageInfo<ReceiveDetailResponse> pageInfo;
+        pageInfo = new PageInfo<>(data);
+        PageSimpleResponse<ReceiveDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(data);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @Resource
     InvWarehouseService invWarehouseService;
 

src/main/java/com/glxp/api/controller/purchase/PurPlanController.java

@@ -413,6 +413,23 @@ public class PurPlanController {
 
     }
 
+
+    /**
+     * 查询采购计划列表
+     */
+    @GetMapping("/purchase/plan/drug/list/detail")
+    public BaseResponse drugDetailList(PurPlanDetailRequest purApplyDetailRequest) {
+
+        List<PurOrderDetailResponse> purApplyDetailEntities = purPlanDetailService.joinDrugQueryList(purApplyDetailRequest);
+        PageInfo<PurOrderDetailResponse> pageInfo;
+        pageInfo = new PageInfo<>(purApplyDetailEntities);
+        PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(purApplyDetailEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+
+    }
+
     /**
      * 查询采购计划详情列表
      *

src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java

@@ -16,6 +16,7 @@ import java.util.List;
 public interface ReceiveDetailDao extends BaseMapperPlus<ReceiveDetailDao, PurReceiveDetailEntity, PurReceiveDetailEntity> {
 
     List<ReceiveDetailResponse> filterList(FilterReceiveDetailRequest filterReceiveDetailRequest);
+    List<ReceiveDetailResponse> filterDrugList(FilterReceiveDetailRequest filterReceiveDetailRequest);
 
     boolean updateReceiveDetail(UpdateReceiveDetailRequest updateReceiveDetailRequest);
 

src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java

@@ -18,6 +18,7 @@ public interface PurApplyDetailDao extends BaseMapper<PurApplyDetailEntity> {
     List<PurApplyDetailEntity> queryPageList(PurApplyDetailRequest purApplyRequest);
 
     List<PurOrderDetailResponse> joinQueryList(PurApplyDetailRequest purApplyRequest);
+    List<PurOrderDetailResponse> joinQueryListDrug(PurApplyDetailRequest purApplyRequest);
 
     int insert(PurApplyDetailEntity purApplyDetailEntity);
 

src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java

@@ -15,6 +15,7 @@ public interface PurOrderDetailDao extends BaseMapper<PurOrderDetailEntity> {
     List<PurOrderDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
 
     List<PurOrderDetailResponse> joinQueryList(PurOrderDetailRequest purOrderDetailRequest);
+    List<PurOrderDetailResponse> joinDrugQueryList(PurOrderDetailRequest purOrderDetailRequest);
 
     Boolean update(PurOrderDetailEntity purOrderDetailEntity);
 

src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java

@@ -17,6 +17,7 @@ public interface PurPlanDetailDao extends BaseMapper<PurPlanDetailEntity> {
     List<PurPlanDetailEntity> queryPageList(PurPlanDetailRequest purApplyRequest);
 
     List<PurOrderDetailResponse> joinQueryList(PurPlanDetailRequest purPlanDetailRequest);
+    List<PurOrderDetailResponse> joinDrugQueryList(PurPlanDetailRequest purPlanDetailRequest);
 
     int insert(PurPlanDetailEntity purPlanDetailRequest);
 

src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java

@@ -388,6 +388,96 @@ public class BasicProductsEntity {
     @TableField(value = "bzgg")
     private String bzgg;
 
+    @TableField(value = "requireScanCode")
+    private Integer requireScanCode;
+
+
+    /**
+     * 产品类型 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;
+
+
+
+
+
+
     public static final String COL_ID = "id";
 
     public static final String COL_UUID = "uuid";

src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java

@@ -117,6 +117,12 @@ public class PurReceiveEntity {
     @TableField(value = "approvalFlowId")
     private String approvalFlowId;
 
+    /**
+     * 产品类型(1.耗材，2.药品)
+     */
+    @TableField(value = "productType")
+    private Integer productType;
+
 
     public static final String COL_ID = "id";
 
@@ -151,5 +157,6 @@ public class PurReceiveEntity {
     public static final String COL_TARGETINVCODE = "targetInvCode";
 
     public static final String COL_TARGETDEPTCODE = "targetDeptCode";
+    public static final String COL_PRODUCTTYPE = "productType";
 
 }

src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java

@@ -140,6 +140,12 @@ public class PurApplyEntity {
     @TableField(value = "pageType")
     private Integer pageType;
 
+    /**
+     * 产品类型(1.耗材,2.药品)
+     */
+    @TableField(value = "productType")
+    private Integer productType;
+
     public static final String COL_ID = "id";
 
     public static final String COL_BILLNO = "billNo";

src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java

@@ -165,6 +165,9 @@ public class PurOrderEntity {
     private String purPlanId;
 
 
+    @TableField(value = "productType")
+    private Integer productType;
+
     public static final String COL_ID = "id";
 
     public static final String COL_BILLNO = "billNo";

src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java

@@ -159,6 +159,9 @@ public class PurPlanEntity {
     @TableField(value = "pageType")
     private Integer pageType;
 
+    @TableField(value = "productType")
+    private Integer productType;
+
 
 
     public static final String COL_ID = "id";

src/main/java/com/glxp/api/req/basic/AddProductRequest.java

@@ -216,7 +216,7 @@ public class AddProductRequest {
      * 有效期
      */
     @TableField(value = "indate")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date indate;
 
 
@@ -253,4 +253,5 @@ public class AddProductRequest {
      * 包装规格
      */
     private String bzgg;
+    private String packRatio;
 }

src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java

@@ -42,6 +42,7 @@ public class FilterReceiveRequest extends ListPageRequest {
     private String createUser;
 
     private Boolean sysApprovalFlow;
+    private Integer productType;
 
 
 }

src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java

@@ -70,4 +70,5 @@ public class PurApplyDetailRequest extends ListPageRequest {
     private String nameCode;
 
     private Integer pageType;
+    private Integer productType;
 }

src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java

@@ -117,4 +117,9 @@ public class PurApplyRequest extends ListPageRequest {
 
     private Integer pageType;
 
+    /**
+     * 产品类型 1.器械 2.药品
+     */
+    private Integer productType;
+
 }

src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java

@@ -81,5 +81,6 @@ public class PurOrderDetailRequest extends ListPageRequest {
 
     @TableField(value = "pageType")
     private Integer pageType;
+    private Integer productType;
 
 }

src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java

@@ -102,4 +102,7 @@ public class PurOrderRequest extends ListPageRequest {
     @TableField(value = "pageType")
     private Integer pageType;
 
+
+    private Integer productType;
+
 }

src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java

@@ -81,5 +81,6 @@ public class PurPlanDetailRequest extends ListPageRequest {
 
     @TableField(value = "pageType")
     private Integer pageType;
+    private Integer productType;
 
 }

src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java

@@ -110,4 +110,6 @@ public class PurPlanRequest extends ListPageRequest {
     @TableField(value = "pageType")
     private Integer pageType;
 
+    private Integer productType;
+
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -217,6 +217,7 @@ public class UdiRelevanceResponse {
      * 制剂单位
      */
     private Integer majorStatus;
+    private Integer physicType;
 
 
 
@@ -224,6 +225,17 @@ public class UdiRelevanceResponse {
      * 包装规格
      */
     private String bzgg;
+    private String packMatrial;
+
+
+    private String levelUnit;
+    private String storageCondition;
+    private String transportCondition;
+    private Date indate;
+    private Integer majorType;
+    private Integer medicareType;
+
+
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java

@@ -47,4 +47,10 @@ public class ReceiveDetailResponse {
     private BigDecimal price;
     private String supName;
 
+    //药品
+    private String bzgg;
+    private String packUnit;
+    private String prepnSpec;
+    private String prepnUnit;
+
 }

src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java

@@ -64,4 +64,10 @@ public class PurOrderDetailResponse {
      */
     @TableField(value = "destinyId")
     private String destinyId;
+
+    //药品
+    private String bzgg;
+    private String packUnit;
+    private String prepnSpec;
+    private String prepnUnit;
 }

src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java

@@ -65,7 +65,7 @@ public class BasicSkProjectService extends ServiceImpl<BasicSkProjectMapper, Bas
         addProductRequest.setName(basicSkProjectEntity.getName());
         addProductRequest.setSpec(basicSkProjectEntity.getGgxh());
         addProductRequest.setMeasname(basicSkProjectEntity.getUnit());
-        addProductRequest.setPrice(String.valueOf(price));
+        addProductRequest.setPrice(price);
         addProductRequest.setDestinyType(1);//定数包
         addProductRequest.setCode(basicSkProjectEntity.getCode());
         udiProductService.addProduct(addProductRequest);

src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailService.java

@@ -41,6 +41,16 @@ public class ReceiveDetailService extends ServiceImpl<ReceiveDetailDao, PurRecei
         return receiveDetailDao.filterList(filterReceiveDetailRequest);
     }
 
+    public List<ReceiveDetailResponse> filterDrugList(FilterReceiveDetailRequest filterReceiveDetailRequest) {
+        if (null == filterReceiveDetailRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterReceiveDetailRequest.getPage() && null != filterReceiveDetailRequest.getLimit()) {
+            PageHelper.offsetPage((filterReceiveDetailRequest.getPage() - 1) * filterReceiveDetailRequest.getLimit(), filterReceiveDetailRequest.getLimit());
+        }
+        return receiveDetailDao.filterDrugList(filterReceiveDetailRequest);
+    }
+
 
     public int insert(PurReceiveDetailEntity receiveDetailEntity) {
         return receiveDetailDao.insert(receiveDetailEntity);

src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java

@@ -63,6 +63,17 @@ public class PurApplyDetailService extends ServiceImpl<PurApplyDetailDao, PurApp
         List<PurOrderDetailResponse> data = purApplyDetailDao.joinQueryList(purApplyRequest);
         return data;
     }
+    public List<PurOrderDetailResponse> joinQueryListDrug(PurApplyDetailRequest purApplyRequest) {
+        if (purApplyRequest == null) {
+            return Collections.emptyList();
+        }
+        if (purApplyRequest.getPage() != null) {
+            int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit();
+            PageHelper.offsetPage(offset, purApplyRequest.getLimit());
+        }
+        List<PurOrderDetailResponse> data = purApplyDetailDao.joinQueryListDrug(purApplyRequest);
+        return data;
+    }
 
 
     public int insert(PurApplyDetailEntity purApplyRequest) {

src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java

@@ -41,6 +41,18 @@ public class PurOrderDetailService extends ServiceImpl<PurOrderDetailDao, PurOrd
         return data;
     }
 
+    public List<PurOrderDetailResponse> joinDrugQueryList(PurOrderDetailRequest purOrderDetailRequest) {
+        if (purOrderDetailRequest == null) {
+            return Collections.emptyList();
+        }
+        if (purOrderDetailRequest.getPage() != null) {
+            int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit();
+            PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit());
+        }
+        List<PurOrderDetailResponse> data = purOrderDetailDao.joinDrugQueryList(purOrderDetailRequest);
+        return data;
+    }
+
 
     public List<PurOrderDetailEntity> findByOrderId(String orderId) {
         PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest();

src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java

@@ -40,6 +40,18 @@ public class PurPlanDetailService extends ServiceImpl<PurPlanDetailDao, PurPlanD
         return data;
     }
 
+    public List<PurOrderDetailResponse> joinDrugQueryList(PurPlanDetailRequest purApplyRequest) {
+        if (purApplyRequest == null) {
+            return Collections.emptyList();
+        }
+        if (purApplyRequest.getPage() != null) {
+            int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit();
+            PageHelper.offsetPage(offset, purApplyRequest.getLimit());
+        }
+        List<PurOrderDetailResponse> data = purPlanDetailDao.joinDrugQueryList(purApplyRequest);
+        return data;
+    }
+
 
     public List<PurPlanDetailEntity> findByOrderId(String orderId) {
         PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest();

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -562,6 +562,13 @@
                basic_products.levelUnit,
                basic_products.prepnUnit,
                basic_products.majorStatus,
+               basic_products.physicType,
+               basic_products.packMatrial,
+               basic_products.storageCondition,
+               basic_products.transportCondition,
+               basic_products.indate,
+               basic_products.majorType,
+               basic_products.medicareType,
         basic_products.requireScanCode,
                th.hsmc  hslbName
         FROM basic_products

src/main/resources/mybatis/mapper/inout/ReceiveDao.xml

@@ -30,6 +30,9 @@
             <if test="invCode != null and invCode != ''">
                 AND invCode = #{invCode}
             </if>
+            <if test="productType != null and productType != ''">
+                AND productType = #{productType}
+            </if>
             <if test="createUser != '' and createUser != null">
                 AND io.createUser = #{createUser}
             </if>

src/main/resources/mybatis/mapper/inout/ReceiveDetailDao.xml

@@ -22,6 +22,34 @@
         GROUP BY basic_udirel.uuid
     </select>
 
+
+
+    <select id="filterDrugList" resultType="com.glxp.api.res.inout.ReceiveDetailResponse">
+        select pur_receive_detail.*,
+               bp.cpmctymc,
+               bp.ggxh,
+               bp.zczbhhzbapzbh,
+               bp.ylqxzcrbarmc,
+               bp.manufactory,
+               bp.measname,
+               bp.nameCode,
+               bp.bzgg,
+               bp.packUnit,
+               bp.prepnSpec,
+               bp.prepnUnit,
+               basic_corp.`name` supName
+        from pur_receive_detail
+                     inner join basic_udirel on basic_udirel.id = pur_receive_detail.relIdFk
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     INNER JOIN basic_corp ON pur_receive_detail.supId = basic_corp.erpId
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+        </where>
+        GROUP BY basic_udirel.uuid
+    </select>
+
     <update id="updateReceiveDetail" parameterType="com.glxp.api.req.inout.UpdateReceiveDetailRequest">
         UPDATE pur_receive_detail
         <trim prefix="set" suffixOverrides=",">

src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml

@@ -102,6 +102,9 @@
             <if test="pageType != null">
                 AND  pur_apply.pageType = #{pageType}
             </if>
+            <if test="productType != '' and productType != null">
+                AND productType = #{productType}
+            </if>
         </where>
         <choose>
             <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
@@ -198,6 +201,9 @@
             <if test="pageType != null">
                 pageType=#{pageType},
             </if>
+            <if test="productType != null">
+                productType=#{productType},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -48,6 +48,39 @@
         order by pur_apply_detail.id desc
     </select>
 
+    <select id="joinQueryListDrug" parameterType="com.glxp.api.req.purchase.PurApplyDetailRequest"
+            resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
+        SELECT
+        pur_apply_detail.*,
+        basic_products.nameCode nameCode,
+        basic_products.ggxh     spec,
+        basic_products.manufactory,
+        basic_products.ylqxzcrbarmc,
+        basic_products.spmc,
+        basic_products.bzgg,
+        basic_products.packUnit,
+        basic_products.prepnSpec,
+        basic_products.prepnUnit,
+        basic_corp.`name`       supName
+        FROM pur_apply_detail
+        INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id
+        INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
+        left JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
+        <where>
+            <if test="orderIdFk != '' and orderIdFk != null">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+            <if test="productId != null">
+                AND productId = #{productId}
+            </if>
+            <if test="supId != '' and supId != null">
+                AND supId = #{supId}
+            </if>
+        </where>
+        GROUP BY basic_products.uuid
+        order by pur_apply_detail.id desc
+    </select>
+
     <insert id="insert" keyProperty="id" useGeneratedKeys="false"
             parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
         replace INTO pur_apply_detail
@@ -141,6 +174,9 @@
             <if test="pageType != null ">
                 AND pur_apply.pageType = #{pageType}
             </if>
+            <if test="productType != null ">
+                AND pur_apply.productType = #{productType}
+            </if>
             <if test="productId != null">
                 AND productId like concat('%', #{productId}, '%')
             </if>

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -127,6 +127,9 @@
             <if test="pageType != null">
                 AND pur_order.pageType = #{pageType}
             </if>
+            <if test="productType != null">
+                AND pur_order.productType = #{productType}
+            </if>
         </where>
         <choose>
             <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">

src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml

@@ -62,6 +62,37 @@
         </where>
     </select>
 
+    <select id="joinDrugQueryList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
+            resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
+        SELECT pur_order_detail.*,
+        basic_products.ggxh     spec,
+        basic_products.nameCode nameCode,
+        basic_products.measname,
+        basic_products.manufactory,
+        basic_products.ylqxzcrbarmc,
+        basic_products.bzgg,
+        basic_products.packUnit,
+        basic_products.prepnSpec,
+        basic_products.prepnUnit,
+        basic_corp.`name`       supName
+        FROM pur_order_detail
+        left JOIN basic_udirel ON pur_order_detail.productId = basic_udirel.id
+        left JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
+        left JOIN basic_corp ON pur_order_detail.supId = basic_corp.erpId
+        <where>
+            <if test="orderIdFk != '' and orderIdFk != null">
+                AND orderIdFk = #{orderIdFk}
+                AND basic_products.diType = 1
+            </if>
+            <if test="productId != null">
+                AND productId = #{productId}
+            </if>
+            <if test="supId != '' and supId != null">
+                AND supId = #{supId}
+            </if>
+        </where>
+    </select>
+
 
     <delete id="deleteByIds" parameterType="java.util.List">
         DELETE
@@ -144,6 +175,10 @@
                basic_products.measname,
                basic_products.manufactory,
                basic_products.ylqxzcrbarmc,
+               basic_products.bzgg,
+               basic_products.packUnit,
+               basic_products.prepnSpec,
+               basic_products.prepnUnit,
                basic_corp.`name`   supName
         FROM pur_order_detail
                      INNER JOIN basic_udirel ON pur_order_detail.productId = basic_udirel.id
@@ -161,6 +196,9 @@
             <if test="pageType != null">
                 AND pur_order.pageType = #{pageType}
             </if>
+            <if test="productType != null">
+                AND pur_order.productType = #{productType}
+            </if>
             <if test="productId != null">
                 AND productId like concat('%', #{productId}, '%')
             </if>

src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml

@@ -98,6 +98,9 @@
             <if test="pageType != null">
                 AND pur_plan.pageType = #{pageType}
             </if>
+            <if test="productType != null">
+                AND pur_plan.productType = #{productType}
+            </if>
         </where>
         <choose>
             <when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">

src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml

@@ -139,6 +139,10 @@
         basic_products.nameCode,
         basic_products.manufactory,
         basic_products.ylqxzcrbarmc,
+        basic_products.bzgg,
+        basic_products.packUnit,
+        basic_products.prepnSpec,
+        basic_products.prepnUnit,
         basic_corp.`name` supName
         FROM
         pur_plan_detail
@@ -154,6 +158,9 @@
             <if test="billNo != null and billNo != ''">
                 AND pur_plan.billNo like concat('%', #{billNo}, '%')
             </if>
+            <if test="productType != null">
+                AND pur_plan.productType = #{productType}
+            </if>
             <if test="productId != null">
                 AND productId like concat('%', #{productId}, '%')
             </if>

src/main/resources/schemas/schema_v2.4.sql

@@ -3794,6 +3794,8 @@ CALL Pro_Temp_ColumnWork('basic_products', 'medicareType',
                          ' tinyint NULL DEFAULT NULL COMMENT ''医保分类 1:甲类;2:乙类;3:丙类''',
                          1);
 
+
+
 CALL Pro_Temp_ColumnWork('basic_products', 'indate',
                          ' datetime NULL DEFAULT NULL COMMENT ''有效日期''',
                          1);
@@ -3819,3 +3821,22 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'useLevelUnit',
 CALL Pro_Temp_ColumnWork('basic_udirel', 'useLeverCount',
                          'int NULL DEFAULT NULL COMMENT ''使用是当前层级包含计量单元数量''',
                          1);
+
+
+
+CALL Pro_Temp_ColumnWork('pur_receive', 'productType',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''',
+                         1);
+
+
+CALL Pro_Temp_ColumnWork('pur_apply', 'productType',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('pur_plan', 'productType',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''',
+                         1);
+
+CALL Pro_Temp_ColumnWork('pur_order', 'productType',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''',
+                         1);