From 49f9d06d5fbc7ecc32948fefa0acde2035c8dc71 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 20 Jun 2020 20:51:56 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20bug#9062=20=E6=97=A0=E9=94=A1=E5=96=9C?= =?UTF-8?q?=E5=BE=B7-=E7=94=9F=E4=BA=A7=E6=B1=87=E6=8A=A5=EF=BC=88?= =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99/=E6=88=90=E5=93=81=EF=BC=89?= =?UTF-8?q?=E7=94=A8=20=E5=87=BD=E6=95=B0=E5=8F=96=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E7=88=B6=E4=BD=8D=E7=BD=AE=E5=92=8C=E5=AD=90=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E5=8F=B7=E5=8F=AF=E8=83=BD=E4=BC=9A=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA-0620?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 13 ++++++++++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 12 ++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index c13b717..b816bfe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -126,10 +126,19 @@ public class SapDocFgSum extends BaseBean { @ApiParam(value = "产品报工orderNo") private String fGOrderNo; + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + private String itemSeqNo; + public SapDocFgSum(){} public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, - String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, String effStartTime, String bomVersion, String fGOrderNo) { + String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, + String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo) { this.wdfdId = wdfdId; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -147,6 +156,8 @@ public class SapDocFgSum extends BaseBean { this.effStartTime = effStartTime; this.bomVersion = bomVersion; this.fGOrderNo = fGOrderNo; + this.seqNo = seqNo; + this.itemSeqNo = itemSeqNo; } public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { 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 08e50e1..672dc3c 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -153,4 +155,14 @@ public class WmsDocFgDetail extends BaseBean { @Column(name = "BOM_VERSION") @ApiParam(value = "BOM版本号") private String bomVersion; + + @Column(name = "SEQ_NO") + @ApiParam(value = "父位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String seqNo; + + @Column(name = "ITEM_SEQ_NO") + @ApiParam(value = "子位置号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemSeqNo; }