diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 8bf23fb..7dd74eb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3118,7 +3118,8 @@ public class MesEnumUtil { EXEC(10, "执行方法"), COMPLETE(20, "完成方法"), - HNC_ISSUED(30,"队列自动下达"); + HNC_ISSUED(30,"队列自动下达"), + LABEL_PROPERTIES(40,"标签属性查询方法"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 2a23858..793f30f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -42,6 +42,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable { @ApiParam(value = "模板内容") private String templateContent; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + @ApiParam(value = "第二个模板内容") private String otherTemplateContent; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 184df4f..dc2d752 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -108,6 +108,58 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("组件编号") private String assyNo; + @Transient + @ApiParam("Vin") + private String vinCode; + + @Transient + @ApiParam("条码状态") + private Integer snStatus; + + @Transient + @ApiParam("开始时间") + private String startTime; + + @Transient + @ApiParam("结束时间") + private String endTime; + + @Transient + @ApiParam("过程标签模板") + private String processLabelTemplate; + + @Transient + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Transient + @ApiParam("等级代码") + private String gradeCode; + + @Transient + @ApiParam("标志值集合") + private String flagValueList; + + @Transient + @ApiParam("质量标志值") + private String qcFlagValue; + + @Transient + @ApiParam("3C认证编码") + private String cccCode; + + @Transient + @ApiParam("条码标签描述") + private String labelDesc; + + @Transient + @ApiParam("打印时间") + private String printTime; + + @Transient + @ApiParam("年度型") + private String modelYear; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } @@ -132,4 +184,25 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.seq = seq; this.serialNumber = serialNumber; } + + public MesQueueOrderDetail(String orderNo, String vinCode, String partNo, String partNameRdd, String produceCategoryCode, + Integer status, String serialNumber, Double seq, Integer isGroupPrinted, String createDatetime, + String processLabelTemplate, String prodLabelTemplate,String optionCode,String produceColor,String gradeCode,String assyNo) { + this.orderNo = orderNo; + this.vinCode = vinCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.status = status; + this.serialNumber = serialNumber; + this.seq = seq; + this.isGroupPrinted = isGroupPrinted; + this.createDatetime = createDatetime; + this.processLabelTemplate = processLabelTemplate; + this.prodLabelTemplate = prodLabelTemplate; + this.optionCode = optionCode; + this.produceColor = produceColor; + this.gradeCode = gradeCode; + this.assyNo = assyNo; + } }