diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java index a72ed67..bc8af3b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java @@ -1,10 +1,10 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; import lombok.Data; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description 冲销Model @@ -18,5 +18,5 @@ public class WmsWriteOffModel implements Serializable { private static final long serialVersionUID = -5490167040159056107L; private String locateNo; private List snList; - private List> summaryList; + private List summaryList; } 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 4ea1543..f4fdad9 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 @@ -186,7 +186,7 @@ public class WmsMoveSn extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; + public Integer lockVersion; @Transient @ApiParam(value = "快照时间") @@ -202,10 +202,12 @@ public class WmsMoveSn extends BaseBean { public WmsMoveSn() { } - public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) { + public WmsMoveSn(String partNo, String partNameRdd, String unit, String lotNo, Double qty) { this.partNo = partNo; - this.waitingCounts = waitingCounts; - this.finishedCounts = finishedCounts; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.lotNo = lotNo; + this.qty = qty; } public Long getWaitingCounts() { @@ -216,6 +218,12 @@ public class WmsMoveSn extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } + public WmsMoveSn(String partNo, String lotNo, Double qty) { + this.partNo = partNo; + this.lotNo = lotNo; + this.qty = qty; + } + public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd;