From 48a678cc16d25b48d44f7f7dc53de374dfabd167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Wed, 4 Nov 2020 15:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=9012116=2019048-=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7-=E5=8F=82=E6=95=B0=E4=B8=AD=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=8F=92=E5=85=A5=E6=9D=A1=E7=A0=81=EF=BC=8C=E4=BE=9D?=
 =?UTF-8?q?=E6=97=A7=E6=8F=90=E7=A4=BA=E8=BF=87=E7=A8=8B=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E5=9C=A8=E7=B3=BB=E7=BB=9F=E4=B8=AD=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?-20201030=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java   | 14 +++++++-------
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java   |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
index 4dc2203..1b131b8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
@@ -52,7 +52,7 @@ public class MesPart extends BaseBean implements Serializable {
     @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam("标准包规数量")
-    private Double partSpecQty;
+    private Double partSpecQty = 0d;
 
     @Column(name = "CATEGORY_CODE1")
     @ApiParam("分类1")
@@ -84,15 +84,15 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "PROCESS_MATCH_TYPE")
     @ApiParam("过程编码匹配类型")
-    private Integer processMatchType;
+    private Integer processMatchType = 0;
 
     @Column(name = "PACKAGE_MATCH_TYPE")
     @ApiParam("包装编码匹配类型")
-    private Integer packageMatchType;
+    private Integer packageMatchType = 0;
 
     @Column(name = "PRODUCT_MATCH_TYPE")
     @ApiParam("产品编码匹配类型")
-    private Integer productMatchType;
+    private Integer productMatchType = 0;
 
     @Column(name = "PPT_CODE")
     @ApiParam("产品类型代码")
@@ -100,7 +100,7 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "PART_TRAIT")
     @ApiParam("物料特性")
-    private Integer partTrait;
+    private Integer partTrait = 0;
 
     @Column(name = "COLOR_CODE")
     @ApiParam("颜色代码")
@@ -112,11 +112,11 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "SHELVES_AMOUNT")
     @ApiParam("挂架数")
-    private Integer shelvesAmount;
+    private Integer shelvesAmount = 0;
 
     @Column(name = "QUANTITY_PER_RACK")
     @ApiParam("挂架可放零件数")
-    private Integer quantityPerRack;
+    private Integer quantityPerRack = 0;
 
     @Column(name = "PAINT_TANK_CODE")
     @ApiParam("供漆罐代码")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 8bb9074..2286808 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -397,7 +397,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("节拍")
-    private Integer chainSpeed;
+    private String chainSpeed;
 
     @Transient
     @ApiParam("小车号")
@@ -405,11 +405,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("小车数量")
-    private Integer smallCarAmount;
+    private String smallCarAmount;
 
     @Transient
     @ApiParam("标包")
-    private Integer standardPackage;
+    private String standardPackage;
 
     @Transient
     @ApiParam("包规代码")