diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 2ea88ea..bf65f0b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -70,4 +70,9 @@ public class BasCustomer extends BaseBean { @ApiParam(value = "传真") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String custFax; + + @Column(name = "SAFETY_STOCK") + @ApiParam(value = "safetyStock") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private Double safetyStock; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 398154c..935bcc4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -197,6 +197,20 @@ public class WmsDocFgDetail extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PRODUCT_STATUS.class, refForeignKey = "value", value = "description") private Integer productStatus; + @Column(name = "CURRENT_SEQ") + @ApiParam(value = "当前序号") + private Integer currentSeq; + + @Column(name = "MAX_SEQ") + @ApiParam(value = "最大序号") + private Integer maxSeq; + + @Column(name = "RC_TIME") + @ApiParam(value = "接收时间") + private String rcTime; + + + public WmsDocFgDetail(String jisNo) { this.jisNo = jisNo; @@ -205,6 +219,18 @@ public class WmsDocFgDetail extends BaseBean { public WmsDocFgDetail() { } + public WmsDocFgDetail(String jisNo, String queueGroupNo, String processTime, Integer temp) { + this.jisNo = jisNo; + this.queueGroupNo = queueGroupNo; + this.processTime = processTime; + } + + public WmsDocFgDetail(String jisNo, String sn) { + this.jisNo = jisNo; + this.sn = sn; + } + + public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) { this.sn = sn; this.mfgLocNo = mfgLocNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index c3f8106..d82174b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -177,6 +177,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) public String refSrc; + @Column(name = "REF_SN") + @ApiParam("关联条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + public String refSn; + @Column(name = "GROUP_NO") @ApiParam("分组号") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 7f47f40..7d51f82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -10,7 +10,12 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -187,8 +192,13 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("交易类型集合") + private List filterTransTypeCodeList; + + @Transient + @ApiParam("交易类型集合") private List transTypeCodeList; + // @Version // @Column(name = "LOCK_VERSION") // @ApiParam(value = "乐观锁", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index e9b0b82..8772b84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -268,6 +268,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("委外收货时间") public String rcDatetime; + @Transient + @ApiParam("条码数量") + public Integer snCount; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -409,4 +413,9 @@ public class WmsMoveSn extends BaseBean { this.transTypeName = transTypeName; this.itemStatus = itemStatus; } + + public WmsMoveSn(Integer snCount, String createDatetime) { + this.snCount = snCount; + this.createDatetime = createDatetime; + } }