From a1ec8d7293b5069e0857a8e7a2535232d78eb572 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 15 Jan 2020 19:52:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 9 +++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 3 files changed, 15 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 b12010a..1f2f1d4 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 @@ -207,4 +207,13 @@ public class WmsCSOrderDetails extends BaseBean { this.organizeCode = organizeCode; this.qty=qty; } + + public WmsCSOrderDetails (String orderNo, String partNo,String partNameRdd, String locateNo, double qty, double factQty){ + this.orderNo=orderNo; + this.partNo=partNo; + this.partNameRdd=partNameRdd; + this.qty=qty; + this.factQty=factQty; + this.locateNo=locateNo; + } } 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 dac3089..755a876 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -52,6 +53,7 @@ public class WmsCSRange extends BaseBean { @Column(name = "LOCATE_NO") @ApiParam("库位编号") + @AnnoOutputColumn(hidden = true) public String locateNo; @Column(name = "UNIT") @@ -59,7 +61,8 @@ public class WmsCSRange extends BaseBean { public String unit; @Transient - @ApiParam("存储区编号") + @ApiParam("存储区编号组") + @AnnoOutputColumn(hidden = true) public String[] zoneNos; public WmsCSRange(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 0572e84..deee914 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1387,6 +1387,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); getStringBuilderPack(wmsCSOrderDetails, result); From 7f7c9ebf6e92f61a2d19e8ff9f62aca4c6906f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 15 Jan 2020 19:53:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?SAP=E6=8C=87=E4=BB=A4=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=9A?= =?UTF-8?q?=E8=8B=A5=E6=A0=B9=E6=8D=AE=E5=8D=95=E6=8D=AE=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=B0=E4=BA=86=E8=AE=B0=E5=BD=95=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=96=B0=E5=A2=9E=E4=BA=86=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=AD=A4=E7=BB=84=E4=BB=B6=E6=97=B6=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E4=B8=AD=E4=B8=80=E5=AE=9A=E5=BE=97=E5=AD=98=E5=9C=A8?= =?UTF-8?q?ORDER=5FNO;=20=E5=AE=9A=E6=97=B6=E9=87=8D=E6=8E=A8=E5=BE=85?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A7=BB=E5=8A=A8=E5=8D=95=E5=85=A5JOB?= =?UTF-8?q?=E5=AE=B9=E9=94=99=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9+?= =?UTF-8?q?=E7=95=99=E4=B8=AASWAGGER=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 99eb8af..f3856c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -187,4 +187,8 @@ public class WmsDocMovementMaster extends BaseBean { public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } + + public int getBusiTypeVal() { + return this.busiType == null ? 0 : this.busiType; + } }