From 48338fec28468fe4548bf4fb369487eddc6c16bf Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Thu, 12 Dec 2019 20:20:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=20task=20`1300`=205=20BI=20=E4=BA=A7?=
 =?UTF-8?q?=E7=BA=BF=E8=BF=90=E8=A1=8C=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index 91b8786..a1585c7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -154,6 +155,14 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("条码类型名称")
     private String snTypeName;
 
+    public MesProduceSn() {
+    }
+
+    public MesProduceSn(String partNo, Integer qcStatus, Double qty) {
+        this.partNo = partNo;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+    }
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

From 3bfb0995d51179174904d664534b6b998492b5ba Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Thu, 12 Dec 2019 20:35:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E3=80=90=E8=B4=B5?=
 =?UTF-8?q?=E9=87=8D=E7=89=A9=E6=96=99=E3=80=91=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E4=B8=8A=E7=BA=BF=E6=B5=81=E7=A8=8B=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=AD=A4=E5=B1=9E=E6=80=A7=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=9C=80=E8=A6=81=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=20=E3=80=91bug1299?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 37 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java     |  5 +++
 2 files changed, 42 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 50a5461..a7ceeff 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -3023,6 +3023,8 @@ public class WmsEnumUtil {
         }
     }
 
+
+
     /**
      * 任务数据来源：检查子数据
      */
@@ -4565,4 +4567,39 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 是否贵重物料
+     * 默认为2
+     */
+    public enum IS_VALUABLE {
+        TRUE(1, "贵重物料"), FALSE(2, "非贵重物料");
+
+        private int value;
+        private String description;
+
+        IS_VALUABLE(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;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index 1d2e6b8..e4a35f8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@@ -170,6 +170,11 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "待质检比例", example = "1")
     private Double proportion;
 
+    @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
+    @ApiParam(value = "贵重物料")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
+    private Integer isValuable;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;