From 3425b443c88917e281cf849ca6ab6e4c913efc88 Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Mon, 11 Nov 2019 21:21:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=206283?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
index 05fc3ed..a853af3 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
@@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
-    private MesButtonFlagModel workOrderButtonModel;
+    private MesButtonFlagModel mesButtonFlagModel;
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

From 45d14fe3e2a3016d09150df248a8dd84e8cc6920 Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Tue, 12 Nov 2019 13:07:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=A8=A1=E5=BC=8F=E5=8F=82=E6=95=B0=20=20682?=
 =?UTF-8?q?3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index b7a1607..d045e4a 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -1969,4 +1969,38 @@ public class MesPcnEnumUtil {
     }
 
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_PATTERN_PARAMS {
+
+        MATCH_WORK_ORDER(10, "匹配工单"),
+        API_WORK_ORDER(20, "读取接口工单"),
+        SN_WORK_ORDER(30, "获取条码对应工单");
+
+        private int value;
+        private String description;
+
+        PRODUCT_PATTERN_PARAMS(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;
+        }
+    }
+
 }