Merge branch 'dev' into test

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

@@ -2647,4 +2647,30 @@ public class WmsEnumUtil {
             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/common/ExportDataModel.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.common;
 
 import lombok.Data;
+import java.util.LinkedHashMap;
 
 /**
  * @Description :
@@ -16,4 +17,6 @@ public class ExportDataModel {
 
     private String exportData;
 
+    private LinkedHashMap<String, String> exportCol;
+
 }

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

@@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
-import java.util.List;
 
 /**
  * @Description : ASN订单明细信息
@@ -43,7 +42,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/WmsDocFgDetail.java

@@ -0,0 +1,119 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS_产品报工明细信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-06-26 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOC_FG_DETAIL")
+@Api("WMS_产品报工明细信息")
+public class WmsDocFgDetail extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name="WO_NO")
+    @ApiParam("ERP工单号")
+    public String woNo;
+
+    @Column(name="LINE_NO")
+    @ApiParam("生产线")
+    public String lineNo;
+
+    @Column(name="COMMIT_TIME")
+    @ApiParam("提交日期")
+    public String commitTime;
+
+    @Column(name="MFG_LOG_NO")
+    @ApiParam("生产批次")
+    public String mfgLocNo;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="PART_NO")
+    @ApiParam(value = "物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("单位")
+    public String partNameRdd;
+
+    @Column(name="BOM_UPDATE")
+    @ApiParam("BOM切换标识")
+    public String bomUpdate;
+
+    @Column(name="QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="IN_AREA_NO")
+    @ApiParam("入库ERP库存地")
+    public String inAreaNo;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("子物料号")
+    public String itemPartNo;
+
+    @Column(name="ITEM_PART_NAME")
+    @ApiParam("子料物料描述")
+    public String itemPartName;
+
+    @Column(name="ITEM_UNIT")
+    @ApiParam("子计量单位")
+    public String itemUnit;
+
+    @Column(name="ITEM_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "子用量", example = "0")
+    public Double itemQty;
+
+    @Column(name="OUT_AREA_NO")
+    @ApiParam("消耗ERP库存地")
+    public String outAreaNo;
+
+    @Column(name="SID")
+    @ApiParam("SID")
+    public String sid;
+
+    /**
+     * 状态:10=新建,20=已处理,30=处理出错
+     */
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    /**
+     * 数据来源:ZMMES=知明MES,TBMES=MES接口
+     */
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+}

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

@@ -39,7 +39,7 @@ public class WmsDocMovementSn 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/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/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,10 +151,6 @@ 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;
@@ -223,6 +219,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/WmsPoAsnRecvModel.java

@@ -69,7 +69,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
 
     @Override
     public int compareTo(WmsPoAsnRecvModel o) {
-        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : 0;
+        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : -1;
     }
 
     public static LocalTime getLocalTime(String planTime){

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasCustomer;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocFgDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :WMS_产品报工明细信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-06-26 16:03
+ * @Modify:
+ **/
+@Repository
+public interface WmsDocFgDetailRepository extends BaseRepository<WmsDocFgDetail,Long> {
+}