From 76f8675ac1c3804b5346a4b711279d882b905751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 4 Jan 2021 13:13:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=9013525=2020027-QMES=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E2=80=9C=E4=BA=A7=E7=BA=BF=E4=B8=80=E6=AC=A1=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E7=8E=87=E2=80=9D=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E2=80=9C=E6=97=A5=E6=9C=88=E5=B9=B4=E2=80=9D=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE-20201230?= =?UTF-8?q?=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/mes/model/BiModel.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java index 94d1a42..012f7d6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java @@ -70,7 +70,7 @@ public class BiModel implements Serializable { private double unQualifiedRate = 0; @ApiParam("目标合格率") - private double targetPassRate; + private double targetPassRate = 0; @ApiParam("颜色标识") private Integer colorFlag = 0; @@ -93,6 +93,9 @@ public class BiModel implements Serializable { @ApiParam("末检") private Integer endCheck;//首件、30中件、40末件 + @ApiParam("质量状态") + private Integer qcStatus; + private double qty; @ApiParam("比率") @@ -116,4 +119,10 @@ public class BiModel implements Serializable { this.qty = qty; this.partNo = partNo; } + + public BiModel(String workCellCode, String partNo, Integer qcStatus) { + this.workCellCode = workCellCode; + this.partNo = partNo; + this.qcStatus = qcStatus; + } } From b702c92c42c648f4774317ac9c32879c32907ec4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 4 Jan 2021 13:38:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index af23ef0..5a30d9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3711,4 +3711,13 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesQueueOrderDetail(MesQueueOrderDetail queueOrderDetail) { + DdlPackBean packBean = getAllBaseData(queueOrderDetail.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(queueOrderDetail.getSerialNumber(), "serialNumber", packBean); + DdlPreparedPack.getStringLikerPack(queueOrderDetail.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(queueOrderDetail.getPartNameRdd(), "partNameRdd", packBean); + return packBean; + } + }