From f6460749dbffc56106e09d91514bc80950d591f8 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sat, 22 Aug 2020 00:22:29 +0800
Subject: [PATCH] =?UTF-8?q?jsp=E8=A7=A3=E6=9E=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java    | 1 -
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java    | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java    | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
index 1a8afdd..fbe8994 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
@@ -93,7 +93,6 @@ public class IfQueueShipping extends BaseBean implements Serializable {
 
 	@Column(name = "ERROR_MESSAGE")
 	@ApiParam("异常消息")
-	@Lob
 	private String errorMessage;
 
 	@Column(name = "ACTION_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
index b55af50..9998bf4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
@@ -116,4 +116,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @Transient
     @ApiParam("计划上线结束时间")
     private String planEndDate;
+
+    @Transient
+    @ApiParam("版本")
+    private String ifVersion;
 }
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 b060637..79c108a 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
@@ -19,15 +19,15 @@ public class Part implements Serializable {
     @XStreamAlias("item")
     private String item;
 
+    @XStreamAlias("componentGroup")
+    private String componentGroup;
+
     @XStreamAlias("dock")
     private String dock;
 
     @XStreamAlias("qty")
     private String qty;
 
-    @XStreamAlias("componentGroup")
-    private String componentGroup;
-
     @ApiParam("是否是baseModule")
     private boolean isBaseModule;