Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -350,6 +350,14 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("是否虚拟件")
     private Integer isFictive = 2;
 
+    @Transient
+    @ApiParam("圈数")
+    private Integer rounds;
+
+    @Transient
+    @ApiParam("小车号")
+    private String smallCarNo;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -195,6 +195,11 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "部门名称", example = "1")
     public Integer departName;
 
+    @Transient
+    @ApiParam("周总数")
+    private Integer weekRcCount;
+
+
     public WmsPOMaster() {
 
     }
@@ -219,6 +224,17 @@ public class WmsPOMaster extends BaseBean {
         this.planTime = planTime;
     }
 
+    public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName,
+                       String dockCode, String planDate, String planTime) {
+        this.orderNo = orderNo;
+        this.poStatus = poStatus;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.dock = dockCode;
+        this.planDate = planDate;
+        this.planTime = planTime;
+    }
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java

@@ -54,7 +54,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
     private Map<String, Map<Integer, WmsPOMaster>> gteCurrentDayResultMap;
 
     @ApiParam("小于今天的结果集")
-    private Map<Integer, Map<String, String>> ltCurrentDayResultMap;
+    private Map<Integer, Map<String, Object>> ltCurrentDayResultMap;
 
     public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName,
                              String planTime, Double transQty, Double resQty) {