diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 2e36dff..e85047d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1903,18 +1903,18 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ONLINE_SEND_TYPE { - PLC(10, "PLC"), - DB(20, "DB"); + PLC("PLC", "PLC"), + DB("DB", "DB"); - private int value; + private String value; private String description; - ONLINE_SEND_TYPE(int value, String description) { + ONLINE_SEND_TYPE(String value, String description) { this.value = value; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -1922,7 +1922,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(int val) { + public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index aa6ca4a..4ebc6e9 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -10,10 +10,8 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.List; /** * @Description : @@ -126,5 +124,7 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="执行说明") private String executionDescription; - + @Transient + @ApiParam(value ="步骤列表") + private List detailList; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index 01cc4d0..8c5a66c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -54,6 +54,11 @@ public class LacLogTaskDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long stepId; + @Column(name="LOG_TASK_ID") + @ApiParam(value ="任务实例ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long logTaskId; + @Column(name="TASK_ID") @ApiParam(value ="任务ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java index af6e6fb..c821de0 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -1,15 +1,12 @@ package cn.estsh.i3plus.pojo.lac.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -76,6 +73,10 @@ public class LacSuitCase extends BaseBean { @ApiParam(value ="硬件类型") private Integer hardwareType; + @Column(name="SOFTWARE_SUIT_CODE") + @ApiParam(value ="软适配代码") + private String softwareSuitCode; + @Column(name="RETURN_METHOD") @ApiParam(value ="返回类型") private Integer returnMethod; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 6d04b02..9a42293 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -34,8 +34,8 @@ public class LacHqlPack { public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"commandStackRecordId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java index 75964e5..005846b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.lac; +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; import java.util.List; @@ -25,4 +26,10 @@ public class LacSuitRequest { */ private List taskList; + /** + * 指令集代码 + */ + @XStreamCDATA + private String paramList; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java index 839e2e3..05d5dab 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.lac; +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; @@ -16,5 +17,6 @@ public class Task { private String code; + @XStreamCDATA private Object paramList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index c4c545d..a3e8927 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -270,6 +270,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("筛选(>=)或<") private String choose; + @Transient + @ApiParam("批次校验规则") + private String lotCheckRule; + public WmsStockSn() { }