From af539c85a77ed5da55070b2388e8a612dc08524a Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sat, 1 Aug 2020 14:47:08 +0800
Subject: [PATCH] mgn bug

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 51 +++++++++++++++++++++-
 .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java  |  4 ++
 .../cn/estsh/i3plus/pojo/mes/model/BiModel.java    | 32 ++++++++++++--
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  |  2 +-
 4 files changed, 83 insertions(+), 6 deletions(-)

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 adcf618..ba0b0c0 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
@@ -248,7 +248,8 @@ public class MesEnumUtil {
         PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
         CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
         OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
-        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"),
+        NO_CHECK_SN(50, "NO_CHECK_SN", "不校验条码");
 
         private int value;
         private String code;
@@ -6881,4 +6882,52 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 样本类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SAMPLE_TYPE {
+
+        NORMAL(10, "正常"),
+        FIRST_ARTICLE(20, "首件"),
+        MEDIUM_SIZED(30, "中件"),
+        LAST_PIECE(40, "末件");
+
+        private int value;
+        private String description;
+
+        SAMPLE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
index 925d075..d2e184a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
@@ -108,6 +108,10 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("产线")
     private String workCenterCode;
 
+    @Column(name = "SAMPLE_TYPE")
+    @ApiParam("样本类型")
+    private Integer sampleType;
+
     @ApiParam(value = "检测结果")
     @Transient
     private String reulstStatus;
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 22b4536..a0d3218 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
@@ -59,14 +59,38 @@ public class BiModel {
     @ApiParam(value = "不合格数")
     private double unQualifiedQty = 0;
 
+    @ApiParam(value = "合格率")
+    private double qualifiedRate = 0;
+
+    @ApiParam(value = "一次合格率")
+    private double onceQualifiedRate = 0;
+
+    @ApiParam(value = "不合格率")
+    private double unQualifiedRate = 0;
+
     @ApiParam("目标合格率")
     private double targetPassRate;
 
-    @ApiParam("客户代码")
-    private String customerCode;
+    @ApiParam("颜色标识")
+    private Integer colorFlag = 0;
+
+    @ApiParam("首检")
+    private Integer firstCheck;
+
+    @ApiParam("巡检")
+    private Integer onSiteCheck;
+
+    @ApiParam("首件")
+    private Integer firstArticle;
+
+    @ApiParam("中件")
+    private Integer mediumSized;
+
+    @ApiParam("末件")
+    private Integer lastPiece;
 
-    @ApiParam("客户名称")
-    private String customerName;
+    @ApiParam("末检")
+    private Integer endCheck;//首件、30中件、40末件
 
     @ApiParam("x坐标内容")
     private List<String> xAxis;
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 cae893e..e2ccd0e 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
@@ -300,7 +300,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
+            DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean);
         }
         if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);