Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesShiftRestModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2019\10\24 22:04
+ * @Modify:
+ **/
+@Data
+public class MesShiftRestModel extends MesShiftRest {
+
+    @ApiParam("开始时间")
+    private String startDate;
+
+    @ApiParam("结束时间")
+    private String endDate;
+
+    @ApiParam("实际时间差(毫秒)")
+    private Long subTimes;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -67,6 +67,12 @@ public class MgnBjBoardModel implements Serializable {
     @ApiParam("时段")
     private String timeInterval;
 
+    @ApiParam("温度")
+    private String temperature;
+
+    @ApiParam("湿度")
+    private String humidity;
+
     @ApiParam("x坐标内容")
     private List<String> xAxisList;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2491,7 +2491,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (!StringUtils.isEmpty(queueJitActual.getRelationVinCode())) {
-            DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "replaceVinCode", packBean);
+            DdlPreparedPack.getStringLikerPack(queueJitActual.getRelationVinCode(), "relationVinCode", packBean);
         }
         if (queueJitActual.getStatus() != null) {
             DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean);

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

@@ -268,8 +268,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
         this.z = z;
     }
 
-    public WmsLocate(Integer boxQty ,  Double partQty,String locateNo){
-        this.boxQty=boxQty;
+    public WmsLocate(Long boxQty ,  Double partQty,String locateNo){
+        this.boxQty=boxQty.intValue();
         this.partQty=partQty;
         this.locateNo=locateNo;
     }

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

@@ -215,6 +215,23 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "原因", example = "1")
     public String reason;
 
+    @Column(name = "RECEIVE_DATE")
+    @ApiParam(value = "收货日期")
+    public String receiveDate;
+
+    @Column(name = "RECEIVE_TIME")
+    @ApiParam(value = "收货时间")
+    public String receiveTime;
+
+    @Column(name = "WINDOW_START_TIME")
+    @ApiParam(value = "窗口开始时间")
+    public String windowStartTime;
+
+    @Column(name = "WINDOW_END_TIME")
+    @ApiParam(value = "窗口结束时间")
+    public String windowEndTime;
+
+
     @Transient
     @ApiParam("周总数")
     private Integer weekRcCount;
@@ -227,6 +244,18 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("当前状态")
     private String nowStatus;
 
+    @ApiParam(value = "延迟次数")
+    private Long delayCount;
+
+    @ApiParam(value = "延迟次数")
+    private Long sumDelayCount;
+
+    @ApiParam("计划交货时间")
+    private String planPlanDateTime;
+
+
+
+
 
     public WmsPOMaster() {
 
@@ -264,6 +293,23 @@ public class WmsPOMaster extends BaseBean {
         this.delayHour = delayHour;
     }
 
+    public WmsPOMaster(String vendorNo, Long delayCount) {
+        this.vendorNo = vendorNo;
+        this.delayCount = delayCount;
+    }
+
+    public WmsPOMaster(String orderNo, String reason, String planDate, String planTime,
+                       String receiveTime, String vendorNo, String vendorName, String organizeCode) {
+        this.orderNo = orderNo;
+        this.reason = reason;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.receiveTime = receiveTime;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.organizeCode = organizeCode;
+    }
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -124,6 +124,17 @@ public class WmsInterfaceDataMapper extends BaseBean {
     public Integer syncFrequency;
 
     /**
+     * 同步时间 CRON 表达式
+     */
+    @Column(name = "SYNC_CRON")
+    public String syncCron;
+    /**
+     * 下次同步时间，与 syncCron 属性同时使用
+     */
+    @Column(name = "NEXT_SYNC_TIME")
+    public String nextSyncTime;
+
+    /**
      * 上次同步时间
      */
     @Column(name = "LAST_SYNC_TIME")