Merge branch 'test'

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -84,6 +84,7 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result);
         getStringBuilderPack(mesWorkCell, result);
 
         return result;

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

@@ -247,7 +247,7 @@ public class AndonEnumUtil {
         EQUIP("EQUMENT_ALARM","设备"),
         PROCESS("ROUTING_ALARM","工艺"),
         CHECK("OTHER_ALARM","其他"),
-        FIX_ERROR("FIX_ERROR", "设备故障");
+        FIX_ERROR("FIX_ERROR", "自动报警");
 
         private String value;
         private String description;

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

@@ -193,10 +193,10 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_DETAILS_STATUS {
-        CREATE(10, "N", "创建"),
-        RECEIPTED(20, "R", "已完成"),
-        CANCEL(30, "C", "行取消"),
-        PRINTED(40, "C", "已打印");
+        CREATE(10, "CREATE", "创建"),
+        RECEIPTED(20, "FINISHED", "已完成"),
+        CANCEL(30, "CANCLE", "行取消"),
+        PRINTED(40, "PRINTED", "已打印");
 
         private int value;
         private String code;
@@ -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;
+        }
     }
 
     /**
@@ -2547,4 +2556,95 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
-}
+
+
+    /**
+     * 库存交易表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_TRANS_QUAN_STATUS {
+        CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败");
+
+        private int value;
+        private String description;
+
+        WMS_TRANS_QUAN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 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-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

@@ -23,7 +23,7 @@ public class SapBase {
     private String actusr = "导入";
 
     @ApiParam(value = "SID", example = "-1")
-    private String sid = ( Math.abs(new Random().nextInt())+ "");
+    private String sid = "";
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "接收数据日期", example = "-1")

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

@@ -52,7 +52,7 @@ public class SapCyco extends SapBase{
     @AnnoOutputColumn
     private String zxm;
 
-    @ApiParam(value = "库存帐冻结标识")
+    @ApiParam(value = "库存账冻结标志")
     @AnnoOutputColumn
     private String zdjbs;
 

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

@@ -120,7 +120,7 @@ public class WmsASNMasterDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient int lockVersion;
+    public transient Integer lockVersion;
 
     @Transient
     @ApiParam("实收数量")

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -42,9 +43,33 @@ public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("列表信息")
     public List<String> informations;
+    public List<String> getInformations(){
+        if(informations == null){
+            informations= new ArrayList<>();
+        }
+        return informations;
+    }
+    public void setInformation(List<String> list){
+        if(list == null){
+            list = new ArrayList<>();
+        }
+        informations = list;
+    }
 
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
+    public List<WmsOptionModel> getOptions(){
+        if(options == null){
+            options = new ArrayList<>();
+        }
+        return options;
+    }
+    public void setOptions(List<WmsOptionModel> opt){
+        if(opt == null){
+            opt = new ArrayList<>();
+        }
+        options = opt;
+    }
 
     @ApiParam("选中的明细数据")
     public Obj details;

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

@@ -60,4 +60,17 @@ public class WmsCSAdjustRange extends BaseBean {
     @Transient
     @ApiParam("单位")
     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) {
+        this.orderNo = orderNo;
+        this.item = item;
+        this.isAdjust = isAdjust;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.unit = unit;
+        this.organizeCode = organizeCode;
+    }
 }

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

@@ -209,5 +209,5 @@ public class WmsDocMovementDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient int lockVersion;
+    public transient Integer lockVersion;
 }

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 String item;
+    public Integer item;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")

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

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value="线边库物料信息",description = "线边库物料信息")
+@Deprecated
 public class WmsLineLocatePart extends BaseBean {
 
     @Column(name="LOCATE_NO")

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

@@ -30,125 +30,130 @@ import javax.persistence.*;
 })
 @Api("PO订单明细信息")
 public class WmsPOMasterDetails extends BaseBean {
+
+    private static final long serialVersionUID = -677572691809622129L;
+
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
-    public String partNo;
+    private String partNo;
 
-    @Column(name = "BOX_QTY" )
+    @Column(name = "BOX_QTY")
     @ColumnDefault("0")
-    @ApiParam(value ="箱数", example = "0")
-    public Integer boxQty;
+    @ApiParam(value = "箱数", example = "0")
+    private Integer boxQty;
 
     @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
-    public String partNameRdd;
+    private String partNameRdd;
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    private Integer item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
+    private Double qty;
 
-    public Double getQty(){ return this.qty == null ? 0 : this.qty; }
+    // 不可能为 null 值
+    // Rock.Yu at 2019-06-22 20:03
+    //private Double getQty(){ return this.qty == null ? new Double(0) : this.qty; }
 
     @Column(name = "UNIT")
     @ApiParam("单位")
-    public String unit;
+    private String unit;
 
     @Column(name = "ORDER_NO")
     @ApiParam("订单号")
-    public String orderNo;
+    private String orderNo;
 
     @Column(name = "PRINT_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "条码打印数量", example = "0")
-    public Double printQty;
+    private Double printQty;
 
-    public Double getPrintQty(){ return this.printQty == null ? 0 : this.printQty; }
+    //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
 
     @Column(name = "RC_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
-    public Double rcQty;
+    private Double rcQty;
 
-    public Double getRcQty(){ return this.rcQty == null ? 0 : this.rcQty; }
+    //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; }
 
     @Column(name = "PASS_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "质检合格数量", example = "0")
-    public Double passQty;
+    private Double passQty;
 
-    public Double getPassQty(){ return this.passQty == null ? 0 : this.passQty; }
+    //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; }
 
     @Column(name = "NG_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "质检不合格数量", example = "0")
-    public Double ngQty;
+    private Double ngQty;
 
-    public Double getNgQty(){ return this.ngQty == null ? 0 : this.ngQty; }
+    //private Double getNgQty(){ return this.ngQty == null ? new Double(0) : this.ngQty; }
 
     @Column(name = "PLAN_DATE")
     @ApiParam("计划交货日期")
-    public String planDate;
+    private String planDate;
 
     @Column(name = "PLAN_TIME")
     @ApiParam("计划交货时间")
-    public String planTime;
+    private String planTime;
 
     @Column(name = "ERP_AREA_NO")
     @ApiParam("默认收货库存地")
-    public String erpAreaNo;
+    private String erpAreaNo;
 
     /**
      * 状态:10 N=正常,20 C=行取消
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam("状态")
-    public Integer itemStatus;
+    private Integer itemStatus;
 
     @Column(name = "SNP")
     @ApiParam("标准包装")
-    public Double snp;
+    private Double snp;
 
     /**
      * 是否免费:0=计费,1=免费
      */
     @Column(name = "IS_FREE")
     @ApiParam(value = "是否免费", example = "1")
-    public Integer isFree;
+    private Integer isFree;
 
     @Transient
     @ApiParam(value = "散件收货输入数量", example = "0")
-    public Double inputRcQty;
+    private Double inputRcQty;
 
     @Transient
     @ApiParam(value = "供应商批次")
-    public String dateCode;
+    private String dateCode;
 
     @Transient
     @ApiParam("前端表格编辑使用")
-    public Boolean isSet = false;
+    private Boolean isSet = false;
 
     @Transient
     @ApiParam("供应商批次字段是否可编辑")
-    public Boolean isDateCodeEdit = true;
+    private Boolean isDateCodeEdit = true;
 
-    public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
+    //private Double getInputRcQty(){ return this.inputRcQty == null ? new Double(0) : this.inputRcQty; }
 
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient int lockVersion;
+    private transient Integer lockVersion;
 
     @Transient
     @ApiParam("PO条码总箱数")
-    public Integer totalBoxes;
+    private Integer totalBoxes;
 
     @Transient
     @ApiParam("差异")
-    public Double difference;
+    private Double difference;
 
 }

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

@@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient int lockVersion;
+    public transient Integer lockVersion;
 }

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

@@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description : 库存条码信息
@@ -150,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;
@@ -202,8 +207,25 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "工厂名称")
     public String organizeName;
 
+    @Transient
+    @ApiParam(value = "物料数量总和")
+    public Double sumPartQty;
+
+    @Transient
+    @ApiParam(value = "条码数量总和")
+    public Long snCount;
+
+    @Transient
+    @ApiParam(value = "物料编码集合")
+    public List<String> partNoList;
+
+    @Transient
+    @ApiParam(value = "ERP库存地集合")
+    public List<String> erpZoneNoList;
+
     public WmsStockSn(){}
 
+
     public WmsStockSn(String partNo){
         this.partNo = partNo;
     }
@@ -213,4 +235,10 @@ public class WmsStockSn extends BaseBean {
     }
 
     public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
+
+    public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) {
+        this.snCount = snCount;
+        this.sumPartQty = sumPartQty;
+        this.locateNo = locateNo;
+    }
 }

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

@@ -153,4 +153,37 @@ public class WmsTransQuan extends BaseBean {
     @Transient
     @ApiParam("存储区名称")
     private String zoneName;
+
+    @Transient
+    @ApiParam("库存地代码")
+    private String areaNo;
+
+    public WmsTransQuan(){}
+
+    public WmsTransQuan(String organizeCode,String partNo,String partNameRdd,String transCode,String unit,String whNo,String zoneNo,
+                        Double qty,Double failQty,Double holdQty,Double scrapQty,Double qcQty,Double rinQty,
+                        Double freezeQty,Double consignQty,Double lockQty){
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transCode = transCode;
+        this.unit = unit;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.scrapQty = scrapQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+
+    }
+
+
+    public WmsTransQuan(Integer transStatus){
+        this.transStatus = transStatus;
+    }
 }

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 : 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/WmsBomRepository.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.WmsBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by Administrator on 2019/6/22.
+ */
+@Repository
+public interface WmsBomRepository  extends BaseRepository<WmsBom, Long> {
+}

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

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 /**
 * @Description : 库存条码dao层
 * @Reference :
@@ -21,13 +23,14 @@ public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
 
 
     /**
+     * Rock.Yu at 2019-06-22 11:05
      * 按照存储区代码查询最早批次的物料条码
      * 按照 特殊批次、生产日期、收货日期 优先级从高到低依次排序
      * @return 最早批次的条码
      */
-    @Query(value = "select sn from WmsStockSn " +
-            "where organizeCode=?1 and isValid=?2 and isDeleted=?3 " +
-            "and zoneNo=?4 and partNo=?5 " +
+    @Query(value = "from WmsStockSn " +
+            "where organizeCode=?1 " +
+            "and zoneNo=?2 and partNo=?3 and isValid=?4 and isDeleted=?5 and snStatus=40 " +
             "order by fixLotNo, dateCode, lotNo")
-    WmsStockSn findFirstFifoSNByZoneNo(String organizeCode, int isValid, int isDeleted, String zoneNo, String partNo);
+    List<WmsStockSn> findByFifoSNByZoneNo(String organizeCode, String zoneNo, String partNo, int isValid, int isDeleted);
 }

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

@@ -77,8 +77,14 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
+
+        DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(),
+                wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true);
         getStringBuilderPack(wmsDocMovementDetails, result);
 
         return result;
@@ -1102,6 +1108,34 @@ public class WmsHqlPack {
     }
 
     /**
+     * 条码状态查询报表查询条件
+     * @param wmsStockSn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsStockSnReportByPager(WmsStockSn wmsStockSn) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
+
+        // 物料编码支持多选
+        DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
+
+        getStringBuilderPack(wmsStockSn, result);
+
+        return result;
+    }
+
+    /**
      * 质检单明细信息 查询条件封装
      *
      * @param wmsQCDetails
@@ -1431,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;
@@ -1580,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);
@@ -1739,7 +1771,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue(),
                 WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
+        DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
 
         getStringBuilderPack(wmsCSOrderMaster, result);
@@ -1897,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);
@@ -1930,10 +1964,10 @@ public class WmsHqlPack {
      * @param wmsPart
      * @return
      */
-    public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List<WmsStockSn> partNoList) {
+    public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,String[] parts) {
 
         DdlPackBean packBean = new DdlPackBean();
-        DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()),"partNo",packBean);
+        DdlPreparedPack.getInPackArray(parts,"partNo",packBean);
         DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean);
         getStringBuilderPack(wmsPart, packBean);