diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java index b482dc9b2..874a25588 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java @@ -91,5 +91,27 @@ public class SysWorkplaceQueue implements Serializable { @TableField(exist = false) private String labelId; + /** + * 是否特殊槽:1:是;0:否 + */ + @TableField(value = "specialQueue") + @ApiModelProperty(value = "") + private Integer specialQueue; + + /** + * 分配条件1 + */ + @TableField(value = "assignmentTerms1") + @ApiModelProperty(value = "") + private String assignmentTerms1; + + /** + * 分配条件2 + */ + @TableField(value = "assignmentTerms2") + @ApiModelProperty(value = "") + private String assignmentTerms2; + + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java index a6e03f1c1..c7708781c 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java +++ b/src/main/java/com/glxp/api/entity/inout/IoSplitFifoInv.java @@ -170,6 +170,15 @@ public class IoSplitFifoInv implements Serializable { @ApiModelProperty(value = "工位库存预警数量") private Integer invRemindCount; + /** + * 出货槽编码 + */ + @TableField(value = "workPlaceQueueCode") + @ApiModelProperty(value = "出货槽编码") + private String workPlaceQueueCode; + + + private static final long serialVersionUID = 1L; } 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 0852c076f..3a30d0e23 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java @@ -113,6 +113,11 @@ public class IoSplitInvResponse { */ private String remark; + /** + * 出货槽编码 + */ + private String workPlaceQueueCode; + private Integer groupCount; //产品信息----------------------------start---------------------- private String supName; diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index ebe1df0b8..3799e9a0b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -125,7 +125,8 @@ public class IoSplitFifoInvService extends ServiceImpl