From 067a859e83489e041748378a116013dcd7960760 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 5 Aug 2020 11:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=9010229=2019081--=20=E5=9C=A8=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=80=BB=E8=BE=91=E4=B8=8A=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E6=89=A3=E5=87=8F=E9=80=BB=E8=BE=91?= =?UTF-8?q?=20--20200802=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 4b8e041..67ddf69 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -80,7 +80,6 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("条码") public String sn; - /** * 质检状态:1=未质检,10=质检中,20=质检合格, * 30=质检不合格,40=已退货 @@ -117,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam(value = "实盘数量", example = "1") @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 7bea734..3a6c6f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,6 +48,10 @@ public class WmsCSRange extends BaseBean { @ApiParam("物料名称") public String partNameRdd; + @Column(name = "WH_NO") + @ApiParam("仓库代码") + public String whNo; + @Column(name = "ZONE_NO") @ApiParam("存储区编号") public String zoneNo; @@ -64,6 +69,15 @@ public class WmsCSRange extends BaseBean { @ApiParam("原单号") public String srcOrderNo; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "库存数量", example = "0") + public Double qty; + + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam("存储区编号组") @AnnoOutputColumn(hidden = true)