diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index 604c67c..d67742d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -62,15 +62,15 @@ public class WmsActionLogData extends BaseBean { @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") private String endTime; - @Column(name = "IN_PARAMS") + @Column(name = "IN_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输入参数") private String inParams; - @Column(name = "OUT_PARAMS") + @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输出参数") private String outParams; - @Column(name = "OUT_RESULT") + @Column(name = "OUT_RESULT", columnDefinition = "TEXT") @ApiParam(value = "执行结果") private String outResult; } 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 d372081..cf3573d 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 @@ -1154,10 +1154,16 @@ public class WmsHqlPack { public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) { StringBuffer result = new StringBuffer(); - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), - "startTime", result, true); - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), - "endTime", result, true); + if (StringUtils.isNotBlank(wmsActionLog.getStartTimeStart()) && + StringUtils.isNotBlank(wmsActionLog.getStartTimeEnd())) { + HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(), + "startTime", result, true); + } else if (StringUtils.isNotBlank(wmsActionLog.getEndTimeStart()) && + StringUtils.isNotBlank(wmsActionLog.getEndTimeEnd())) { + HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(), + "endTime", result, true); + } + // 作业流程编号 HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result); // 作业流程名称