From 85210d4ca122ad0c3a7ffb774eda5597d2078326 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 15 Apr 2019 13:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 18b7d04..34ff73c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -738,7 +738,9 @@ public class CoreHqlPack { // hql拼接 HqlPack.getNumEqualPack(sysLabelTemplateParam.getTemplateId(), "templateId", result); HqlPack.getStringEqualPack(sysLabelTemplateParam.getTemplateCode(), "templateCode", result); - + HqlPack.getNumEqualPack(sysLabelTemplateParam.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(sysLabelTemplateParam.getIsDeleted(), "isDeleted", result); + HqlPack.getStringEqualPack(sysLabelTemplateParam.getOrganizeCode(), "organizeCode", result); // 添加默认排序 HqlPack.getOrderDefault(sysLabelTemplateParam); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java index a503fe6..09b1731 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java @@ -27,6 +27,7 @@ public class WmsBsonPack { bson = BsonPackTool.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", bson); bson = BsonPackTool.getStringEqualPack(actionLog.getFixId(), "fixId", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson); + bson = BsonPackTool.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", bson); bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson); bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson); bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson); 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 8006162..90358a4 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 @@ -35,6 +35,10 @@ public class WmsActionModuleParam extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) public Long amID; + @Column(name = "METHOD_NAME") + @ApiParam("组件执行方法名称") + public String methodName; + @Column(name = "PARAM_CODE") @ApiParam("参数编码") public String paramCode;