From 1fb2f07ca37a20cfd0ba4fe7a5fedb43038c2603 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Mon, 29 Jun 2020 20:30:07 +0800
Subject: [PATCH] =?UTF-8?q?edi=20=E6=B7=BB=E5=8A=A0=E9=98=9F=E5=88=97?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesQueueJitActual.java    |  8 +++++
 .../i3plus/pojo/mes/bean/MesQueueJitActualBom.java |  4 +++
 .../pojo/mes/bean/MesQueueJitActualDetail.java     |  4 +++
 .../i3plus/pojo/mes/bean/MesQueueJitPlan.java      |  2 +-
 .../estsh/i3plus/pojo/mes/model/mgnbj/Message.java | 34 +++++++++++++++++++++-
 5 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
index b4d21c1..30cffcc 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
@@ -118,6 +118,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("客户产线代码")
     private String custProdLineCode;
 
+    @Column(name = "PROD_CFG_TYPE_CODE")
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
+    @Column(name = "IS_LOCK")
+    @ApiParam("锁定标识")
+    private Integer isLock;
+
     @Transient
     @ApiParam("客户需求开始时间")
     private String custPointStartDate;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
index b6663bd..cde084a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
@@ -56,6 +56,10 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
     @ApiParam("用量")
     private Double qty = 0d;
 
+    @Column(name = "DOCK_NO")
+    @ApiParam("道口")
+    private String dockNo;
+
     @Column(name = "PART_COLOR_VALUE")
     @ApiParam("零件色值")
     private String partColorValue;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
index 133b159..9fc4b52 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
@@ -89,6 +89,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @ApiParam("选项代码")
     private String optionCode;
 
+    @Column(name = "FORMULA_CONTENT")
+    @ApiParam("配方内容")
+    private String formulaContent;
+
     @Column(name = "ASSY_NO")
     @ApiParam("组件编号")
     private String assyNo;
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 e51b3f0..b9483a5 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
@@ -54,7 +54,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
 
     @Column(name = "SEQ")
     @ApiParam("计划排序号")
-    private String seq;
+    private Double seq;
 
     @Column(name = "STATUS")
     @ApiParam("状态")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java
index 6c530e1..ef61c84 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java
@@ -18,5 +18,37 @@ public class Message implements Serializable {
     private static final long serialVersionUID = 8628748312808962449L;
 
     @XStreamImplicit
-    List<Pn> pns;
+    private List<Pn> pns;
+
+    @XStreamAlias("customerno")
+    private String customerNo;
+
+    @XStreamAlias("customername")
+    private String customerName;
+
+    @XStreamAlias("plantcode")
+    private String plantCode;
+
+    @XStreamAlias("plantname")
+    private String plantName;
+
+    @XStreamAlias("suppliernumber")
+    private String supplierNumber;
+
+    @XStreamAlias("suppliername")
+    private String supplierName;
+
+    @XStreamAlias("status")
+    private String status;
+
+    @XStreamAlias("sequenceno")
+    private String sequenceNo;
+
+    @XStreamAlias("vin")
+    private String vin;
+
+    @XStreamAlias("date")
+    private String date;
+
+
 }