diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 53adc22..43dfd15 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -37,7 +37,7 @@ import java.util.List; @Index(columnList = "FIX_LOT_NO"), @Index(columnList = "DATE_CODE"), @Index(columnList = "VENDOR_NO") - }) +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -118,26 +118,26 @@ public class WmsStockSn extends BaseBean { */ @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") private Integer qcStatus; /** * 条码状态:1=创建,10=质检中,20=待入库,30=入库,40=配料,50=出库,60=报废,70=在途 */ @Column(name = "SN_STATUS") @ApiParam(value = "条码状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") private Integer snStatus; /** * 1:已打印;2:未打印 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer printed; @Column(name = "PDATE") @ApiParam(value = "打印时间") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pdate; /** * 1=ASN,10=PO,20=SO @@ -160,7 +160,7 @@ public class WmsStockSn extends BaseBean { @Column(name = "SN_TYPE") @ApiParam(value = "条码类型", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") private Integer snType = 10; @ApiParam(value = "仓库名称") @@ -246,9 +246,10 @@ public class WmsStockSn extends BaseBean { @Transient private Integer isSnapshot; - public WmsStockSn(){} + public WmsStockSn() { + } - public WmsStockSn(String partNo){ + public WmsStockSn(String partNo) { this.partNo = partNo; } @@ -256,17 +257,33 @@ public class WmsStockSn extends BaseBean { return isSnapshot == null ? 0 : isSnapshot.intValue(); } - public Integer getSnType() { return snType == null ? 0 : snType.intValue();} + public Integer getSnType() { + return snType == null ? 0 : snType.intValue(); + } public Double getQty() { return qty == null ? 0L : qty.doubleValue(); } - public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();} + public Double getInputNCQty() { + return inputNCQty == null ? 0L : this.inputNCQty.doubleValue(); + } - public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) { + public WmsStockSn(Long snCount, Double sumPartQty, String locateNo) { this.snCount = snCount; this.sumPartQty = sumPartQty; this.locateNo = locateNo; } + + //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid + public WmsStockSn(String locateNo, String partNo, Integer snStatus, + Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) { + this.locateNo = locateNo; + this.partNo = partNo; + this.snStatus = snStatus; + this.qcStatus = qcStatus; + this.qty = qty; + this.isDeleted = isDeleted; + this.isValid = isValid; + } }