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

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

@@ -444,8 +444,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OUT_MOVEMENT_MOVE_TYPE {
         IN_STORE(1, "IN", "入库"),
-        OUT_STORE(2, "OUT", "出库"),
-        MOVE_STORE(3, "MOVE", "移库");
+        OUT_STORE(10, "OUT", "出库"),
+        MOVE_STORE(20, "MOVE", "移库");
 
         private int value;
         private String code;
@@ -496,17 +496,17 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OUT_MOVEMENT_BUSI_TYPE {
         RECEIVE_GOODS(1, "RC", "收货"),
-        QUALITY_TESTING(2, "QC", "质检"),
-        IN_STORE(3, "IN", "入库"),
-        MIX_RECEIVE(4, "ZI", "杂收"),
-        MIX_SEND(5, "ZO", "杂发"),
-        SUPPLIER_RETURN_GOODS(6, "VJ", "供应商退货"),
-        CUSTOMER_RETURN_GOODS(7, "CJ", "客户退货"),
-        ORDER_PICKING_PART(8, "WP", "工单领料"),
-        ORDER_RETURN_PART(9, "WJ", "工单退料"),
-        MOVE_IN(10, "MI", "移库入库"),
-        MOVE_OUT(11, "MO", "移库出库"),
-        SEND(12, "SO", "发运");
+        QUALITY_TESTING(10, "QC", "质检"),
+        IN_STORE(20, "IN", "入库"),
+        MIX_RECEIVE(30, "ZI", "杂收"),
+        MIX_SEND(40, "ZO", "杂发"),
+        SUPPLIER_RETURN_GOODS(50, "VJ", "供应商退货"),
+        CUSTOMER_RETURN_GOODS(60, "CJ", "客户退货"),
+        ORDER_PICKING_PART(70, "WP", "工单领料"),
+        ORDER_RETURN_PART(80, "WJ", "工单退料"),
+        MOVE_IN(90, "MI", "移库入库"),
+        MOVE_OUT(100, "MO", "移库出库"),
+        SEND(110, "SO", "发运");
 
         private int value;
         private String code;
@@ -751,4 +751,216 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 外部单据：移库单单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_MOVEMENT_MASTER_ORDER_TYPE {
+        ORDER_PULL_PART(1, "工单配料");
+
+        private int value;
+        private String description;
+
+        OUT_MOVEMENT_MASTER_ORDER_TYPE(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;
+        }
+
+        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;
+        }
+    }
+    /**
+     * 外部单据：移库单关联单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE {
+        ASN(1, "ASN"),
+        PO(10, "PO"),
+        SO(20, "SO");
+
+        private int value;
+        private String description;
+
+        OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(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;
+        }
+    }
+
+    /**
+     * 作业任务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TASK_INFO_STATUS {
+        CREATE(10, "创建"), FINISH(20, "待处理"), FAIL(30, "已处理");
+
+        private int value;
+        private String description;
+
+        TASK_INFO_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;
+        }
+    }
+
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_SN_STATUS {
+        CREATE(1, "创建"),
+        RECEIVED(10, "已收货"),
+        QUALITY_TESTED(20, "已质检"),
+        PUTIN_STORE(30, "已入库"),
+        WAIT_OUT_STORE(40, "待出库"),
+        IS_OUT_STORE(50, "已出库"),
+        ON_THE_WAY(60, "在途"),
+        QUARANTINED(70, "已隔离"),
+        BREAK_BUG(80, "破包"),
+        FROZEN(90, "冻结"),
+        CANCEL(100, "作废");
+
+        private int value;
+        private String description;
+
+        STOCK_SN_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;
+        }
+
+        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;
+        }
+    }
+    /**
+     * 业务表：库存条码质检状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_SN_QC_STATUS {
+        CREATE(1, "未质检"),
+        RECEIVED(10, "质检合格"),
+        QUALITY_TESTED(20, "质检不合格"),
+        PUTIN_STORE(30, "已退货");
+
+        private int value;
+        private String description;
+
+        STOCK_SN_QC_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;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -58,5 +58,17 @@ public class WmsAreaOwner extends BaseBean {
 
     @Column(name = "IS_PRE_ASSIGN")
     @ApiParam(value = "是否预分配人员")
-    private String isPreAssign;
+    private Integer isPreAssign;
+
+    @ApiParam(value = "供应商名称")
+    private transient String vendorName;
+
+    @ApiParam(value = "仓库名称")
+    private transient String whName;
+
+    @ApiParam(value = "存储区名称")
+    private transient String zoneName;
+
+    @ApiParam(value = "库位名称")
+    private transient String locateName;
 }

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

@@ -35,7 +35,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "MOVE_TYPE")
     @ApiParam("移动类型")
-    public String moveType;
+    public Integer moveType;
     /**
      * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
      * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
@@ -66,11 +66,11 @@ public class WmsDocMovementMaster extends BaseBean {
     private Integer version;
 
     /**
-     * 单据类型::1=工单配料
+     * 关联单据类型:1=ASN,10=PO,20=SO
      */
     @Column(name = "REF_TYPE")
     @ApiParam(value = "关联单据类型")
-    private String refType;
+    private Integer refType;
 
     @Column(name = "REF_NO")
     @ApiParam(value = "关联单据")
@@ -85,7 +85,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "ORDER_TYPE")
     @ApiParam(value = "单据类型")
-    private String orderType;
+    private Integer orderType;
 
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")

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

@@ -36,7 +36,7 @@ public class WmsLocatePart extends BaseBean{
     @ApiParam(value ="物料编码")
     private String partNo;
 
-    @Column(name="PART_NAME")
+    @Column(name="PART_NAME_RDD")
     @ApiParam(value ="物料名称")
-    private String partName;
+    private String partNameRdd;
 }

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

@@ -66,4 +66,10 @@ public class WmsPOMaster extends BaseBean {
     @Column(name="IS_ASN")
     @ApiParam("是否有ASN")
     public String isAsn;
+
+    /**
+     * 供应商名称
+     */
+    @ApiParam("供应商名称")
+    private transient String vendorName;
 }

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

@@ -13,7 +13,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description : 待打印信息
+ * @Description : 打印队列信息
  * @Reference :
  * @Author : silliter.yuan
  * @CreateDate : 2018-11-06 15:58
@@ -25,16 +25,16 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_SN_PRINT")
-@Api("待打印信息")
+@Api("打印队列信息")
 public class WmsSnPrint extends BaseBean {
 
-    @Column(name="SRC_TYPE")
+    @Column(name="REF_TYPE")
     @ApiParam("来源单据类型")
-    public String srcType;
+    public String refType;
 
-    @Column(name="SRC_NO")
+    @Column(name="REF_NO")
     @ApiParam("来源单据编号")
-    public String srcNo;
+    public String refNo;
 
     @Column(name="PRINT_CONTEXT")
     @ApiParam("打印内容")
@@ -51,11 +51,11 @@ public class WmsSnPrint extends BaseBean {
     @ApiParam(value = "状态", example = "0")
     public Integer status;
 
-    @Column(name="PRINT_TEMPLET")
+    @Column(name="PRINT_TEMPLATE")
     @ApiParam("打印模板")
-    public String printTemplet;
+    public String printTemplete;
 
-    @Column(name="PRINT_MACHINE")
+    @Column(name="PRINTER")
     @ApiParam("打印机")
-    public String printMachine;
+    public String printer;
 }

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

@@ -1,10 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,42 +21,43 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="WMS_STOCK_QUAN")
+@Table(name = "WMS_STOCK_QUAN")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="库存信息",description = "库存信息")
-public class WmsStockQuant extends BaseBean{
+@Api(value = "库存信息", description = "库存信息")
+public class WmsStockQuan extends BaseBean {
 
-    @Column(name="PART_NO")
-    @ApiParam(value ="零件编号")
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
     private String partNo;
 
-    @Column(name="PART_NAME_RDD")
-    @ApiParam(value ="零件名称")
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
     private String partNameRdd;
 
-    @Column(name="QTY")
-    @ApiParam(value = "可用数量", example = "0")
-    public Double qty;
-
-    @Column(name="UNIT")
+    @Column(name = "UNIT")
     @ApiParam("单位")
     public String unit;
 
-    @Column(name="TOTAL_QTY")
-    @ApiParam(value ="总数量", example = "0")
-    private Double totalQty;
-
-    @Column(name="ZONE_NO")
-    @ApiParam(value ="存储区编号")
-    private String zoneNo;
+    @Column(name = "QTY")
+    @ApiParam(value = "可用数量", example = "0")
+    public Double qty;
 
-    @Column(name="WH_NO")
-    @ApiParam(value ="仓库代码")
-    private String whNo;
+    @Column(name = "TOTAL_QTY")
+    @ApiParam(value = "总数量", example = "0")
+    private Double totalQty;
 
-    @Column(name="LOCATE_NO")
-    @ApiParam(value ="库位代码")
-    private String locateNo;
 }

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

@@ -0,0 +1,132 @@
+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;
+import java.util.Date;
+
+/**
+ * @Description : 库存条码信息
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-17 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_STOCK_SN")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "库存条码信息", description = "库存条码信息")
+public class WmsStockSn extends BaseBean {
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次编码")
+    public String lotNo;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam(value = "生产日期")
+    public String dateCode;
+
+    @Column(name = "LEFT_CODE")
+    @ApiParam(value = "有效期")
+    private String leftCode;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地")
+    private String shippingFlag;
+
+    @Column(name = "SN")
+    @ApiParam(value = "条码")
+    private String sn;
+
+    @Column(name = "SN_2D")
+    @ApiParam(value = "二维码")
+    private String sn2d;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam(value = "包装编号")
+    private String packageNo;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量", example = "0")
+    private Double qty;
+    /**
+     * 1=未质检,10=质检合格,20=质检不合格,30=已退货
+     */
+    @Column(name = "QC_STATUS")
+    @ApiParam(value = "质检状态", example = "0")
+    private Integer qcStatus;
+    /**
+     * :1=创建,10=已收货,20=已质检,30=已入库,40=待出库,50=已出库,
+     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+     */
+    @Column(name = "SN_STATUS")
+    @ApiParam(value = "条码状态", example = "0")
+    private Integer snStatus;
+    /**
+     * 1:已打印；2：未打印
+     */
+    @Column(name = "PRINTED")
+    @ApiParam(value = "是否打印", example = "0")
+    private Integer printed;
+
+    @Column(name = "PDATE")
+    @ApiParam(value = "打印时间")
+    private Date pdate;
+    /**
+     * 1=ASN,10=PO,20=SO
+     */
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型", example = "0")
+    private Integer refType;
+
+    @Column(name = "REF_SRC")
+    @ApiParam(value = "关联单号")
+    private String refSrc;
+}

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

@@ -13,7 +13,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description : 盘点单主表信息
+ * @Description : 单据操作并发锁定信息
  * @Reference :
  * @Author : silliter.yuan
  * @CreateDate : 2018-11-06 15:58
@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_TMP_ORDER_LOCK")
-@Api("盘点单主表信息")
+@Api("单据操作并发锁定信息")
 public class WmsTempOrderLock extends BaseBean {
 
     /**

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

@@ -24,68 +24,61 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_TRANS_QUAN")
+@Table(name = "WMS_TRANS_QUAN")
 @Api("库存交易信息")
 public class WmsTransQuan extends BaseBean {
 
-    @Column(name="ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    @Column(name="WH_NO")
+    @Column(name = "WH_NO")
     @ApiParam("仓库代码")
     public String whNo;
 
-    @Column(name="ZONE_NO")
+    @Column(name = "ZONE_NO")
     @ApiParam("存储区编号")
     public String zoneNo;
 
-    @Column(name="LOCATE_NO")
+    @Column(name = "LOCATE_NO")
     @ApiParam("库位编号")
     public String locateNo;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料编码")
     public String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     public String partNameRdd;
 
-    @Column(name="SN")
+    @Column(name = "SN")
     @ApiParam("条码")
     public String sn;
 
-    @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-
-    @Column(name="UNIT")
+    @Column(name = "UNIT")
     @ApiParam("单位")
     public String unit;
 
     /**
-     * 质检状态:0=未质检,10=质检中,20=质检合格,
-     * 30=质检不合格,40=已退货
+     * 关联交易类型表
      */
-    @Column(name="QC_STATUS")
-    @ApiParam(value = "质检状态", example = "1")
-    public Integer qcStatus;
+    @Column(name = "TRANS_CODE")
+    @ApiParam(value = "交易类型代码")
+    public String transCode;
 
-    /**
-     * 条码状态:0=创建,10=已收货,20=已质检,
-     * 30=已入库,40=待出库,50=已出库,
-     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
-     */
-    @Column(name="STATUS")
-    @ApiParam(value = "条码状态", example = "1")
-    public Integer status;
+    @Column(name = "QTY")
+    @ApiParam(value = "交易数量", example = "0")
+    public Double qty;
+
+    @Column(name = "TRANS_NO")
+    @ApiParam(value = "事务编号", example = "1")
+    public Long transNo;
 
     /**
-     * 处理状态:0=已创建,5=已盘,10=已冻结
-     * ,20=已解冻,30=取消冻结
+     * ASN,PO,SO
      */
-    @Column(name="TRANS_STATUS")
-    @ApiParam(value = "处理状态", example = "1")
-    public Integer transStatus;
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型", example = "1")
+    public Integer refType;
+
+    @Column(name = "REF_SRC")
+    @ApiParam(value = "关联单号")
+    public String refSrc;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsAreaOwnerRepository.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.WmsAreaOwner;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 责任区分配数据库操作类
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-17 11:24
+ * @Modify:
+ **/
+@Service
+public interface WmsAreaOwnerRepository extends BaseRepository<WmsAreaOwner, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSLocate;
+
+/**
+ * @Description :对象持久层仓用方法控制(盘点库位信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-17 14:48
+ * @Modify:
+ **/
+public interface WmsCSLocateRepository extends BaseRepository<WmsCSLocate, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSPart;
+
+/**
+ * @Description :对象持久层仓用方法控制(盘点物料信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-17 16:10
+ * @Modify:
+ **/
+public interface WmsCSPartRepository extends BaseRepository<WmsCSPart, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSZone;
+
+/**
+ * @Description :对象持久层仓用方法控制(盘点存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-17 17:11
+ * @Modify:
+ **/
+public interface WmsCSZoneRepository extends BaseRepository<WmsCSZone, Long> {
+}

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrint;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransCode;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 打印机队列数据操作类
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-17 14:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsSnPrintRepository extends BaseRepository<WmsSnPrint, Long> {
+
+}

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

@@ -1,15 +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.WmsStockQuant;
-import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd;
-
-/**
- * @Description : 库存表
- * @Reference :
- * @Author : jessica.chen
- * @CreateDate : 2018-11-02 17:08
- * @Modify:
- **/
-public interface WmsStockQuantRepository extends BaseRepository<WmsStockQuant, Long> {
-}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+
+/**
+* @Description : 库存条码dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:53
+* @Modify:
+**/
+public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTempOrderLock;
+
+/**
+ * @Description :对象持久层仓用方法控制(单据操作并发锁信息)
+ * @Reference :
+ * @Author : silliter
+ * @CreateDate : 2018-11-17 14:48
+ * @Modify:
+ **/
+public interface WmsTempOrderLockRepository extends BaseRepository<WmsTempOrderLock, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan;
+
+/**
+* @Description : 库存业务dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:57
+* @Modify:
+**/
+public interface WmsTransQuanRepository extends BaseRepository<WmsTransQuan, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransSn;
+
+/**
+* @Description : 库存业务条码dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:57
+* @Modify:
+**/
+public interface WmsTransSnRepository extends BaseRepository<WmsTransSn, Long> {
+}

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

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
@@ -71,7 +70,6 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
 
-        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
                 "isDeleted", result);
         return result.toString();
@@ -130,7 +128,6 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(routingCode, "routingCode", result);
 
-        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
                 "isDeleted", result);
         return result.toString();
@@ -210,7 +207,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
         HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result);
+        HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result);
@@ -548,6 +545,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
         //客户编码
         HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
+        //物料编码
+        HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
         //条码
         HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result);
         //发运状态
@@ -655,4 +654,182 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 根据条件查询打印机队列信息封装类
+     * @param wmsSnPrint 打印机队列信息
+     * @return 打印机队列信息
+     */
+    public static String packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) {
+        StringBuffer result = new StringBuffer();
+
+        // 来源单据类型
+        HqlPack.getStringLikerPack(wmsSnPrint.getRefType(), "refType", result);
+        // 来源单据号
+        HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
+        // 打印机
+        HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
+        // 打印机状态
+        HqlPack.getNumEqualPack(wmsSnPrint.getStatus(), "status", result);
+
+        getStringBuilderPack(wmsSnPrint, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 盘点库位 条件封装
+     * @param wmsCSLocate
+     * @return
+     */
+    public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result);
+        getStringBuilderPack(wmsCSLocate, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 盘点物料 条件封装
+     * @param wmsCSPart
+     * @return
+     */
+    public static String packHqlWmsCSPart(WmsCSPart wmsCSPart){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(),"orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSPart.getPartNo(),"partNo", result);
+        HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(),"partNameRdd", result);
+        getStringBuilderPack(wmsCSPart, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 盘点存储区 条件封装
+     * @param wmsCSZone
+     * @return
+     */
+    public static String packHqlWmsCSZone(WmsCSZone wmsCSZone){
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result);
+        getStringBuilderPack(wmsCSZone, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 根据条件查询责任区分配信息封装类
+     * @param wmsAreaOwner 责任区分配信息
+     * @return 责任区分配信息
+     */
+    public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) {
+        StringBuffer result = new StringBuffer();
+
+        // 仓库代码
+        HqlPack.getStringLikerPack(wmsAreaOwner.getWhNo(), "whNo", result);
+        // 来源单据号
+        HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result);
+        // 供应商编码
+        HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result);
+        // 物料编码
+        HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result);
+        // 负责人
+        HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result);
+        // 是否预分配
+        HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result);
+
+        getStringBuilderPack(wmsAreaOwner, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 根据条件查询责任区分配信息封装类
+     * @param wmsTempOrderLock 责任区分配信息
+     * @return 责任区分配信息
+     */
+    public static String packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) {
+        StringBuffer result = new StringBuffer();
+
+        // 订单号
+        HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result);
+        // 业务类型
+        HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result);
+
+        getStringBuilderPack(wmsTempOrderLock, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 业务：库存条码查询封装
+     *
+     * @param wmsStockSn
+     * @return
+     */
+    public static String packWmsStockSn(WmsStockSn wmsStockSn) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsStockSn, result);
+        return result.toString();
+    }
+
+    /**
+     * 业务：库存查询封装
+     *
+     * @param wmsStockQuan
+     * @return
+     */
+    public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsStockQuan.getWhNo(), "whNo", result);
+        HqlPack.getStringLikerPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringLikerPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+        HqlPack.getStringLikerPack(wmsStockQuan.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsStockQuan, result);
+        return result.toString();
+    }
+
+    /**
+     * 业务：库存交易条码查询封装(根据交易编码查询所有未删除的)
+     *
+     * @param tranNo
+     * @return
+     */
+    public static String packWmsTransSn(String tranNo) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getStringEqualPack(tranNo, "tranNo", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        return result.toString();
+    }
+
+    /**
+     * 业务：库存交易查询封装
+     *
+     * @param wmsTransQuan
+     * @return
+     */
+    public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsTransQuan.getWhNo(), "whNo", result);
+        HqlPack.getStringLikerPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringLikerPack(wmsTransQuan.getLocateNo(), "locateNo", result);
+        HqlPack.getStringLikerPack(wmsTransQuan.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsTransQuan, result);
+        return result.toString();
+    }
 }