From 01689fde877d1036dcdded0e3e085411d378cd51 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 19 Dec 2018 17:32:15 +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/WmsActionModuleParam.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index 2be5bd4..8006162 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -48,6 +48,6 @@ public class WmsActionModuleParam extends BaseBean { public String paramValueList; @Column(name = "PARAM_TYPE") - @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串】", example = "0") + @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0") public Integer paramType; } 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 24f15c8..afee828 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 @@ -76,12 +76,13 @@ public class WmsActionResponseBean { this.message = message; } - public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus) { + public WmsActionResponseBean(String percent, String message, List informations, Obj details, Boolean codeStatus, Map barCode) { this.percent = percent; this.message = message; this.informations = informations; this.details = details; this.codeStatus = codeStatus; + this.barCode = barCode; } } 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 55b23ed..3bb12f4 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 @@ -1063,6 +1063,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + HqlPack.getNumEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); getStringBuilderPack(wmsActionModuleParam, result); return result.toString();