Merge remote-tracking branch 'origin/master'

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

@@ -503,27 +503,4 @@ public class CommonEnumUtil {
         }
     }
 
-    /**
-     * 启用或禁用
-     */
-    public enum OPEN_CLOSE {
-        OPEN(1, "启用"),
-        CLOSE(2, "禁用");
-
-        private int value;
-        private String description;
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        OPEN_CLOSE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-    }
 }

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

@@ -10,16 +10,150 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class WmsEnumUtil {
+    /**
+     * PO订单明细信息 是否免费
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_FREE {
+        CHARGING(0, "计费"), GRATIS(1, "免费");
+
+        private int value;
+        private String description;
+
+        private IS_FREE(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订单明细信息 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_DETAILS_STATUS {
+        NORMAL(10, "N", "正常"),
+        ANCEL(20, "C", "行取消");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ORDER_DETAILS_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * PO主表信息 单据来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_ORDER_SRC {
+        MNU(1, "MNU", "手工"),
+        ERP(2, "ERP", "ERP接口");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private PO_ORDER_SRC(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
 
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
     /**
      * PO主表信息 单据类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PO_ORDER_TYPE {
         REG(1, "REG", "原物料采购"),
-        SUB(2, "SUB", "委外采购"),
+        SUB(10, "SUB", "委外采购"),
-        TAR(3, "TAR", "多角贸易采购"),
+        TAR(20, "TAR", "多角贸易采购"),
-        TAP(4, "TAP", "多角代采购");
+        TAP(30, "TAP", "多角代采购");
 
         private int value;
         private String code;
@@ -68,7 +202,7 @@ public class WmsEnumUtil {
      * PO主表信息 状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PO_ORDER_STATUS {
+    public enum ORDER_STATUS {
         CREATE(0, "新建"),
         RECEIPT(10, "收货中"),
         RECEIPT_FINISH(20, "收货完成"),
@@ -80,7 +214,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        private PO_ORDER_STATUS(int value, String description) {
+        private ORDER_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -117,6 +251,7 @@ public class WmsEnumUtil {
     /**
      * 交易状态
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRANS_STATUS {
         CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败");
 
@@ -213,4 +348,124 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * ASN单据类型
+     */
+    public enum ASN_ORDER_TYPE{
+
+        REG("REG","原物料采购"),SUB("SUB","委外采购"),TAR("TAR","多角贸易采购"),TAP("TAP","多角代采购");
+
+        private String value;
+        private String description;
+
+        ASN_ORDER_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * ASN明细表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ASN_MASTER_ORDER_STATUS {
+        NORMAL(1, "N", "正常"),
+        CANCEL(2, "C", "行取消"),
+        RECEIPTED(3, "R", "已收货");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ASN_MASTER_ORDER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 是否已删除
+     */
+    public enum IS_DELETED {
+        DELETED(1, "已删除"), INDELETED(2, "未删除");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        IS_DELETED(int value, String description) {
+            this.value = value;
+            this.description = 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;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -229,7 +229,7 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username);
 
     /**
-     * 更新有效无效状态
+     * 更新启用禁用
      * @return count
      */
     public int updateValidStatusById(ID id,int status,String username);

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -881,10 +881,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int deleteWeaklyByPropertyIn(String propName, Object[] propValues,String username) {
         if(propValues != null && propValues.length > 0){
             String hql = "update " + persistentClass.getName()
-                    + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime  where model."
+                    + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime  where model."
                     + propName + " in(:"+propName+") ";
             Query query = entityManager.createQuery(hql);
-            query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue());
+            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             query.setParameter("modifyUser",username);
             query.setParameter("modifyDatetime",getNowTime(true));
             query.setParameter(propName, Arrays.asList(propValues));
@@ -903,12 +903,12 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int deleteWeaklyByProperties(String[] propName, Object[] propValue,String username) {
         if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) {
             StringBuffer sb = new StringBuffer("update " + persistentClass.getName()
-                    + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 ");
+                    + " model set model.isDeleted = :isDeleted,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where 1=1 ");
             appendQL(sb,propName,propValue);
             Query query = entityManager.createQuery(sb.toString());
             query.setParameter("modifyUser",username);
             query.setParameter("modifyDatetime",getNowTime(true));
-            query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue());
+            query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
 
             setParameter(query,propName,propValue);
 
@@ -934,7 +934,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     /**
-     * 批量弱删除
+     * 批量禁用
      * @return
      */
     @Override
@@ -956,7 +956,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     /**
-     * 批量弱删除
+     * 批量禁用
      * @return
      */
     @Override

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

@@ -36,17 +36,17 @@ public class WmsASNMaster extends BaseBean {
      * 单据类型:REG=原物料采购,
      * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购
      */
-    @Column(name="TYPE")
+    @Column(name="ASN_TYPE")
     @ApiParam("单据类型")
-    public String type;
+    public String asnType;
 
     /**
      * 状态:0=新建,10=收货中,20=收货完成,
      * 30=入库中,40=入库完成,90=已关闭,91=已取消
      */
-    @Column(name="STATUS")
+    @Column(name="ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    public Integer asnStatus;
 
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")

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

@@ -67,13 +67,13 @@ public class WmsASNMasterDetails extends BaseBean {
     /**
      * 状态:N=正常,C=行取消,R=已收货
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer itemStatus;
 
     @Column(name="PACKAGE")
     @ApiParam("包装名称")
-    public String pageAge;
+    public String packAge;
 
     /**
      * 是否免费:0=计费,1=免费

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

@@ -63,4 +63,7 @@ public class WmsCheckFactRecord extends BaseBean {
     @Column(name="CHECK_QTY")
     @ApiParam(value = "抽点数量", example = "0")
     public Double checkQty;
+
+    @ApiParam(value ="供应商全称")
+    private transient String vendorDesc;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :移库单详情实体(用于转储类业务)
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-13 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
+@Api("移库单详情表")
+public class WmsDocMovementDetails extends BaseBean {
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "单号")
+    private String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam(value = "行号", example = "1")
+    private Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @Column(name = "SRC_WH")
+    @ApiParam(value = "发出库仓库")
+    private String srcWh;
+
+
+    @Column(name = "DEST_WH")
+    @ApiParam(value = "接收库仓库")
+    private String destWh;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "需求数量", example = "1")
+    private Double qty;
+
+    @Column(name = "PRINT_QTY")
+    @ApiParam(value = "条码打印数量", example = "1")
+    private Double printQty;
+
+    @Column(name = "FACT_QTY")
+    @ApiParam(value = "操作完成数量", example = "1")
+    private Double factQty;
+
+    @Column(name = "ZDATE")
+    @ApiParam(value = "计划日期")
+    private String zdate;
+
+    @Column(name = "ZTIME")
+    @ApiParam(value = "计划时间")
+    private String ztime;
+
+    @Column(name = "SRC_NO")
+    @ApiParam(value = "源单号")
+    private String srcNo;
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    private Integer itemStatus;
+
+    /**
+     * 是否免费:0=计费,1=免费
+     */
+    @Column(name = "IS_FREE")
+    @ApiParam(value = "是否免费", example = "1")
+    public Integer isFree;
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "操作原因")
+    private String remark;
+
+    @Column(name = "PICK_QTY")
+    @ApiParam(value = "已配数量", example = "1")
+    private Double pickQty;
+
+    @Column(name = "OUT_QTY")
+    @ApiParam(value = "已提交数量", example = "1")
+    private Double outQty;
+
+    @Column(name = "INLINE_QTY")
+    @ApiParam(value = "已上线数量", example = "1")
+    private Double inlineQty;
+
+    @Column(name = "REJECT_QTY")
+    @ApiParam(value = "退料数量", example = "1")
+    private Double rejectQty;
+
+    @Column(name = "REJECT_POST_QTY")
+    @ApiParam(value = "退料提交数量", example = "1")
+    private Double rejectPostQty;
+}

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

@@ -0,0 +1,102 @@
+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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :移库单实体(用于转储类业务)
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-13 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_DOC_MOVEMENT_MASTER")
+@Api("移库单表")
+public class WmsDocMovementMaster extends BaseBean {
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "移库单单号")
+    private String orderNo;
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    public String moveType;
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam(value = "业务类型", example = "1")
+    public Integer busiType;
+
+    /**
+     * 状态:0=新建,10=处理中
+     * ,20=已完成,90=已关闭,91=已取消
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    @Column(name = "CUSTOMER_NO")
+    @ApiParam(value = "客户编号")
+    private String customerNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "VERSION")
+    @ApiParam(value = "版本", example = "1")
+    private Integer version;
+
+    /**
+     * 单据类型::1=工单配料
+     */
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
+    private String refType;
+
+    @Column(name = "REF_NO")
+    @ApiParam(value = "关联单据")
+    private String refNo;
+
+    @Column(name = "ERP_SRC_NO")
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+    /**
+     * 单据类型::1=工单配料
+     */
+    @Column(name = "ORDER_TYPE")
+    @ApiParam(value = "单据类型")
+    private String orderType;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量", example = "1")
+    private Double qty;
+
+}

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

@@ -57,16 +57,19 @@ public class WmsFGInStock extends BaseBean {
     public String sn;
 
     /**
-     * 状态:0=新建,10=已处理,20=处理出错
+     * 状态：1=新建,10=已处理,20=处理出错
      */
-    @Column(name="STATUS")
+    @Column(name="ORDER_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer orderStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
     public String reMark;
 
+    /**
+     * 来源：MNU=手工,MES=MES接口
+     */
     @Column(name="SRC")
     @ApiParam("单据来源")
     public String src;
@@ -91,7 +94,7 @@ public class WmsFGInStock extends BaseBean {
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
-    @Column(name="LOT_NO")
+    @Column(name="MFG_LOG_NO")
     @ApiParam("生产批次")
-    public String lotNo;
+    public String mfgLogNo;
 }

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

@@ -1,120 +0,0 @@
-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.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : 库存移动单明细信息
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-06 15:58
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_MOVEMENT_DETAILS")
-@Api("库存移动单明细信息")
-public class WmsMoveMentDetails extends BaseBean {
-
-    @Column(name="ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    @Column(name="ITEM")
-    @ApiParam("行号")
-    public String item;
-
-    @Column(name="PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-
-    @Column(name="PART_NAME_RDD")
-    @ApiParam("物料名称")
-    public String partNameRdd;
-
-    @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-
-    @Column(name="UNIT")
-    @ApiParam("单位")
-    public String unit;
-
-    @Column(name="SRC_WH")
-    @ApiParam("发出库仓库")
-    public String srcWh;
-
-    @Column(name="DEST_WH")
-    @ApiParam("接收库仓库")
-    public String destWh;
-
-    @Column(name="PRINT_QTY")
-    @ApiParam("条码打印数量")
-    public String printQty;
-
-    @Column(name="FACT_QTY")
-    @ApiParam("操作完成数量")
-    public String factQty;
-
-    @Column(name="ZDATE")
-    @ApiParam("计划交货日期")
-    public String zDate;
-
-    @Column(name="ZTIME")
-    @ApiParam("计划交货时间")
-    public String zTime;
-
-    @Column(name="SRC_NO")
-    @ApiParam("源单号")
-    public String srcNo;
-
-    /**
-     * 状态:N=正常,C=行取消
-     */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "1")
-    public Integer status;
-
-    @Column(name="REMARK")
-    @ApiParam("备注")
-    public String reMark;
-
-    /**
-     * 是否免费:0=计费,1=免费
-     */
-    @Column(name="IS_FREE")
-    @ApiParam(value = "是否免费", example = "1")
-    public Integer isFree;
-
-    @Column(name="PICK_QTY")
-    @ApiParam(value = "已配数量", example = "0")
-    public Double pickQty;
-
-    @Column(name="OUT_QTY")
-    @ApiParam(value = "已提交数量", example = "0")
-    public Double outQty;
-
-    @Column(name="INLINE_QTY")
-    @ApiParam(value = "已上线数量", example = "0")
-    public Double inLineQty;
-
-    @Column(name="REJECT_QTY")
-    @ApiParam(value = "退料数量", example = "0")
-    public Double rejectQty;
-
-    @Column(name="REJECT_POST_QTY")
-    @ApiParam(value = "退料提交数量", example = "0")
-    public Double rejectPostQty;
-}

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

@@ -1,101 +0,0 @@
-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.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : 库存移动单主表信息(用于转储类业务)
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-06 15:58
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_MOVEMENT_MASTER")
-@Api("库存移动单主表信息")
-public class WmsMoveMentMaster extends BaseBean {
-
-    @Column(name="ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    /**
-     * 移动类型:IN=入库,OUT=出库,MOVE=移库
-     */
-    @Column(name="MOVE_TYPE")
-    @ApiParam("移动类型")
-    public String moveType;
-
-    /**
-     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
-     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
-     * MI=移库入库,MO=移库出库,SO=发运
-     */
-    @Column(name="TYPE")
-    @ApiParam("业务类型")
-    public String type;
-
-    /**
-     * 状态:0=新建,10=处理中
-     * ,20=已完成,90=已关闭,91=已取消
-     */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer status;
-
-    @Column(name="CUSTOMER_NO")
-    @ApiParam("客户编号")
-    public String customerNo;
-
-    @Column(name="VENDOR_NO")
-    @ApiParam("供应商编号")
-    public String vendorNo;
-
-    @Column(name="VERSION")
-    @ApiParam("版本")
-    public String version;
-
-    @Column(name="SRC")
-    @ApiParam("单据来源")
-    public String src;
-
-    @Column(name="SRC_NO")
-    @ApiParam("关联单据")
-    public String srcNo;
-
-    @Column(name="ERP_ORDERNO")
-    @ApiParam("ERP单号")
-    public String erpOrderNo;
-
-    /**
-     * 单据类型:WO=工单配料
-     */
-    @Column(name="ORDER_TYPE")
-    @ApiParam("单据类型")
-    public String orderType;
-
-    @Column(name="PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-
-    @Column(name="PART_NAME_RDD")
-    @ApiParam("物料名称")
-    public String partNameRdd;
-
-    @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-}

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

@@ -33,20 +33,20 @@ public class WmsPOMaster extends BaseBean {
     public String orderNo;
 
     /**
-     * 单据类型:1 REG=原物料采购,
+     * 单据类型:
-     * 2 SUB=委外采购,3 TAR=多角贸易采购,4 TAP=多角代采购
+     * 1 REG=原物料采购,10 SUB=委外采购,20 TAR=多角贸易采购,30 TAP=多角代采购
      */
-    @Column(name="TYPE")
+    @Column(name="PO_TYPE")
     @ApiParam("单据类型")
-    public String type;
+    public String poType;
 
     /**
-     * 状态:0=新建,10=收货中,20=收货完成,
+     * 状态:1=新建,10=收货中,20=收货完成,
      * 30=入库中,40=入库完成,90=已关闭,91=已取消
      */
-    @Column(name="STATUS")
+    @Column(name="PO_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer poStatus;
 
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")
@@ -56,6 +56,9 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("版本")
     public String version;
 
+    /**
+     * 单据来源：1 MNU=手工,2 ERP=ERP接口
+     */
     @Column(name="SRC")
     @ApiParam("单据来源")
     public String src;

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

@@ -49,20 +49,20 @@ public class WmsPOMasterDetails extends BaseBean {
     public Double qty;
 
     @Column(name="PRINT_QTY")
-    @ApiParam("条码打印数量")
+    @ApiParam(value = "条码打印数量", example = "0")
-    public String printQty;
+    public Double printQty;
 
     @Column(name="RC_QTY")
-    @ApiParam("收货数量")
+    @ApiParam(value = "收货数量", example = "0")
-    public String rcQty;
+    public Double rcQty;
 
     @Column(name="PASS_QTY")
-    @ApiParam("质检合格数量")
+    @ApiParam(value = "质检合格数量", example = "0")
-    public String passQty;
+    public Double passQty;
 
     @Column(name="NG_QTY")
-    @ApiParam("质检不合格数量")
+    @ApiParam(value = "质检不合格数量", example = "0")
-    public String ngQty;
+    public Double ngQty;
 
     @Column(name="UNIT")
     @ApiParam("单位")
@@ -81,11 +81,11 @@ public class WmsPOMasterDetails extends BaseBean {
     public String whNo;
 
     /**
-     * 状态:N=正常,C=行取消
+     * 状态:10 N=正常,20 C=行取消
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam("状态")
-    public String status;
+    public String itemStatus;
 
     @Column(name="SNP")
     @ApiParam("标准包装")

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

@@ -53,11 +53,11 @@ public class WmsShopping extends BaseBean {
     public String sn;
 
     /**
-     * 状态:0=新建,10=已处理,20=处理出错
+     * 状态:10=新建,20=已处理,30=处理出错
      */
-    @Column(name="STATUS")
+    @Column(name="ORDER_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "10")
-    public Integer status;
+    public Integer orderStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
@@ -74,4 +74,7 @@ public class WmsShopping extends BaseBean {
     @Column(name="SHIPPING_FLAG")
     @ApiParam("特殊发货标志")
     public String shippingFlag;
+
+    @ApiParam(value ="客户简称")
+    private transient String custName;
 }

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

@@ -45,9 +45,9 @@ public class WmsTaskInfo extends BaseBean {
     public String reMark;
 
     /**
-     * 状态:0=创建,5=待处理,10=已处理
+     * 状态:1=创建,10=待处理,20=已处理
      */
-    @Column(name="STATUS")
+    @Column(name="TASK_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer taskStatus;
 }

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

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface BasCustomerRepositry extends BaseRepository<BasCustomer,Long> {
+public interface BasCustomerRepository extends BaseRepository<BasCustomer,Long> {
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCheckFactRecord;
+import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan;
+
+/**
+ * @Description : 抽点记录表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-13 15:38
+ * @Modify:
+ **/
+public interface WmsCheckFactRecordRepository extends BaseRepository<WmsCheckFactRecord, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.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.WmsDocMovementDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description :库存移动单详情表的方法接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-13 10:19
+* @Modify:
+**/
+@Repository
+public interface WmsDocMovementDetailsRepository extends BaseRepository<WmsDocMovementDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.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.WmsDocMovementMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description :库存移动单主表的方法接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-13 10:19
+* @Modify:
+**/
+@Repository
+public interface WmsDocMovementMasterRepository extends BaseRepository<WmsDocMovementMaster, Long> {
+}

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

@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMentDetails;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description : 对象持久层仓用方法控制
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-06 9:47
- * @Modify:
- **/
-@Repository
-public interface WmsMoveMentDetailsRepository extends BaseRepository<WmsMoveMentDetails, Long> {
-}

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

@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMentMaster;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description : 对象持久层仓用方法控制
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-06 9:47
- * @Modify:
- **/
-@Repository
-public interface WmsMoveMentMasterRepository extends BaseRepository<WmsMoveMentMaster, Long> {
-}

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

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface WmsShippingFlagRepositry extends BaseRepository<WmsShippingFlag, Long> {
+public interface WmsShippingFlagRepository extends BaseRepository<WmsShippingFlag, Long> {
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.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.WmsTaskInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(作业任务信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-13 15:53
+ * @Modify:
+ **/
+@Repository
+public interface WmsTaskInfoRepository extends BaseRepository<WmsTaskInfo, Long> {
+}

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

@@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface WmsZonesRepositry extends BaseRepository<WmsZones ,Long> {
+public interface WmsZonesRepository extends BaseRepository<WmsZones ,Long> {
 
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 
@@ -11,7 +12,60 @@ import cn.estsh.i3plus.pojo.wms.bean.*;
  * @Modify:
  **/
 public class WmsHqlPack {
+    /**
+     * PO订单明细表 分页查询
+     *
+     * @param wmsPOMasterDetails
+     * @return
+     */
+    public static String packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getItem(), "item", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result);
+
+        return result.toString();
+    }
+
+    /**
+     * 库存移动单详情查询封装
+     *
+     * @param wmsDocMovementDetails
+     * @return
+     */
+    public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrganizeCode(), "organizeCode", result);
+
+        return result.toString();
+    }
+    /**
+     * 库存移动单查询封装
+     *
+     * @param wmsDocMovementMaster
+     * @return
+     */
+    public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
+        StringBuffer result = new StringBuffer();
 
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsDocMovementMaster.getMoveType(), "moveType", result);
+        HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result);
+        HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result);
+        HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+        HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result);
+
+        return result.toString();
+    }
     /**
      * PO订单主表信息 分页查询
      *
@@ -23,11 +77,12 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getStringLikerPack(wmsPOMaster.getType(), "type", result);
+        HqlPack.getStringLikerPack(wmsPOMaster.getPoType(), "poType", result);
-        HqlPack.getNumEqualPack(wmsPOMaster.getStatus(), "status", result);
+        HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
         HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result);
 
         return result.toString();
     }
@@ -48,6 +103,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result);
         HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true);
         HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wmsRoutingDetail.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -66,6 +122,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsRoutingAssign.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result);
         HqlPack.timeBuilder(wmsRoutingAssign.getCreateDateTimeStart(), wmsRoutingAssign.getCreateDateTimeEnd(), "createDatetime", result, true);
+        HqlPack.getStringEqualPack(wmsRoutingAssign.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -82,6 +139,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result);
         HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
         HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -100,6 +158,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPart.getAbc(), "abc", result);
         HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result);
         HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result);
+        HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result);
         return result.toString();
     }
 
@@ -205,7 +264,6 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsObject.getTableName(), "tableName", result);
         // 自定义业务拦截
         HqlPack.getStringEqualPack(wmsObject.getBizIntercept(), "bizIntercept", result);
-
         return result.toString();
     }
 
@@ -237,7 +295,6 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
-
         return result.toString();
     }
 
@@ -254,7 +311,6 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
         HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
         HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
-
         return result.toString();
     }
 
@@ -270,6 +326,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result);
         HqlPack.getStringLikerPack(wareHouse.getName(), "name", result);
         HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -288,10 +346,12 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
         HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
+        HqlPack.getStringEqualPack(basVendor.getOrganizeCode(), "organizeCode", result);
         if (basVendor.getIsAsn() != null) {
             HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result);
         }
         HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -310,6 +370,8 @@ public class WmsHqlPack {
         }
         HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result);
         HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result);
+        HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -324,6 +386,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wareHouse.getName(), "name", result);
         HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result);
         HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -341,13 +404,15 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result);
         HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
     public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+        HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
-        HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
+        HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
 
@@ -407,4 +472,154 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result);
         return result.toString();
     }
+
+    /**
+     * ASN订单分页查询条件
+     * @param wmsASNMaster
+     * @return
+     */
+    public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(),"type",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(),"status",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(),"vendorNo",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getVersion(),"version",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getSrc(),"src",result);
+        HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result);
+        //有效性
+        HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
+        HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result);
+        return result.toString();
+    }
+
+    /**
+     * 产品发运信息 查询条件封装
+     *
+     * @param wmsShopping
+     * @return
+     */
+    public static String packHqlWmsShipping(WmsShopping wmsShopping) {
+        StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(wmsShopping.getIsValid(), "isValid", result);
+        //发运单号
+        HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
+        //客户编码
+        HqlPack.getStringLikerPack(wmsShopping.getCustNo(), "custNo", result);
+        //条码
+        HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result);
+        //发运状态
+        HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result);
+        return result.toString();
+    }
+
+    /**
+     * 产品发运信息 查询条件封装
+     *
+     * @param wmsCheckFactRecord
+     * @return
+     */
+    public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) {
+        StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(wmsCheckFactRecord.getIsValid(), "isValid", result);
+        //采购单号
+        HqlPack.getStringLikerPack(wmsCheckFactRecord.getPoNo(), "poNo", result);
+        //ASN单号
+        HqlPack.getStringLikerPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result);
+        //条码
+        HqlPack.getStringLikerPack(wmsCheckFactRecord.getSn(), "getSn", result);
+        //物料编码
+        HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result);
+        //供应商编号
+        HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result);
+        return result.toString();
+    }
+
+    /**
+     * 明细表唯一性查询
+     * @return
+     */
+    public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails){
+        StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
+        return result.toString();
+    }
+
+    public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.getNumLikerPack(wmsASNMasterDetails.getQty(), "qty", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getPoItem(), "poItem", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getUnit(), "unit", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getZDate(), "zDate", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getZTime(), "zTime", result);
+        HqlPack.getNumLikerPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getPackAge(), "packAge", result);
+        HqlPack.getNumLikerPack(wmsASNMasterDetails.getIsFree(), "isFree", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getErpWhNo(), "erpWhNo", result);
+        HqlPack.getStringLikerPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result);
+
+        //有效性
+        HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
+        return result.toString();
+    }
+
+    /**
+     * 产品入库信息 条件封装
+     * @param wmsFGInStock
+     * @return
+     */
+    public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(),"orderNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(),"woNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(),"partNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(),"partNameRdd",result);
+        HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(),"qty",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getUnit(),"unit",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getSn(),"sn",result);
+        HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(),"orderStatus",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getReMark(),"reMark",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getSrc(),"src",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(),"erpWhno",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(),"lineNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(),"whNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(),"custNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(),"shippingFlag",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(),"mfgLogNo",result);
+        HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(),"isValid",result);
+        HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(),"isDeleted",result);
+        return result.toString();
+    }
+
+    /**
+     * 作业任务信息条件封装
+     * @param wmsTaskInfo
+     * @return
+     */
+    public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(),"moveNo",result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(),"userNo",result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(),"opTypeCode",result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(),"reMark",result);
+        HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(),"taskStatus",result);
+        HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(),"isValid",result);
+        HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(),"isDeleted",result);
+        return result.toString();
+    }
 }