From 61b16569a450165437bccc8db0e0e3a0402e83d2 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 29 Nov 2018 20:14:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 84c8eb8..1c12e54 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 @@ -39,7 +39,7 @@ public class WmsActionResponseBean { public Set informations; @ApiParam("可选项") - public Set options; + public Map options; @ApiParam("选中的明细数据") public List> details; 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 ee2fc46..a3d543b 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 @@ -1158,6 +1158,8 @@ public class WmsHqlPack { //作业流程id(对应作业记录明细里自增的id) HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result); + HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result); + getStringBuilderPack(wmsActionLogDetails, result); return result.toString();