From df2e8601c486d16f23dbf7725bd8f43956ec3846 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 7 May 2020 18:50:12 +0800 Subject: [PATCH] task:1719 --- .../cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java | 8 +------- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 +++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java index 4e90509..f49407c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/ScriptLoggerModel.java @@ -15,13 +15,7 @@ import lombok.Data; @Api("插件日志") public class ScriptLoggerModel { @ApiParam("工厂") - private String organizeCode; - - @ApiParam("用户编号") - private String userCode; - - @ApiParam("脚本编号") - private String scriptNo; + private Boolean error; @ApiParam("日志内容") private String context; 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 792a479..4c77049 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 @@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; +import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistenceHistory; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; @@ -2279,6 +2280,14 @@ public class WmsHqlPack { return packBean; } + public static DdlPackBean packHqlWmsScriptHistory(EngineScriptPersistenceHistory history) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(history.getScriptNo(), "scriptNo", packBean); + getStringBuilderPack(history, packBean); + + return packBean; + } + /** * 供应商窗口时间 条件封装 *