长泰区医院库存出库明细

src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java

@@ -81,6 +81,14 @@ public interface BaseHttpClient {
      */
     BaseResponse getInvResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest);
 
+    /**
+     * 获取库存收费出入库明细
+     *
+     * @param udiwmsInvProductsRequest
+     * @return
+     */
+    BaseResponse getInvFeeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest);
+
 
     /**
      * 获取库存出入库扫码明细

src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java

@@ -282,4 +282,10 @@ public abstract class CommonHttpClient implements BaseHttpClient {
     public BaseResponse getInvCodeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
         return null;
     }
+
+
+    @Override
+    public BaseResponse getInvFeeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+        return null;
+    }
 }

src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvCodeResultEntity.java

@@ -1,14 +1,41 @@
 package com.glxp.mipsdl.client.ctqyy.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 高值耗材出入库明细
  */
+@NoArgsConstructor
 @Data
 public class InvCodeResultEntity {
 
 
+    @JsonProperty("recordNo")
+    private Integer recordNo;
+    @JsonProperty("visitNo")
+    private String visitNo;
+    @JsonProperty("sickName")
+    private String sickName;
+    @JsonProperty("inDept")
+    private String inDept;
+    @JsonProperty("deptName")
+    private String deptName;
+    @JsonProperty("materialCode")
+    private String materialCode;
+    @JsonProperty("materialName")
+    private String materialName;
+    @JsonProperty("materialPrc")
+    private Integer materialPrc;
+    @JsonProperty("dictBarcode")
+    private String dictBarcode;
+    @JsonProperty("Barcode")
+    private String barcode;
+    @JsonProperty("feeTime")
+    private String feeTime;
+    @JsonProperty("feeOper")
+    private String feeOper;
 }
 
 

src/main/java/com/glxp/mipsdl/client/ctqyy/entity/InvProjectResultEntity.java

@@ -11,17 +11,31 @@ import lombok.NoArgsConstructor;
 @Data
 public class InvProjectResultEntity {
 
+
+    @JsonProperty("seqNo")
     private String seqNo;
+    @JsonProperty("visitNo")
     private String visitNo;
+    @JsonProperty("sickName")
     private String sickName;
+    @JsonProperty("applyDept")
     private String applyDept;
+    @JsonProperty("deptName")
     private String deptName;
+    @JsonProperty("itemCode")
     private String itemCode;
+    @JsonProperty("itemName")
     private String itemName;
+    @JsonProperty("Price")
     private Double price;
+    @JsonProperty("quantity")
     private Integer quantity;
+    @JsonProperty("Cost")
     private Double cost;
+    @JsonProperty("materialCode")
     private String materialCode;
+    @JsonProperty("materialName")
     private String materialName;
+    @JsonProperty("OperTime")
     private String operTime;
 }

src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java

@@ -120,7 +120,7 @@ public class UdiWmsController {
 
 
     /**
-     * 获取库存产明细/出入库明细接口
+     * 获取库存产明细/出入库明细接口（普耗出入库）
      *
      * @param udiwmsInvProductsRequest
      * @return
@@ -130,8 +130,20 @@ public class UdiWmsController {
         return ClientProcessor.getHttpClient().getInvResult(udiwmsInvProductsRequest);
     }
 
+
     /**
-     * 获取库存产出入库扫码明细
+     * 获取库存收费出入库明细 （收费出入库）
+     *
+     * @param udiwmsInvProductsRequest
+     * @return
+     */
+    @PostMapping("/udiwms/erp/inv/getInvFeeResult")
+    public BaseResponse getInvFeeResult(@RequestBody UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+        return ClientProcessor.getHttpClient().getInvFeeResult(udiwmsInvProductsRequest);
+    }
+
+    /**
+     * 获取库存出入库扫码明细 （高值出入库）
      *
      * @param udiwmsInvProductsRequest
      * @return
@@ -149,7 +161,6 @@ public class UdiWmsController {
      * @return
      */
     @PostMapping("/udiwms/erp/post/product")
-
     public BaseResponse postProduct(@RequestBody UdiwmsAddProductsRequest udiwmsAddProductsRequest) {
         return ClientProcessor.getHttpClient().submitProducts(udiwmsAddProductsRequest);
     }

src/main/java/com/glxp/mipsdl/dao/basic/BasicDestinyRelMapper.java

@@ -0,0 +1,10 @@
+package com.glxp.mipsdl.dao.basic;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.basic.BasicSkProjectDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BasicDestinyRelMapper extends BaseMapper<BasicSkProjectDetailEntity> {
+
+}

src/main/java/com/glxp/mipsdl/dao/basic/BasicSkProjectMapper.java

@@ -0,0 +1,10 @@
+package com.glxp.mipsdl.dao.basic;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.basic.BasicSkProjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BasicSkProjectMapper extends BaseMapper<BasicSkProjectEntity> {
+
+}

src/main/java/com/glxp/mipsdl/entity/basic/BasicSkProjectDetailEntity.java

@@ -0,0 +1,63 @@
+package com.glxp.mipsdl.entity.basic;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 定数包产品关联表
+ */
+@Data
+@TableName(value = "basic_sk_project_detail")
+public class BasicSkProjectDetailEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 耗材产品id
+     */
+    @TableField(value = "relId")
+    private Long relId;
+
+    /**
+     * 定数包模板id
+     */
+    @TableField(value = "pId")
+    private Long pId;
+
+    /**
+     * 数量
+     */
+    @TableField(value = "`count`")
+    private Integer count;
+
+    @TableField(value = "`thrName`")
+    private String thrName;
+    @TableField(value = "`thrCode`")
+    private String thrCode;
+    @TableField(value = "`measureCount`")
+    private String measureCount;
+    @TableField(value = "`measureUnit`")
+    private String measureUnit;
+    @TableField(value = "`category`")
+    private String category;
+    @TableField(value = "`frequency`")
+    private String frequency;
+    @TableField(value = "`price`")
+    private String price;
+    @TableField(value = "`ggxh`")
+    private String ggxh;
+    @TableField(value = "`remark`")
+    private String remark;
+    @TableField(value = "`createTime`")
+    private String createTime;
+    @TableField(value = "`createUser`")
+    private String createUser;
+    @TableField(value = "`updateTime`")
+    private String updateTime;
+    @TableField(value = "`updateUser`")
+    private String updateUser;
+
+}

src/main/java/com/glxp/mipsdl/entity/basic/BasicSkProjectEntity.java

@@ -0,0 +1,75 @@
+package com.glxp.mipsdl.entity.basic;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "basic_sk_project")
+public class BasicSkProjectEntity {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 自定义编码
+     */
+    @TableField(value = "idCode")
+    private String idCode;
+
+    /**
+     * 项目编码
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "`name`")
+    private String name;
+
+    /**
+     * 类别
+     */
+    @TableField(value = "category")
+    private String category;
+
+    /**
+     * 规格
+     */
+    @TableField(value = "ggxh")
+    private String ggxh;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    @TableField(value = "`createUser`")
+    private String createUser;
+
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    @TableField(value = "updateUser")
+    private String updateUser;
+    /**
+     * 类型：1：定数包，内部使用；2：项目、组套外部关联
+     */
+    @TableField(value = "type")
+    private Integer type;
+}

src/main/java/com/glxp/mipsdl/res/udiwms/ThrInvResultResponse.java

@@ -156,5 +156,14 @@ public class ThrInvResultResponse {
      */
     private String udiCode;
 
+    /**
+     * 患者编码
+     */
+    private String sickerCode;
+
+    /**
+     * 患者名称
+     */
+    private String sickerName;
 
 }

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.dao.basic.BasicDestinyRelMapper">
+    <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.basic.BasicSkProjectDetailEntity">
+    </resultMap>
+</mapper>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.dao.basic.BasicSkProjectMapper">
+</mapper>