diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java index 8447918fa..410d1f95a 100644 --- a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java @@ -15,7 +15,7 @@ public class IoSplitFifoInvRequest extends ListPageRequest { /** * 工位编码 */ - private String workPlaceCode; + private Long workPlaceCode; /** * 部门编码 @@ -30,47 +30,57 @@ public class IoSplitFifoInvRequest extends ListPageRequest { /** * 产品类型 */ - private String productType; + private Integer productType; /** * 上货方式:1:拆零上货;2:整取上货 */ - private String fifoSplit; + private Integer fifoSplit; /** * 产品ID主键 */ - private Integer relId; + private Long relId; /** * 批次号 */ - private Integer batchNo; + private String batchNo; /** * 生产日期 */ - private Date produceDate; + private String produceDate; /** * 失效日期 */ - private Date expireDate; + private String expireDate; /** * 供应商ID */ - private Integer supId; + private Long supId; /** * 入库数量 */ - private String inCount; + private Integer inCount; /** * 出库数量 */ - private String outCount; + private Integer outCount; + + /** + * 出库数量 + */ + private Integer reCount; + + /** + * 锁定数量 + */ + private Integer lockCount; /** * 创建时间 @@ -85,7 +95,7 @@ public class IoSplitFifoInvRequest extends ListPageRequest { /** * 是否开启库存预警 */ - private Integer enableRemind; + private Boolean enableRemind; /** * 工位库存预警数量 diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java index eb5c13f14..2d043e259 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java @@ -16,7 +16,7 @@ public class IoSplitInvResponse { /** * 工位编码 */ - private String workPlaceCode; + private Long workPlaceCode; /** * 部门编码 @@ -31,12 +31,12 @@ public class IoSplitInvResponse { /** * 产品类型 */ - private String productType; + private Integer productType; /** * 上货方式:1:拆零上货;2:整取上货 */ - private String fifoSplit; + private Integer fifoSplit; /** * 产品ID主键 @@ -46,17 +46,17 @@ public class IoSplitInvResponse { /** * 批次号 */ - private Integer batchNo; + private String batchNo; /** * 生产日期 */ - private Date produceDate; + private String produceDate; /** * 失效日期 */ - private Date expireDate; + private String expireDate; /** * 供应商ID @@ -66,12 +66,22 @@ public class IoSplitInvResponse { /** * 入库数量 */ - private String inCount; + private Integer inCount; /** * 出库数量 */ - private String outCount; + private Integer outCount; + + /** + * 出库数量 + */ + private Integer reCount; + + /** + * 锁定数量 + */ + private Integer lockCount; /** * 创建时间 @@ -83,6 +93,16 @@ public class IoSplitInvResponse { */ private Date updateTime; + /** + * 是否开启库存预警 + */ + private Boolean enableRemind; + + /** + * 工位库存预警数量 + */ + private Integer invRemindCount; + /** * 备注 */