From e1114d67d2e693a6ed538a6bc8e0a502407cf0c5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 5 Feb 2020 10:24:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9D=99=E6=80=81=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=A7=A3=E5=86=BB=E8=B0=83=E5=B7=AE=E6=97=B6=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E5=8B=BE=E9=80=89=E4=BA=86=E6=89=80=E6=9C=89=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=8D=95=EF=BC=8C=E7=8E=B0=E5=9C=A8=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=8D=95=E5=AD=90=E4=B8=80=E4=B8=AA=E5=8D=95?= =?UTF-8?q?=E5=AD=90=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E8=B0=83=E5=B7=AE?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8=E7=82=B9=E5=87=BB=E6=97=B6?= =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89=E7=9B=98=E7=82=B9=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E5=B7=AE=E8=8C=83=E5=9B=B4=E9=83=BD=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8C=E7=84=B6=E5=90=8E=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E6=80=A7=E8=B0=83=E5=B7=AE=E6=89=80=E6=9C=89=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=91=E3=80=90bug7485=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsCSOrderMasterModel.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 25 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ 4 files changed, 37 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java index 9330c69..c492ccd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange; import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -19,6 +20,9 @@ public class WmsCSOrderMasterModel implements Serializable { @ApiParam("盘点订单主表") public List wmsCSOrderMasterList; + @ApiParam("盘点调差表") + public List wmsCSAdjustRangeList; + @ApiParam("工厂代码") public String organizeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index a8c2c3b..5b08a41 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -110,4 +110,29 @@ public class QadBop implements Serializable { @Column(name="CREATE_DATE_TIME") @ApiParam("创建时间") public String createDateTime; + + @Transient + @ApiParam("收货时是供应商编号，发运时是客户发往地") + public String inAddr; + + @Transient + @ApiParam("工厂代码") + public String inSite; + + public QadBop(String bopCode, String bopDesc, String bopDomain, String parentPart, String parentReturnPart, String bopdwQty, String subBopCode, String subBopPart, String subItemPart, String subQty, String subUnit, String createDateTime, String inAddr, String inSite) { + this.bopCode = bopCode; + this.bopDesc = bopDesc; + this.bopDomain = bopDomain; + this.parentPart = parentPart; + this.parentReturnPart = parentReturnPart; + this.bopdwQty = bopdwQty; + this.subBopCode = subBopCode; + this.subBopPart = subBopPart; + this.subItemPart = subItemPart; + this.subQty = subQty; + this.subUnit = subUnit; + this.createDateTime = createDateTime; + this.inAddr = inAddr; + this.inSite = inSite; + } } 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 aa9a3fe..81cd4b4 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 @@ -122,4 +122,8 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("客户零件号") private String customerPartNo; + + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 06afc0f..6c78826 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -146,6 +146,10 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "特殊批次") private String fixLotNo = ""; + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){