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

# Conflicts:
#	modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java
#	modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java

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

@@ -828,17 +828,42 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+    }
 
-        public static int descOf(String desc) {
-            int tmp = 1;
+    /**
+     * 作业任务状态
+     */
+    @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].description.equals(desc)) {
-                    tmp = values()[i].value;
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
                 }
             }
             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/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/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/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/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/sqlpack/WmsHqlPack.java

@@ -18,8 +18,7 @@ public class WmsHqlPack {
 
     /**
      * 封装公用查询参数
-     *
-     * @param bean   实体对象
+     * @param bean 实体对象
      * @param hqlStr 查询语句
      * @return 封装完成的查询语句
      */
@@ -71,7 +70,8 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
 
-        getStringBuilderPack(wmsDocMovementDetails, result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
+                "isDeleted", result);
         return result.toString();
     }
 
@@ -90,7 +90,10 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
         HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result);
 
-        getStringBuilderPack(wmsDocMovementMaster, result);
+        HqlPack.getStringEqualPack(wmsDocMovementMaster.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
+                "isDeleted", result);
         return result.toString();
     }
 
@@ -124,7 +127,9 @@ public class WmsHqlPack {
     public static String packHqlWmsRoutingChildren(String routingCode) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(routingCode, "routingCode", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
+                "isDeleted", result);
         return result.toString();
     }
 
@@ -140,7 +145,10 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
 
-        getStringBuilderPack(wmsRoutingMaster, result);
+        HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
+                "isDeleted", result);
         return result.toString();
     }
 
@@ -158,7 +166,11 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
 
-        getStringBuilderPack(wmsPart, result);
+        HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
+                "isDeleted", result);
+
         return result.toString();
     }
 
@@ -178,7 +190,7 @@ public class WmsHqlPack {
         HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true);
         HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -198,7 +210,7 @@ public class WmsHqlPack {
         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);
+        HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -220,7 +232,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
         HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -306,7 +318,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result);
         HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -657,6 +669,118 @@ public class WmsHqlPack {
     }
 
     /**
+     * 根据条件查询打印机队列信息封装类
+     * @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