任务【1483】：LES-新增拉动规则表

任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口

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

@@ -713,7 +713,8 @@ public class WmsEnumUtil {
         KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
         PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
-        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料");
+        TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
+        EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动");
 
         private int value;
         private String code;
@@ -5440,4 +5441,99 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 道口预约订单状态
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DOCK_ORDER_STATUS {
+        WAIT_SEND(10, "待送货"),
+        ARRIVED(20, "已到达"),
+        RECEIVED(30, "已收货"),
+        CANCELED(40, "已取消");
+
+        private int value;
+        private String description;
+
+        DOCK_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_ORDER_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 道口预约订单状态
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DOCK_APPOINTMENT_STATUS {
+        WAIT_SEND(10, "待送货"),
+        HAS_SENDED(20, "已送达"),
+        RECEIVING(30, "收货中"),
+        COMPLETED(40, "已完成"),
+        OVERTIME(50, "供货超时");
+
+        private int value;
+        private String description;
+
+        DOCK_APPOINTMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static DOCK_APPOINTMENT_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -89,6 +89,10 @@ public class BasVendor extends BaseBean{
     @Column(name = "VENDOR_TYPE")
     private Integer vendorType;
 
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
+
     public BasVendor() {
     }
 

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

@@ -68,6 +68,10 @@ public class WareHouse extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double baseUnit;
 
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
+
     @Transient
     @ApiParam(value = "存储区列表")
     private List<WmsZones> zoneList;

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

@@ -61,4 +61,8 @@ public class WmsCar extends BaseBean {
     @Transient
     @ApiParam(value = "供应商名称")
     private String vendorNameRdd;
+
+    @Column(name = "MAP_LOCATION")
+    @ApiParam("经纬度")
+    private String mapLocation;
 }

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

@@ -0,0 +1,51 @@
+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.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 道口
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK")
+@Api("道口预约信息")
+public class WmsDock extends BaseBean {
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockCode;
+
+    @Column(name="DOCK_ADDRESS")
+    @ApiParam("道口发运地址")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockAddress;
+
+    @Column(name="DOCK_DESC")
+    @ApiParam("道口发运地址描述")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockDesc;
+
+    @Column(name="DOCK_TYPE")
+    @ApiParam("道口类型")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockType;
+}

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

@@ -0,0 +1,72 @@
+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.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 道口预约信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK_ORDER_INFO")
+@Api("道口预约信息")
+public class WmsDockOrderInfo extends BaseBean {
+
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String dockCode;
+
+    @Column(name="ORDER_DATE")
+    @ApiParam("预约日期")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String orderDate;
+
+    @Column(name="WINDOW_TIME")
+    @ApiParam("窗口时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String windowTime;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam("预约状态")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "DOCK_ORDER_STATUS")
+    private Integer orderStatus;
+
+    @Column(name="SUPPLIER_CODE")
+    @ApiParam("供应商编码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String supplierCode;
+
+    @Column(name="CAR_NO")
+    @ApiParam("车辆编号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String carNo;
+
+    @Column(name="DRIVER_NAME")
+    @ApiParam("驾驶员")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String driverName;
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单据号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
+    private String orderNo;
+}

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

@@ -0,0 +1,42 @@
+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.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 道口窗口时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOCK_WINDOW_TIME")
+@Api("道口窗口时间")
+public class WmsDockWindowTime extends BaseBean {
+
+    @Column(name="DOCK_CODE")
+    @ApiParam("道口代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String dockCode;
+
+    @Column(name="WINDOW_TIME")
+    @ApiParam("窗口时间")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
+    private String windowTime;
+}

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @description 道口看板数据模型
+ * @author jason.niu
+ * @date 2020/03/31
+ */
+@Data
+@Api("道口看板数据模型")
+public class DockDashboardModel {
+    @ApiParam("预约时间")
+    private String orderDate;
+
+    @ApiParam("预约状态")
+    private Integer appointmentStatus;
+
+    @ApiParam("供应商编码")
+    private String supplierCode;
+
+    @ApiParam("单号")
+    private String orderNo;
+
+    @ApiParam("车牌号")
+    private String carNo;
+
+    @ApiParam("驾驶员")
+    private String driverName;
+}

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 /**
- * @description
+ * @description 外部拉动数据结构
  * @author jason.niu
  * @date 2020/03/25
  */
@@ -16,24 +16,39 @@ public class WmsPullOrderModel {
     @ApiParam("工厂代码")
     private String organizeCode;
 
-    @ApiParam("车间")
-    private String workShopCode;
-
     @ApiParam("产线")
     private String lineNo;
 
+    @ApiParam("仓库代码")
+    public String WhNo;
+
+    @ApiParam("存储区代码")
+    public String ZoneNo;
+
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
     @ApiParam("库位")
     private String locateNo;
 
-    @ApiParam("零件号")
+    @ApiParam("物料编码")
     private String partNo;
 
-    @ApiParam("供应商")
+    @ApiParam("物料名称")
-    private String vendorNo;
+    public String partName;
+
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
 
     @ApiParam("数量")
     private Double qty;
 
-    @ApiParam("业务类型")
+    @ApiParam("单位")
-    private Integer busiType;
+    public String unit;
+
+    @ApiParam("批次")
+    public String lotNo;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockOrderInfoRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDockOrderInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口预约信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockOrderInfoRepository extends BaseRepository<WmsDockOrderInfo, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDock;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-30
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockRepository extends BaseRepository<WmsDock, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDockWindowTimeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDockWindowTime;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :道口窗口时间
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-03-29
+ * @Modify:
+ **/
+@Repository
+public interface WmsDockWindowTimeRepository extends BaseRepository<WmsDockWindowTime, Long> {
+}