From e6251e56fe5a30c7cfc178140a89edfa8764c3ce Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 30 Nov 2018 14:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91actionDo=E7=9A=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 1c12e54..7514fc1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -36,7 +36,7 @@ public class WmsActionResponseBean { public String message; @ApiParam("列表信息") - public Set informations; + public List informations; @ApiParam("可选项") public Map options; @@ -52,7 +52,7 @@ public class WmsActionResponseBean { this.message = message; } - public WmsActionResponseBean(Double percent, String message, Set informations, List> details, Boolean codeStatus) { + public WmsActionResponseBean(Double percent, String message, List informations, List> details, Boolean codeStatus) { this.percent = percent; this.message = message; this.informations = informations; 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 a3d543b..f446199 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 @@ -1162,6 +1162,8 @@ public class WmsHqlPack { getStringBuilderPack(wmsActionLogDetails, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + return result.toString(); } }