From 4261207e54f53c6844777c8b43cbfbdd39d56f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 12 Jun 2019 18:00:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=88=E6=94=B6=E8=B4=A7=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8E=82+=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E5=8F=AF=E4=BB=A5=E4=B8=BA=E7=A9=BA+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=9C=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E9=9C=80=E8=A6=81=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 c8db411..d6c0f64 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 @@ -1222,13 +1222,13 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); - - getStringBuilderPack(wmsActionModule, result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; } From 052652dd3666e3fc5609f32063fb96c7692f09d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 12 Jun 2019 18:10:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=88=E6=94=B6=E8=B4=A7=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8E=82+=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E5=8F=AF=E4=BB=A5=E4=B8=BA=E7=A9=BA+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=9C=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E9=9C=80=E8=A6=81=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d6c0f64..61a71fb 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 @@ -1221,7 +1221,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) { DdlPackBean result = new DdlPackBean(); - //查询参数封装 + // 查询参数封装 DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); From cbb658e08863bfda13823072e6dd0d0b491d70c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 12 Jun 2019 18:39:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 8 insertions(+) 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 4dc9db4..e90728d 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 @@ -115,4 +115,8 @@ public class WmsPoSn extends BaseBean { @Transient @ApiParam(value = "条码") public String sn; + + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; } 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 78e805f..faccba1 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 @@ -196,6 +196,10 @@ public class WmsStockSn extends BaseBean { @Transient public String labelNo; + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; + public WmsStockSn(){} public WmsStockSn(String partNo){