From 74cc0c757d1b30517d4b47e47669e8e2555d75a4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 12 Aug 2020 19:57:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 11 +++++++++-- .../java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index f4b82d7..b71500a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -94,6 +94,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("项目代码") private String prodCfgTypeCode; + @ApiParam("配方内容") + private String formulaContent; + public QueueOrderModel() { } @@ -227,7 +230,7 @@ public class QueueOrderModel implements Serializable { //getWaitQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode, - String vinCode) { + String vinCode, String formulaContent, String queueGroupNo) { this.serialNumber = serialNumber; this.id = id; this.queueSeq = queueSeq; @@ -245,11 +248,13 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.prodCfgTypeCode = prodCfgTypeCode; this.vinCode = vinCode; + this.formulaContent = formulaContent; + this.queueGroupNo = queueGroupNo; } //getAlreadyQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) { + String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -263,6 +268,8 @@ public class QueueOrderModel implements Serializable { this.serialNumber = serialNumber; this.prodCfgTypeCode = prodCfgTypeCode; this.vinCode = vinCode; + this.formulaContent = formulaContent; + this.queueGroupNo = queueGroupNo; } //getAlreadyQueueOrderModelNoSn diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 2ac3a02..405eeb6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -108,4 +108,11 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("产品配置名称") private String prodCfgCodeName; + @ApiParam("项目代码") + private String prodCfgTypeCode; + @ApiParam("产品位置") + private String produceCategoryCode; + @ApiParam("结果") + private String result; + }