diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 00c2f7f..8a52ad2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1740,7 +1740,8 @@ public class WmsEnumUtil { INTERACTIVE_ACTION(10, "交互动作"), BACKSTAGE_ACTION(20, "后台动作"), - SUBMIT_ACTION(30, "提交动作"); + SUBMIT_ACTION(30, "提交动作"), + SELECT_ACTION(40, "选择动作"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java index 0475165..29b1b17 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -18,6 +18,10 @@ import java.util.Map; @Data public class DynTableRow { + // 是否选中 + private boolean isChecked; + + // 行ID private String key; // 行号 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index 23941de..04ab940 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -27,20 +27,20 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_LOG_DETAILS") -@Api(value="作业记录明细表",description = "作业记录表") +@Table(name = "WMS_ACTION_LOG_DETAILS") +@Api(value = "作业记录明细表", description = "作业记录表") public class WmsActionLogDetails extends BaseBean { - @Column(name="AL_ID") + @Column(name = "AL_ID") @ApiParam(value = "作业流程ID", example = "1") @JsonSerialize(using = ToStringSerializer.class) public Long alId; //get单独处理 public Long getAlId() { - if(alId != null) { + if (alId != null) { return alId.longValue(); - }else{ + } else { return alId; } } @@ -49,56 +49,65 @@ public class WmsActionLogDetails extends BaseBean { @ApiParam(value = "流程名称") public String agNameC; - @Column(name="SEQ") + @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") public Integer seq; - @Column(name="OK_SEQ") + @Column(name = "OK_SEQ") @ApiParam(value = "成功跳转步骤", example = "1") public Integer okSeq; - @Column(name="NG_SEQ") + @Column(name = "NG_SEQ") @ApiParam(value = "失败跳转步骤", example = "1") public Integer ngSeq; // 10=只输入一次,20=输入多次,30=输入多次不允许重复,40=本流程结束 - @Column(name="VALUE_TYPE") + @Column(name = "VALUE_TYPE") @ApiParam(value = "动作类型", example = "1") public Integer valueType; // 1=是,2=否 - @Column(name="TO_UPPER") + @Column(name = "TO_UPPER") @ApiParam(value = "是否转为大写", example = "1") public Integer toUpper; - @Column(name="LEN_CHECK") + @Column(name = "LEN_CHECK") @ApiParam(value = "长度检查", example = "1") public Integer lenCheck; - @Column(name="AS_ID") + @Column(name = "AS_ID") @ApiParam(value = "作业步骤", example = "1") @JsonSerialize(using = ToStringSerializer.class) public Long asId; //get单独处理 public Long getAsId() { - if(asId != null) { + if (asId != null) { return asId.longValue(); - }else{ + } else { return asId; } } - @Column(name="ALD_STATUS") + @Column(name = "ALD_STATUS") @ApiParam(value = "执行状态", example = "1") public Integer aldStatus; - @Column(name="START_TIME") + @Column(name = "START_TIME") @ApiParam(value = "开始执行时间") public String startTime; - @Column(name="END_TIME") + @Column(name = "END_TIME") @ApiParam(value = "结束执行时间") public String endTime; + public WmsActionLogDetails() { + + } + + public WmsActionLogDetails(String createUser, Long id, Integer seq) { + this.createUser = createUser; + this.id = id; + this.seq = seq; + } } 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 cf3573d..8eddef9 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 @@ -181,8 +181,12 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); - HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); - HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); + if (StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateEnd())) { + HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); + } + if (StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateEnd())) { + HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); + } getStringBuilderPack(wmsIbCheckPlan, result);