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/CommonEnumUtil.java

@@ -884,4 +884,9 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
+    // 数据有效的静态常量
+    public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue();
+    // 数据未删除的静态常量
+    public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 }

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

@@ -1761,6 +1761,15 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static DATA_OBJ_TYPE codeOf(Integer val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -2582,4 +2591,86 @@ 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;
+        }
+    }
+
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_LEVEL_STATUS {
+        LOW("LOW", "低于最低库存"),
+        HIGH("HIGH", "高于最高库存"),
+        NORMAL("NORMAL", "安全库存");
+
+        private String value;
+        private String description;
+
+        STOCK_LEVEL_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -16,19 +17,55 @@ import java.io.Serializable;
 public class WmsTaskInfoModel implements Serializable {
     @ApiParam("任务单号")
     public String orderNo;
-
-    @ApiParam("关联单号")
-    public String refSrc;
-
+    @Column(name = "TRANS_TYPE_CODE")
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
     @ApiParam(value = "任务状态")
-    public String taskStatus;
+    public Integer taskStatus;
 
     @ApiParam("作业类型名称")
     public String opTypeName;
 
+    @ApiParam(value = "交易类型代码")
+    private String transTypeCode;
+
+    @ApiParam("关联单号")
+    public String refSrc;
+
     @ApiParam(value = "关联单据类型")
     private String refType;
+
+    @Column(name = "ZDATE")
+    @ApiParam(value = "计划日期")
+    private String zdate;
+
+    @Column(name = "ZTIME")
+    @ApiParam(value = "计划时间")
+    private String ztime;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    public WmsTaskInfoModel() {
+    }
+
+    public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
+                            String refType, String zdate, String ztime, String custNo, String vendorNo) {
+        this.orderNo = orderNo;
+        this.taskStatus = taskStatus;
+        this.opTypeName = opTypeName;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+        this.refType = refType;
+        this.zdate = zdate;
+        this.ztime = ztime;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+    }
 }

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

@@ -34,7 +34,7 @@ public class SapBase {
     private String rechms;
 
     @ApiParam(value = "同步标志", example = "-1")
-    private String synflg = "Y";
+    private String synflg = "N";
 
     @ApiParam(value = "同步日期", example = "-1")
     private String synymd;
@@ -43,7 +43,7 @@ public class SapBase {
     private String synhms;
 
     @ApiParam(value = "处理标志", example = "-1")
-    private String actflg = "Y";
+    private String actflg = "N";
 
     @ApiParam(value = "处理日期", example = "-1")
     private String actymd;
@@ -52,7 +52,7 @@ public class SapBase {
     private String acthms ="00:00:00";
 
     @ApiParam(value = "状态标志", example = "-1")
-    private String staflg = "Y";
+    private String staflg = "N";
 
     @ApiParam(value = "顺序号", example = "-1")
     private Integer seq = 1;
@@ -62,11 +62,13 @@ public class SapBase {
 
     public String getSynymdTime() {
         SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD");
-        return format.format(new Date());
+        //format.format(new Date())
+        return "";
     }
 
     public String getSynhmsTime() {
         SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
-        return format.format(new Date());
+        //format.format(new Date())
+        return "";
     }
 }

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

@@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
-import java.util.List;
 
 /**
  * @Description : ASN订单明细信息
@@ -45,7 +44,7 @@ public class WmsASNMasterDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -35,7 +35,7 @@ public class WmsCSAdjustRange extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name="IS_ADJUST")
     @ApiParam(value = "调整标识", example = "1")
@@ -62,7 +62,7 @@ public class WmsCSAdjustRange extends BaseBean {
     public String unit;
 
     public WmsCSAdjustRange(){}
-    public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
+    public WmsCSAdjustRange(String orderNo, String item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
         this.orderNo = orderNo;
         this.item = item;
         this.isAdjust = isAdjust;

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

@@ -39,7 +39,7 @@ public class WmsCSOrderDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -34,7 +34,7 @@ public class WmsCSRange extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "PART_NO")
     @ApiParam("物料编码")

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

@@ -34,7 +34,11 @@ public class WmsDataAuth extends BaseBean {
 
     @Column(name = "DATA_OBJ")
     @ApiParam(value = "数据对象")
-    private String dataObj;
+    private Integer dataObj;
+
+    public String getDataObjString() {
+        return String.valueOf(dataObj);
+    }
 
     @Column(name = "DATA_OBJ_VALUE")
     @ApiParam(value = "数据对象值")

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

@@ -41,7 +41,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :物料实体
@@ -126,4 +127,22 @@ public class WmsPart extends BaseBean {
     @Column(name="OUT_CLOSE_FLAG")
     @ApiParam("項目结算标识")
     private String outCloseFlag;
+
+    @Transient
+    @ApiParam("总数量")
+    private Double qty;
+
+    @Transient
+    @ApiParam("库存水平")
+    private String stockLevelStatus;
+
+    public WmsPart(){}
+
+    public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty){
+        this.partNo = partNo;
+        this.partName = partName;
+        this.max = maxQty;
+        this.min = minQty;
+        this.qty = cqty;
+    }
 }

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

@@ -39,7 +39,7 @@ public class WmsQCDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -35,7 +35,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     /**
      * 状态:1=创建,10=已处理

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

@@ -151,6 +151,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "客户条码")
     private String custSn;
 
+    @Column(name = "ERP_ZONE_NO")
+    @ApiParam(value = "ERP库存地")
+    public String erpZoneNo;
+
     @ApiParam(value = "仓库名称")
     @Transient
     public String whNameRdd;
@@ -219,6 +223,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "ERP库存地集合")
     public List<String> erpZoneNoList;
 
+    @Transient
+    @ApiParam(value = "ERP库存地")
+    public String erpZoneNo;
+
     public WmsStockSn(){}
 
 

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.util.List;
 
 /**
@@ -23,7 +22,7 @@ public class WmsDataAuthModel extends BaseBean {
     private String roleCode;
 
     @ApiParam("数据对象")
-    private String dataObj;
+    private Integer dataObj;
 
     @ApiParam("数据对象值")
     private String dataObjValue;

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 : -1;
+    }
+
+    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/WmsBomTotalRepository.java

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsBomTotal;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by Administrator on 2019/6/25.
+ */
+@Repository
+public interface WmsBomTotalRepository extends BaseRepository<WmsBomTotal,Long> {
+}

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> {
 }

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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.repository;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,4 +16,11 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WmsZonesRepository extends BaseRepository<WmsZones ,Long> {
 
+    /**
+     * 根据工厂代码和存储编号查询存储区信息
+     * @param organizeCode 工厂代码
+     * @param zoneNo 存储区编号
+     * @return 存储区信息
+     */
+    WmsZones getFirstByOrganizeCodeAndZoneNo(String organizeCode, String zoneNo);
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -21,7 +21,6 @@ import java.util.stream.Collectors;
  * @Reference :
  * @Author : silliter.yuan
  * @CreateDate : 2018-10-31 10:45
- * @CreateDate : 2019-06-25
  * @Modify:
  **/
 public class WmsHqlPack {
@@ -1466,9 +1465,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
-        DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result);
-//        String data = String.join(",", roleIds);
+        DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result);
         DdlPreparedPack.getInPackList(roleIds, "roleCode", result);
         getStringBuilderPack(dataAuth, result);
         return result;
@@ -1615,8 +1612,8 @@ public class WmsHqlPack {
         if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())) {
             DdlPreparedPack.getStringEqualPack(wmsDataAuth.getRoleCode(), "roleCode", result);
         }
-        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())) {
-            DdlPreparedPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
+        if (wmsDataAuth.getDataObj() != null && wmsDataAuth.getDataObj().intValue() != 0) {
+            DdlPreparedPack.getNumEqualPack(wmsDataAuth.getDataObj(), "dataObj", result);
         }
         if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) {
             DdlPreparedPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result);
@@ -1932,8 +1929,10 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
-        DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
+        if(wmsProdCfgType != null){
+            DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
+            DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
 //        getStringBuilderPack(wmsProdCfgType, result);