From 7244fb38b17b07010bc2a010f6569bb83ab527e5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sun, 5 Apr 2020 23:16:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 b55e96d..784a25d 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 @@ -197,7 +197,7 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -209,5 +209,6 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.workType = workType; this.orderNo = orderNo; + this.serialNumber=serialNumber; } } From 8c635c355765bdf1967e7def310229fe1bebaa01 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 6 Apr 2020 11:22:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 236115b..0a5b42e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -113,6 +113,8 @@ public class StationRequestBean implements Serializable { @ApiParam("展示组件") private Object moduleService; + @ApiParam("工步序号") + private Integer stepSeq; @Override public String toString() { return "StationRequestBean{" +