From f275d70136d4b000a664c23968c82ec10bae2427 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Wed, 19 Aug 2020 23:15:47 +0800
Subject: [PATCH] Fix Bug #10674

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java      | 3 +++
 .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java      | 4 +++-
 .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java        | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java
index 4d2528a..7d1c6f2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java
@@ -36,4 +36,7 @@ public class Head implements Serializable {
     @XStreamAlias("status")
     private String status;
 
+    @XStreamAlias("vehicleName")
+    private String vehicleName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
index f6024e5..b060637 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java
@@ -25,6 +25,9 @@ public class Part implements Serializable {
     @XStreamAlias("qty")
     private String qty;
 
+    @XStreamAlias("componentGroup")
+    private String componentGroup;
+
     @ApiParam("是否是baseModule")
     private boolean isBaseModule;
 
@@ -49,7 +52,6 @@ public class Part implements Serializable {
     @ApiParam("配方顺序")
     private String recipeSeq;
 
-
     @ApiParam("Mes物料号")
     private String partNo;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java
index c1d74b6..846bec2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,7 +37,7 @@ public class Pn implements Serializable {
     private List<Part> parts;
 
     @XStreamAlias("optioncode")
-    private List<CodeRule> codeRules;
+    private List<CodeRule> codeRules = new ArrayList<>();
 
     @ApiParam("新vin号")
     private String newVin;