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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -869,7 +869,8 @@ public class WmsEnumUtil {
         WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
         OTHER_IN(730, "OTHER_IN", "其它入库"),
         OTHER_OUT(740, "OTHER_OUT", "其它出库"),
-        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账");
+        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
+        SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
 
         private int value;
         private String code;

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-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/bean/WmsPoSn.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -103,6 +105,11 @@ public class WmsPoSn extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+//    @Column(name = "DATE_CODE", nullable = false)
+//    @ApiParam(value = "供应商生产批次")
+//    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+//    public String dateCode = "";
+
     @ApiParam(value = "供应商名称")
     @Transient
     public String vendorNameRdd;
@@ -119,8 +126,9 @@ public class WmsPoSn extends BaseBean {
     @Transient
     public String lotNo;
 
-    @Transient
-    @ApiParam(value = "生产日期")
+    @Column(name = "DATE_CODE", nullable = false)
+    @ApiParam(value = "供应商生产日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String dateCode;
 
     @Transient

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")