From b389da7c2fe56cf5efb3c7590d5d9c9b5d60d482 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Fri, 11 Sep 2020 22:39:17 +0800
Subject: [PATCH] Fix Bug #11260

---
 .../i3plus/pojo/mes/bean/MesPartStockSchedule.java   |  8 ++++++++
 .../estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 20 +++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

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 c695604..82bfdf1 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
@@ -3,8 +3,10 @@ package cn.estsh.i3plus.pojo.mes.bean;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -24,6 +26,8 @@ import java.io.Serializable;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@AllArgsConstructor
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PART_STOCK_SCHEDULE")
 @Api("MES_库存排程配置")
@@ -75,6 +79,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "STOCK_QTY")
+    @ApiParam("排程实时库存")
+    private Integer stockQty;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
index 66a0859..8dc57e7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
@@ -102,6 +102,9 @@ public class QueueOrderModel implements Serializable {
 
     @ApiParam("客户产线代码")
     private String custProdLineCode;
+    @ApiParam("JIT排序号")
+    private String jitSeq;
+    private Integer status;
 
     public QueueOrderModel() {
     }
@@ -309,7 +312,8 @@ public class QueueOrderModel implements Serializable {
 
     //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
     public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo,
-                           Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) {
+                           Double queueSeq, Double queDetailSeq, String partNo,
+                           String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode, String serialNumber) {
         this.queueGroupNo = queueGroupNo;
         this.groupNo = groupNo;
         this.orderNo = orderNo;
@@ -320,6 +324,7 @@ public class QueueOrderModel implements Serializable {
         this.organizeCode = organizeCode;
         this.vinCode = vinCode;
         this.produceCategoryCode = produceCategoryCode;
+        this.serialNumber = serialNumber;
     }
 
     // getQueueOrderBySerialNumber
@@ -332,4 +337,17 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
         this.workType = workType;
     }
+
+    // getQueueJitActualJitSeq
+    public QueueOrderModel(Long id, Double queueSeq, String serialNumber, String orderNo, String prodCfgTypeCode, String vinCode, String queueGroupNo, String jitSeq, Integer status) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.serialNumber = serialNumber;
+        this.orderNo = orderNo;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.vinCode = vinCode;
+        this.queueGroupNo = queueGroupNo;
+        this.jitSeq = jitSeq;
+        this.status = status;
+    }
 }