From d35c6e97cda1968a644e7885f341ce18a3776356 Mon Sep 17 00:00:00 2001 From: 1111 Date: Tue, 19 Nov 2019 17:10:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index aaf250d..06afc0f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -142,7 +142,7 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "最晚收货时间") public String latestReceTime; - @Column(name = "FIX_LOT_NO", nullable = false) + @Column(name = "FIX_LOT_NO") @ApiParam(value = "特殊批次") private String fixLotNo = ""; From 12ba5d2ff3080e26637fd7e45b6eb5a6d56a5c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 19 Nov 2019 21:38:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?lac=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 76 ++++++++++++++++++++++ .../i3plus/pojo/lac/bean/LacCommandOperate.java | 30 +++++++++ .../pojo/lac/bean/LacCommandStackRecord.java | 4 ++ .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 28 ++++++-- .../pojo/model/lac/LacCommandStackModel.java | 1 + 5 files changed, 133 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java 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 d64eb01..e6dbdbd 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 @@ -251,4 +251,80 @@ public class LacEnumUtil { } } + /** + * 指令操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMAND_OPERATE_TYPE{ + COMMAND_STACK(10,"指令集"), + COMMAND_STACK_STEP(20,"指令集步骤"), + COMMAND_STACK_STEP_TASK(30,"指令集步骤任务"); + + private int value; + private String description; + + COMMAND_OPERATE_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; + } + } + + /** + * 指令操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMAND_OPERATE{ + RESUME(11,"恢复",COMMAND_OPERATE_TYPE.COMMAND_STACK), + PAUSE(12,"暂停",COMMAND_OPERATE_TYPE.COMMAND_STACK), + CLOSE(13,"关闭",COMMAND_OPERATE_TYPE.COMMAND_STACK), + NEXT_STEP(14,"下一步",COMMAND_OPERATE_TYPE.COMMAND_STACK), + INTERRUPT(21,"中断",COMMAND_OPERATE_TYPE.COMMAND_STACK_STEP_TASK); + + private int value; + private String description; + private COMMAND_OPERATE_TYPE commandOperateType; + + COMMAND_OPERATE(int value, String description,COMMAND_OPERATE_TYPE commandOperateType) { + this.value = value; + this.description = description; + this.commandOperateType = commandOperateType; + } + + 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; + } + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java new file mode 100644 index 0000000..8c878bf --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-11-19 16:14 + * @Modify: + **/ +@Data +@ApiModel("指令操作") +public class LacCommandOperate { + + @ApiParam(value ="指令集记录id" , example = "-1") + private Long commandStackRecordId; + + @ApiParam(value ="步骤任务id" , example = "-1") + private Long commandStackStepTaskIdId; + + @ApiParam(value ="操作类型" , example = "-1") + private Integer operateType; + + @ApiParam(value ="操作" , example = "-1") + private Integer operate; + +} 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 e108f1b..c4eada8 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 @@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean { private String executionDescription; @Transient + @ApiParam(value ="Lac实例id") + private String lacInstanceId; + + @Transient @ApiParam(value ="指令集模板") private LacCommandStackTemplate template; 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 abf9368..07bd515 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 @@ -2,9 +2,19 @@ package cn.estsh.i3plus.pojo.lac.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.lac.bean.*; - +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTask; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; +import cn.estsh.i3plus.pojo.lac.bean.LacTaskType; import java.util.List; /** @@ -61,9 +71,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getStepId(), "stepId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean); return ddlPackBean; @@ -104,7 +114,7 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - if(bean == null){ + if (bean == null) { return ddlPackBean; } DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean); @@ -143,4 +153,10 @@ public class LacHqlPack { ); return ddlPackBean; } + + public static DdlPackBean packHqlNotFinishLacCommandStackRecord() { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean); + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index 0cdedf7..0574386 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -44,6 +44,7 @@ public class LacCommandStackModel { */ private Exception exception; + public void setException(Exception exception){ LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception); this.exception = exception; From 88d480403cc4fd73dc4f560d395ebbf42b7ff7c0 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 20 Nov 2019 09:05:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=9E=E6=80=A7=20?= =?UTF-8?q?=E8=B5=8B=E5=80=BClongtext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java index 90fc4d3..6838d51 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -39,6 +40,7 @@ public class MesRoute extends BaseBean { @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + @Lob @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index 8bbbb0f..5c55d35 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -35,6 +36,7 @@ public class MesRoute extends BaseBean { @ApiParam("流程名称") private String routeName; + @Lob @Column(name = "POSITION") @ApiParam("GOJS位置") private String position;