From 0fbb0fa3ca94476715c629bd30319f7e10e87512 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 19 Dec 2018 18:34:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 ++++++--- 1 file changed, 6 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 3bb12f4..860815c 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 @@ -853,9 +853,12 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getWhNo(),"whNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getZoneNo(),"zoneNo",result); - HqlPack.getStringEqualPack(wmsMoveDetails.getLocateNo(),"locateNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result); + HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result); HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result); HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result); HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result); From 18fa7b8e8e77f734a3034441df355f069cab463f Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 19 Dec 2018 19:33:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 1aaf49c..b78d1de 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.ArrayList; import java.util.List; /** @@ -88,6 +89,6 @@ public class SysMenu extends BaseBean { @Transient @ApiParam(value ="子集列表") - private List childList; + private List childList = new ArrayList<>(); } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 3a9e23b..22aa6ae 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -100,8 +100,4 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="用户所有权限信息") private List menuList; - - @Transient - @ApiParam(value ="用户所有权限信息树数据") - private List menuListTree; } From 0a8ffd10ec5684aea6ea072656995684228690b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 19 Dec 2018 19:47:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index f663b5d..6c66647 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -18,4 +18,9 @@ public class TransSnModle extends BaseComponetsParam{ @ApiParam(value = "交易类型代码") public String transTypeCode; + + // 1:是，2：否 + @ApiParam(value = "是否分组") + public int isGroup; + } 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 860815c..6cc048b 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 @@ -1223,4 +1223,19 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 按moveNo 取最后一笔插入的数据 + * @param wmsMoveSn + * @return + */ + public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(),"orderNo", result); + getStringBuilderPack(wmsMoveSn, result); + HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + + return result.toString(); + } }