From bd8cc364c111997ef3aa52a3f8ce92ea13aa547c Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Fri, 4 Sep 2020 09:24:02 +0800
Subject: [PATCH] =?UTF-8?q?jsp=E8=AE=A1=E7=AE=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/andon/bean/AndonManageQueue.java      |  3 ++-
 .../i3plus/pojo/mes/bean/MesPartStockSchedule.java    |  4 ++++
 .../i3plus/pojo/mes/bean/MesQueueGroupCount.java      |  4 ++++
 .../i3plus/pojo/mes/bean/MesQueueJitActualDetail.java | 19 ++++++++++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
index 21177f7..20826ec 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
@@ -413,8 +413,9 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
      * @param workCenterNameRdd
      * @param andonCount
      */
-    public AndonManageQueue(String organizeNameRdd, String workCenterNameRdd, Long andonCount) {
+    public AndonManageQueue(String organizeNameRdd, String workCenterCode, String workCenterNameRdd, Long andonCount) {
         this.organizeNameRdd = organizeNameRdd;
+        this.workCenterCode = workCenterCode;
         this.workCenterNameRdd = workCenterNameRdd;
         this.andonCount = andonCount;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
index 7ad424d..c695604 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
@@ -71,6 +71,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @ApiParam("是否小尺寸物料")
     private Integer isSmallSize = 1;
 
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java
index 1c1795f..cc47d6e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java
@@ -51,4 +51,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable {
     @Column(name = "GROUP_SIDE")
     @ApiParam("料架摆放位置")
     private String groupSide;
+
+    @Transient
+    @ApiParam("分组序号")
+    private String groupSeq;
 }
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 1d1c468..742a516 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
@@ -25,7 +25,6 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
 @AllArgsConstructor
 @Builder
 @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL")
@@ -100,4 +99,22 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
     @Transient
     @ApiParam("工单类型")
     private Integer woType;
+
+    @Transient
+    @ApiParam("子物料名称")
+    private String itemPartNo;
+
+    @Transient
+    @ApiParam("数量")
+    private long qty;
+
+    public MesQueueJitActualDetail() {
+
+    }
+
+    public MesQueueJitActualDetail(String partNo, String itemPartNo, long qty) {
+        this.partNo = partNo;
+        this.itemPartNo = itemPartNo;
+        this.qty = qty;
+    }
 }