From 6996dc2273e997ce3ad484a917f0ec189fda0520 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 1 Nov 2019 11:25:10 +0800 Subject: [PATCH 1/9] =?UTF-8?q?6204:=20MesConfig=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E4=B8=BB=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 32 ++++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 69b01b7..98d8866 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -432,15 +432,11 @@ public class MesHqlPack { */ public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); - } - if (!StringUtils.isEmpty(mesConfig.getCfgName())) { - DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); - } - if (mesConfig.getIsValid() != null) { - DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); - } + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); + DdlPreparedPack.getStringEqualPack(mesConfig.getCfgKey(), "cfgKey", packBean); + DdlPreparedPack.getStringEqualPack(mesConfig.getCfgType(), "cfgType", packBean); + DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); return packBean; } @@ -1399,8 +1395,9 @@ public class MesHqlPack { } /** -<<<<<<< Updated upstream + * <<<<<<< Updated upstream * MES 缺陷查询条件封装 + * * @param mesDefect * @param organizeCode * @return @@ -1421,6 +1418,7 @@ public class MesHqlPack { /** * MES 产品类型图片查询条件封装 + * * @param mesProduceCtgyPicture * @param organizeCode * @return @@ -1440,7 +1438,9 @@ public class MesHqlPack { } - /** 设备通知对象配置 查询条件封装 + /** + * 设备通知对象配置 查询条件封装 + * * @param mesEquNotifyObjectCfg * @param organizeCode * @return @@ -1462,7 +1462,9 @@ public class MesHqlPack { return packBean; } - /** 设备作业通知配置 查询条件封装 + /** + * 设备作业通知配置 查询条件封装 + * * @param mesEquTaskNotifyCfg * @param organizeCode * @return @@ -1489,6 +1491,7 @@ public class MesHqlPack { /** * MES 类型信息查询条件封装 + * * @param mesTypeCfg * @param organizeCode * @return @@ -1512,6 +1515,7 @@ public class MesHqlPack { /** * MES 缺陷原因查询条件封装 + * * @param mesDefectCause * @param organizeCode * @return @@ -1532,6 +1536,7 @@ public class MesHqlPack { /** * 按条件分页查询mes设备点检保养维修作业 + * * @param mesEquTaskDetail * @param organizeCode * @return @@ -1555,6 +1560,7 @@ public class MesHqlPack { /** * 按条件分页查询首检件配置信息 + * * @param mesFiCfg * @param organizeCode * @return @@ -1575,6 +1581,7 @@ public class MesHqlPack { /** * 维修记录 + * * @param mesEquTaskRepairRecord * @param organizeCode * @return @@ -1589,6 +1596,7 @@ public class MesHqlPack { /** * 点检或保养记录 + * * @param mesEquTaskStandardRecord * @param organizeCode * @return From 154bba4b3b898bbb7ef048211283fc2b176a8900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 1 Nov 2019 19:59:05 +0800 Subject: [PATCH 2/9] =?UTF-8?q?LAC=20=E8=B0=83=E5=BA=A6=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java | 7 ++++--- .../main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) 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-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; } From b963bcb502c5bba1bc7469b05a52ba2170833f5d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 4 Nov 2019 11:38:26 +0800 Subject: [PATCH 3/9] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 10 ++- .../pojo/lac/bean/LacCommandStackRecord.java | 6 +- .../i3plus/pojo/lac/bean/LacCommandStackStep.java | 8 +++ .../pojo/lac/bean/LacCommandStackStepTask.java | 16 +++++ .../cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 27 ++++++-- .../i3plus/pojo/lac/bean/LacLogTaskDetail.java | 16 +++++ .../cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 10 +-- .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 71 ++++++++++++++++++++++ 8 files changed, 152 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index 85262b4..e5ad0f4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -141,9 +141,13 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STACK_STATUS{ - RUNNING(1,"运行中"), - PAUSE(2,"暂停"), - FINISH(3,"完成"); + INIT(10,"初始化"), + WAIT(20,"等待中"), + RUNNING(30,"运行中"), + PAUSE(40,"手动暂停"), + FINISH(100,"执行完成"), + RUN_ERROR(101,"运行异常"), + RUN_STOP(102,"手动结束"); private int value; private String description; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index eea1bf4..e108f1b 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -83,7 +83,7 @@ public class LacCommandStackRecord extends BaseBean { @Column(name="STACK_SPEND") @ApiParam(value ="执行耗时") - private Integer stackSpend; + private Long stackSpend; @Column(name="STACK_STATUS") @ApiParam(value ="执行状态") @@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean { private String executionDescription; @Transient + @ApiParam(value ="指令集模板") + private LacCommandStackTemplate template; + + @Transient @ApiParam(value ="步骤列表") private List stepList; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index cbe2d05..41be18c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -79,4 +79,12 @@ public class LacCommandStackStep extends BaseBean { @Transient @ApiParam(value ="步骤任务列表") private List stepTaskList; + + + public LacCommandStackStep() { + } + + public LacCommandStackStep(Long templateId) { + this.templateId = templateId; + } } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java index b1d8a30..1b43256 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java @@ -73,6 +73,10 @@ public class LacCommandStackStepTask extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long stepId; + /** + * 不建议使用 + */ + @Deprecated @Column(name="TASK_INSTANCE_ID") @ApiParam(value ="任务实例ID") @JsonSerialize(using = ToStringSerializer.class) @@ -102,7 +106,19 @@ public class LacCommandStackStepTask extends BaseBean { @Column(name="IS_CRUX") @ApiParam(value ="是否关键") private Integer isCrux; + @Transient @ApiParam(value ="适配任务") private LacSuitTask lacSuitTask; + + @Transient + @ApiParam(value ="适配任务记录") + private LacLogTask logTask; + + public LacCommandStackStepTask() { + } + + public LacCommandStackStepTask(Long templateId) { + this.templateId = templateId; + } } 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 daab86e..6f74bbf 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 @@ -32,6 +32,12 @@ import javax.persistence.Table; public class LacLogTask extends BaseBean { private static final long serialVersionUID = 674009105885048131L; + + @Column(name="COMMAND_STACK_RECORD_ID") + @ApiParam(value ="指令集记录ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackRecordId; + @Column(name="commandStackId") @ApiParam(value ="指令集ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -50,6 +56,10 @@ public class LacLogTask extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long commandStackTypeId; + @Column(name="COMMAND_STACK_TYPE_NAME_RDD") + @ApiParam(value ="指令集类型名称") + private String commandStackTypeNameRdd; + @Column(name="STEP_ID") @ApiParam(value ="步骤ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -61,7 +71,7 @@ public class LacLogTask extends BaseBean { @Column(name="STEP_SEQUENCE") @ApiParam(value ="步骤顺序") - private String stepSequence; + private Integer stepSequence; @Column(name="TASK_ID") @ApiParam(value ="任务ID" , example = "-1") @@ -72,16 +82,25 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="任务名称") private String taskNameRdd; - @Column(name="TASK_NAME_TYPE") + @Column(name="TASK_TYPE_ID") @ApiParam(value ="任务类型") @JsonSerialize(using = ToStringSerializer.class) - private Long taskNameType; + private Long taskTypeId; + + @Column(name="TASK_TYPE_NAME_RDD") + @ApiParam(value ="任务类型") + private String taskTypeNameRdd; @Column(name="adapterId") @ApiParam(value ="适配器ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long adapterId; + @Column(name="TASK_DETAIL_ID") + @ApiParam(value ="任务执行记录明细" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskDetailId; + @Lob @Column(name="INPUT_PARAMETER") @ApiParam(value ="任务入参") @@ -97,7 +116,7 @@ public class LacLogTask extends BaseBean { @Column(name="TASK_SPEND") @ApiParam(value ="任务耗时") - private Integer taskSpend; + private Long taskSpend; @Column(name="TASK_STATUS") @ApiParam(value ="任务状态") 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 3a3f05e..7fa12bd 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 @@ -33,6 +33,12 @@ public class LacLogTaskDetail extends BaseBean { private static final long serialVersionUID = -4918694502072594064L; + + @Column(name="COMMAND_STACK_RECORD_ID") + @ApiParam(value ="指令集记录ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackRecordId; + @Column(name="commandStackId") @ApiParam(value ="指令集ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -53,6 +59,11 @@ public class LacLogTaskDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskId; + @Column(name="TASK_TYPE_ID") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskTypeId; + @Column(name="TASK_NAME_TYPE") @ApiParam(value ="任务类型") @JsonSerialize(using = ToStringSerializer.class) @@ -91,4 +102,9 @@ public class LacLogTaskDetail extends BaseBean { @ApiParam(value ="任务出参处理后") private String outputParameterBody; + @Lob + @Column(name="OUTPUT_PARAMETER_BODY") + @ApiParam(value ="任务执行异常信息") + private String errorMessage; + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 5859ae1..22c04a7 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -119,6 +119,8 @@ public class LacSuitTask extends BaseBean { @ApiParam(value ="任务描述") private String taskDescription; + /********************************** 虚拟字段 **********************************/ + @Transient @ApiParam(value ="适配套件") private LacSuitCase lacSuitCase; @@ -128,10 +130,6 @@ public class LacSuitTask extends BaseBean { private Long taskInstanceId; @Transient - @ApiParam(value ="适配参数") - private List lacSuitTaskParamList; - - @Transient @ApiParam(value ="适配原始参数") private Object orginParam; @@ -148,6 +146,10 @@ public class LacSuitTask extends BaseBean { private Object transMessage; @Transient + @ApiParam(value ="适配参数") + private List lacSuitTaskParamList; + + @Transient @ApiParam(value ="入参适配") private List inputParamAdapterList; 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 d147827..6d04b02 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 @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.lac.bean.*; +import java.util.List; + /** * @Description : * @Reference : @@ -32,6 +34,75 @@ public class LacHqlPack { public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List idList) { + DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ; + + DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List taskIdList) { + DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean); + + DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List taskIdList) { + DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean); + + DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + return ddlPackBean; } From f111febd8d695df78de9fa004f5c3b24a0409225 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 4 Nov 2019 11:43:19 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=9C=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E2=80=9D=E5=AE=89=E7=81=AF=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=BA=E2=80=9C=E8=87=AA=E5=A4=84=E7=90=86?= =?UTF-8?q?=E2=80=9D=EF=BC=8C=20=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E4=BB=A3=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index b27a4a3..7699fbe 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -667,7 +667,7 @@ public class AndonEnumUtil { QUALITY("QUALITY_ALARM", 111020006, "质量"), EQUIP("EQUMENT_ALARM", 111020007, "设备"), PROCESS("ROUTING_ALARM", 111020008, "工艺"), - CHECK("OTHER_ALARM", 111020009, "其他"), + CHECK("OTHER_ALARM", 111020009, "自处理"), FIX_ERROR("FIX_ERROR", 111020010, "自动报警"); private String value; From 0d777d1894c6ff46aa92140e96be81c1b2635d1b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 4 Nov 2019 12:21:13 +0800 Subject: [PATCH 5/9] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java | 4 ++++ 2 files changed, 9 insertions(+) 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 6f74bbf..aa6ca4a 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 @@ -122,4 +122,9 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="任务状态") private Integer taskStatus; + @Column(name="EXECUTION_DESCRIPTION") + @ApiParam(value ="执行说明") + private String executionDescription; + + } 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 7fa12bd..01cc4d0 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 @@ -82,6 +82,10 @@ public class LacLogTaskDetail extends BaseBean { @ApiParam(value ="任务结束时间") private String taskEndTime; + @Column(name="TASK_SPEND") + @ApiParam(value ="任务耗时") + private Long taskSpend; + @Lob @Column(name="INPUT_PARAMETER") @ApiParam(value ="任务入参") From 1de5b8b196dbe395bdb6f07c055ab7b5a19bc98c Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 4 Nov 2019 14:02:38 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=201116?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) 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 c7a0b65..2e36dff 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 @@ -1900,4 +1900,37 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ONLINE_SEND_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"); + + private int value; + private String description; + + ONLINE_SEND_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } From 0ba20f0094a1a96a292c2e51e3771e9c2f4a6d61 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 4 Nov 2019 14:33:22 +0800 Subject: [PATCH 7/9] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 10 +++++----- .../java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) 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/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; } From 855cc4644827717f62fbe4b28d4ab9645cf1a4fc Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 4 Nov 2019 14:35:15 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=201116?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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) { From 3ef115bbe26c538e1bdea11771ae5c55cd61eedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 4 Nov 2019 15:14:49 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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() { }