diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java index a3cf20d6..f0f50428 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java @@ -53,7 +53,7 @@ public interface InvProductNewDao extends BaseMapperPlus ids, @Param("invSpaceCode") String invSpaceCode); + void batchBindSpace(@Param("ids") List ids, @Param("invSpaceCode") String invSpaceCode); /** * 根据仓库编码和UDI码查询库存详情 diff --git a/src/main/java/com/glxp/api/res/basic/InvProductNewResponse.java b/src/main/java/com/glxp/api/res/basic/InvProductNewResponse.java new file mode 100644 index 00000000..c7485b3d --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/InvProductNewResponse.java @@ -0,0 +1,137 @@ +package com.glxp.api.res.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; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class InvProductNewResponse { + @TableId(value = "id", type = IdType.AUTO) + private Long id; + +// /** +// * UDI码 +// */ +// @TableField(value = "code") +// private String code; + +// /** +// * 订单号外键 +// */ +// @TableField(value = "orderId") +// private String orderId; + + /** + * 耗材字典ID + */ + @TableField(value = "relIdFk") + private Long relIdFk; + + /** + * 最小销售标识 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "productionDate") + private String productionDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + +// /** +// * 序列号 +// */ +// @TableField(value = "serialNo") +// private String serialNo; + + /** + * 供应商 + */ + @TableField(value = "supId") + private String supId; + +// /** +// * 扫码数量 +// */ +// @TableField(value = "`count`") +// private Integer count; + + /** + * 实际数量 + */ + @TableField(value = "reCount") + private Integer reCount; + + + @TableField(value = "inCount") + private Integer inCount; + + + @TableField(value = "outCount") + private Integer outCount; + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 货位编码 + */ + @TableField(value = "invSpaceCode") + private String invSpaceCode; + +// /** +// * 采购类型 +// */ +// @TableField(value = "purchaseType") +// private Integer purchaseType; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + @TableField(value = "mainAction",select = false) + private String mainAction; + +// @TableField(value = "action") +// private String action; + + /** + * 价格 + */ + @TableField(value = "price") + private BigDecimal price; + /** + * 入院批号 + */ + @TableField(value = "inBatchNo") + private String inBatchNo; +} diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 9a232bfc..4903a57c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -58,7 +58,7 @@ public class InvPlaceServiceImpl implements InvPlaceService { .in("code", bindInvSpaceRequest.getCodeArray()) ); if (CollUtil.isNotEmpty(list)) { - List ids = list.stream().map(InvProductNewVo::getId).collect(Collectors.toList()); + List ids = list.stream().map(InvProductNewVo::getId).collect(Collectors.toList()); log.info("本次绑定货位的库存详情数量为:{} 条", ids.size()); invProductNewDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode()); } else { diff --git a/src/main/java/com/glxp/api/vo/basic/InvProductNewVo.java b/src/main/java/com/glxp/api/vo/basic/InvProductNewVo.java index 03bc03e7..215f2416 100644 --- a/src/main/java/com/glxp/api/vo/basic/InvProductNewVo.java +++ b/src/main/java/com/glxp/api/vo/basic/InvProductNewVo.java @@ -13,7 +13,7 @@ import java.util.Date; @TableName("inv_product") public class InvProductNewVo { @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; // /** // * UDI码 diff --git a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml index aab8ac55..96c7608c 100644 --- a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml @@ -553,4 +553,13 @@ +