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

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

@@ -2591,4 +2591,60 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
-}
+
+    /**
+     * PO ASN 收货状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_RECEIVE_STATUS {
+        WAITING_RECEIVE_TIME_EARLY("R0001", "待收货"),
+        RECEIVEING_TIME_EARLY("R0002", "提前收货中"),
+        RECEIVED_IIME_EARLY("R0003", "提前收货完成"),
+        WAITING_RECEIVE_TIME_IN("R0004", "待收货"),
+        RECEIVEING_TIME_IN("R0005", "正常收货中"),
+        RECEIVED_TIME_IN("R0006", "正常收货完成"),
+        WAITING_RECEIVE_TIME_LATE("R0007", "延迟未收货"),
+        RECEIVEING_TIME_LATE("R0008", "延迟收货中"),
+        RECEIVED_TIME_LATE("R0009", "延迟收货完成"),
+        STATUS_NEED_TO_CHECK("R0010", "待查询");
+
+        private String value;
+        private String description;
+
+        PO_RECEIVE_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public static PO_RECEIVE_STATUS codeOf(String value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String getDes(String 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/WmsPoSn.java

@@ -119,4 +119,20 @@ public class WmsPoSn extends BaseBean {
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;
+
+    @Transient
+    @ApiParam(value = "最早收货时间")
+    public String earliestReceTime;
+
+    @Transient
+    @ApiParam(value = "最晚收货时间")
+    public String latestReceTime;
+
+    public WmsPoSn(){}
+
+    public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){
+        this.orderNo = orderNo;
+        this.earliestReceTime = earliestReceTime;
+        this.latestReceTime = latestReceTime;
+    }
 }

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

@@ -0,0 +1,84 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.time.LocalTime;
+
+/**
+ * @Description : 供应商收货看板信息
+ * @Reference :
+ * @Author : sky.meng
+ * @CreateDate : 2019-06-24 15:04
+ * @Modify:
+ **/
+@Data
+@Api("供应商收货看板")
+public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRecvModel>{
+
+    @ApiParam("订单号")
+    private String orderNo;
+    @ApiParam("供应商名称")
+    private String vendorName;
+    @ApiParam("收货通道")
+    private String dock;
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+    @ApiParam("项目名称")
+    private String prodCfgTypeName;
+    @ApiParam("计划收货日期")
+    private String planDate;
+    @ApiParam("计划收货时间")
+    private String planTime;
+    @ApiParam("总数量")
+    private Double qty;
+    @ApiParam("已收货数量")
+    private Double recQty;
+    @ApiParam("最早收货时间")
+    private String earliestReceTime;
+    @ApiParam("最晚收货时间")
+    private String latestReceTime;
+    @ApiParam("供应商号码")
+    private String vendorNo;
+    @ApiParam("物料")
+    private String partNo;
+    @ApiParam("收货状态")
+    private String receiveStatus;
+
+    public WmsPoAsnRecvModel(String orderNo,String dock,String vendorNo,String prodCfgTypeCode, String prodCfgTypeName,String planDate,String planTime,Double qty,Double recQty){
+        this.orderNo = orderNo;
+        this.dock = dock;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.qty = qty;
+        this.recQty = recQty;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.prodCfgTypeName = prodCfgTypeName;
+        this.vendorNo = vendorNo;
+
+    }
+    public WmsPoAsnRecvModel(String orderNo,String dock,String planDate,String planTime){
+        this.orderNo = orderNo;
+        this.dock = dock;
+        this.planDate = planDate;
+        this.planTime = planTime;
+    }
+    public WmsPoAsnRecvModel(){}
+
+    @Override
+    public int compareTo(WmsPoAsnRecvModel o) {
+        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : 0;
+    }
+
+    public static LocalTime getLocalTime(String planTime){
+        LocalTime time = null;
+        try {
+            time = LocalTime.parse(planTime);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return time;
+    }
+}

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description : 产线信息管理(工作中心)
@@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter;
  * @CreateDate : 2019-06-19 16:20
  * @Modify:
  **/
+@Repository
 public interface WmsWorkCenterRepository extends BaseRepository<WmsWorkCenter, Long> {
 
 }

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description : 产线(工作中心)-存储区信息管理
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone;
  * @CreateDate : 2019-06-20 14:55
  * @Modify:
  **/
+@Repository
 public interface WmsWorkCenterZoneRepository extends BaseRepository<WmsWorkCenterZone, Long> {
 }