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 e6dbdbd..3cb1b28 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 @@ -252,10 +252,10 @@ public class LacEnumUtil { } /** - * 指令操作类型 + * 指令操作对象类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum COMMAND_OPERATE_TYPE{ + public enum OPERATE_OBJ_TYPE{ COMMAND_STACK(10,"指令集"), COMMAND_STACK_STEP(20,"指令集步骤"), COMMAND_STACK_STEP_TASK(30,"指令集步骤任务"); @@ -263,7 +263,7 @@ public class LacEnumUtil { private int value; private String description; - COMMAND_OPERATE_TYPE(int value, String description) { + OPERATE_OBJ_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -288,24 +288,24 @@ public class LacEnumUtil { } /** - * 指令操作类型 + * 操作指令 */ @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); + public enum OPERATE_COMMAND{ + STACK_RESUME(11,"恢复",OPERATE_OBJ_TYPE.COMMAND_STACK), + STACK_PAUSE(12,"暂停",OPERATE_OBJ_TYPE.COMMAND_STACK), + STACK_CLOSE(13,"关闭",OPERATE_OBJ_TYPE.COMMAND_STACK), + STACK_SKIP(14,"跳过",OPERATE_OBJ_TYPE.COMMAND_STACK), + TASK_INTERRUPT(21,"中断",OPERATE_OBJ_TYPE.COMMAND_STACK_STEP_TASK); private int value; private String description; - private COMMAND_OPERATE_TYPE commandOperateType; + private OPERATE_OBJ_TYPE operateObjType; - COMMAND_OPERATE(int value, String description,COMMAND_OPERATE_TYPE commandOperateType) { + OPERATE_COMMAND(int value, String description,OPERATE_OBJ_TYPE operateObjType) { this.value = value; this.description = description; - this.commandOperateType = commandOperateType; + this.operateObjType = operateObjType; } public int getValue() { @@ -325,6 +325,20 @@ public class LacEnumUtil { } return tmp; } + + public static OPERATE_COMMAND valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public OPERATE_OBJ_TYPE getOperateObjType() { + return operateObjType; + } } } 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 index 8c878bf..80c0b0d 100644 --- 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 @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.lac.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,15 +18,22 @@ import lombok.Data; public class LacCommandOperate { @ApiParam(value ="指令集记录id" , example = "-1") - private Long commandStackRecordId; + private Long operateObjId; - @ApiParam(value ="步骤任务id" , example = "-1") - private Long commandStackStepTaskIdId; - - @ApiParam(value ="操作类型" , example = "-1") - private Integer operateType; + @ApiParam(value ="操作对象类型" , example = "-1") + @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class) + private Integer operateObjType; @ApiParam(value ="操作" , example = "-1") - private Integer operate; + @AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class) + private Integer operateCommand; + + public LacCommandOperate(){} + + public LacCommandOperate(Long operateObjId,LacEnumUtil.OPERATE_COMMAND operateCommand){ + this.operateObjId = operateObjId; + this.operateCommand = operateCommand.getValue(); + this.operateObjType = operateCommand.getOperateObjType().getValue(); + } } 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 7ec411c..50433f4 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 @@ -116,7 +116,7 @@ public class LacCommandStackStepTask extends BaseBean { private LacLogTask logTask; public Long getTaskInstanceId(){ - if(lacSuitTask == null){ + if(logTask != null){ return logTask.getId(); } return null; 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 07bd515..8f317e9 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 @@ -29,6 +29,34 @@ public class LacHqlPack { private LacHqlPack() { } + /** + * In 参数封装 + * @param columnName + * @return + */ + public static DdlPackBean packHqlInArray(String columnName, Object[] params){ + DdlPackBean ddlPackBean =DdlPackBean.getDdlPackBean(); + + // 参数数组 [1,2,3] -> "1,2,3" + DdlPreparedPack.getInPackArray(params,columnName,ddlPackBean); + + return ddlPackBean; + } + + /** + * In 参数封装 + * @param columnName + * @return + */ + public static DdlPackBean packHqlInList(String columnName, List params){ + DdlPackBean ddlPackBean =DdlPackBean.getDdlPackBean(); + + // 参数数组 [1,2,3] -> "1,2,3" + DdlPreparedPack.getInPackList(params,columnName,ddlPackBean); + + return ddlPackBean; + } + public static DdlPackBean packHqlLacTaskType(LacTaskType bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java index 764b522..874ed08 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java @@ -8,18 +8,18 @@ import lombok.Data; import java.util.List; /** - * @Description: 打印信息封装模板 + * @Description: 打印信息封装 * @Reference: * @Author: wangjie * @CreateDate:2019-08-27-13:24 * @Modify: **/ @Data -@Api("打印信息封装模板") +@Api("打印信息封装") public class SnPrintDataModel { @ApiParam("打印数据") - private List snPrintValueModel; + private List valueList; @ApiParam("打印模板及参数") private MesLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java index 47c87a9..bb2620a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java @@ -5,23 +5,23 @@ import io.swagger.annotations.ApiParam; import lombok.Data; /** - * @Description: 条码补打印 + * @Description: 打印信息汇总 * @Reference: * @Author: wangjie * @CreateDate:2019-08-27-13:24 * @Modify: **/ @Data -@Api("打印信息模板") +@Api("打印信息汇总") public class SnPrintModel extends SnPrintValueModel { @ApiParam("过程条码") - private SnPrintDataModel snPrintModel; + private SnPrintDataModel serialPrintDataModel; @ApiParam("产品条码") - private SnPrintDataModel prodPrintModel; + private SnPrintDataModel prodPrintDataModel; @ApiParam("包装条码") - private SnPrintDataModel packagePrintModel; + private SnPrintDataModel packPrintDataModel; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java index a26ac51..42dbbea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintValueModel.java @@ -6,14 +6,14 @@ import io.swagger.annotations.ApiParam; import lombok.Data; /** - * @Description: 条码补打印 + * @Description: 打印信息 * @Reference: * @Author: wangjie * @CreateDate:2019-08-27-13:24 * @Modify: **/ @Data -@Api("打印信息模板") +@Api("打印信息") public class SnPrintValueModel extends MesProduceSn { @ApiParam("打印描述") private String printDesc; 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 05d5dab..ce9d8c2 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 @@ -17,6 +17,8 @@ public class Task { private String code; + private String stepCode; + @XStreamCDATA private Object paramList; }