From ec3ef597e8e4464e5e2ce73b55babd5abafd04e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 21 Sep 2019 05:18:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 39 ++++++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) 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; + } } From 0f82f3fbe5f0c5bf79d59f907885cb58ae6447ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 23 Sep 2019 17:18:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index ba26d44..a90feda 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -63,7 +63,7 @@ public class WmsDocMovementSn extends BaseBean { public String unit; /** - * 状态：操作状态 + * 状态：操作状态 itemStatus */ @Column(name="SN_STATUS") @ApiParam(value = "操作状态", example = "10") @@ -105,4 +105,9 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("ERP库存地") private String erpWhNo; + + @Column(name="SN_STATUS") + @ApiParam(value = "状态", example = "10") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer itemStatus; }