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

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

@@ -51,6 +51,6 @@ public class BasVendor extends BaseBean{
     private String vendorEmail;
 
     @Column(name = "IS_ASN")
-    @ApiParam("是否发ASN")
+    @ApiParam(value = "是否发ASN", example = "0")
     private Integer isAsn;
 }

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

@@ -35,7 +35,7 @@ public class WmsOpType extends BaseBean{
     private String opTypeName;
 
     @Column(name = "SEQ")
-    @ApiParam("序号")
+    @ApiParam(value = "序号", example = "0")
     private Integer seq;
 
     @Column(name="PROG_CODE")

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

@@ -0,0 +1,52 @@
+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 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-08 17:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "WMS_ROUTING_ASSIGN")
+@Api("物流路线分配表")
+public class WmsRoutingAssign 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 = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    private String vendorNo;
+
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "路线编码")
+    private String routingCode;
+}

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

@@ -0,0 +1,52 @@
+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 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-08 17:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "WMS_ROUTING_DETAIL")
+@Api("物流路线明细表")
+public class WmsRoutingDetail extends BaseBean {
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "路线编码")
+    private String routingCode;
+
+    @Column(name = "OP_STEP")
+    @ApiParam(value = "作业步骤")
+    private String opStep;
+
+    @Column(name = "OK_SEQ")
+    @ApiParam(value = "成功跳转序号", example = "1")
+    private Integer okSeq;
+
+    @Column(name = "NG_SEQ")
+    @ApiParam(value = "失败跳转序号", example = "1")
+    private Integer ngSeq;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号", example = "1")
+    private Integer seq;
+
+    @Column(name = "PARENT_SEQ")
+    @ApiParam(value = "上级步骤序号", example = "1")
+    private Integer parentSeq;
+
+}

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

@@ -0,0 +1,39 @@
+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 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-08 17:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "WMS_ROUTING_MASTER")
+@Api("物流路线主表")
+public class WmsRoutingMaster extends BaseBean {
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "路线编码")
+    private String routingCode;
+
+    @Column(name = "ROUTING_NAME")
+    @ApiParam(value = "路线名称")
+    private String routingName;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号", example = "1")
+    private Integer seq;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingAssignRepository.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.WmsRoutingAssign;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :物流路线分配Repository
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-08 10:19
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingAssignRepository extends BaseRepository<WmsRoutingAssign, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingDetailRepository.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.WmsRoutingDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :物流路线明细Repository的方法接口
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-08 10:19
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingDetailRepository extends BaseRepository<WmsRoutingDetail, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingMasterRepository.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.WmsRoutingMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :物流路线主表Repository的方法接口
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-08 10:19
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingMasterRepository extends BaseRepository<WmsRoutingMaster, Long> {
+}

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

@@ -12,6 +12,59 @@ import cn.estsh.i3plus.pojo.wms.bean.*;
  **/
 public class WmsHqlPack {
     /**
+     * 物流路线明细查询条件封装
+     *
+     * @param wmsRoutingDetail
+     * @return
+     */
+    public static String packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result);
+        HqlPack.getStringLikerPack(wmsRoutingDetail.getOpStep(), "opStep", result);
+        HqlPack.getNumEqualPack(wmsRoutingDetail.getOkSeq(), "okSeq", result);
+        HqlPack.getNumEqualPack(wmsRoutingDetail.getNgSeq(), "ngSeq", result);
+        HqlPack.getNumEqualPack(wmsRoutingDetail.getSeq(), "seq", result);
+        HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result);
+        HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true);
+        HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result);
+        return result.toString();
+    }
+
+    /**
+     * 物流路线分配查询条件封装
+     *
+     * @param wmsRoutingAssign
+     * @return
+     */
+    public static String packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsRoutingAssign.getWhNo(), "whNo", result);
+        HqlPack.getStringLikerPack(wmsRoutingAssign.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringLikerPack(wmsRoutingAssign.getLocateNo(), "locateNo", result);
+        HqlPack.getStringLikerPack(wmsRoutingAssign.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsRoutingAssign.getVendorNo(), "vendorNo", result);
+        HqlPack.getStringLikerPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result);
+        HqlPack.timeBuilder(wmsRoutingAssign.getCreateDateTimeStart(), wmsRoutingAssign.getCreateDateTimeEnd(), "createDatetime", result, true);
+        return result.toString();
+    }
+
+    /**
+     * 物流路线主表查询条件封装
+     *
+     * @param wmsRoutingMaster
+     * @return
+     */
+    public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
+        HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
+        HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result);
+        HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+        HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
+        return result.toString();
+    }
+
+    /**
      * 物料查询条件封装
      *
      * @param wmsPart
@@ -20,16 +73,18 @@ public class WmsHqlPack {
     public static String packHqlWmsPart(WmsPart wmsPart) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
-        HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDateTime", result, true);
+        HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true);
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
-        HqlPack.getStringLikerPack(wmsPart.getAbc(), "ABC", result);
+        HqlPack.getStringLikerPack(wmsPart.getAbc(), "abc", result);
         HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result);
         HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result);
         return result.toString();
     }
+
     /**
      * 抽点比例信息 分页查询
+     *
      * @param wmsIbCheckPlan
      * @return
      */
@@ -39,12 +94,14 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result);
 
         return result.toString();
     }
 
     /**
      * 库位物料信息 分页查询
+     *
      * @param wmsLocatePart
      * @return
      */
@@ -55,12 +112,14 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
         HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result);
+        HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result);
 
         return result.toString();
     }
 
     /**
      * 库位信息 分页查询
+     *
      * @param wmsLocate
      * @return
      */
@@ -73,12 +132,14 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result);
         HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
 
         return result.toString();
     }
 
     /**
      * 工厂仓库模糊分页查询
+     *
      * @param wareHouse
      * @return
      */
@@ -108,6 +169,7 @@ public class WmsHqlPack {
 
     /**
      * 元数据信息 分页查询
+     *
      * @param wmsObject
      * @return
      */
@@ -128,6 +190,7 @@ public class WmsHqlPack {
 
     /**
      * 元数据字段分页查询
+     *
      * @param wmsField
      * @return
      */
@@ -142,6 +205,7 @@ public class WmsHqlPack {
 
     /**
      * 交易类型信息 分页查询
+     *
      * @param wmsTransType
      * @return
      */
@@ -158,6 +222,7 @@ public class WmsHqlPack {
 
     /**
      * 库存交易记录信息 分页查询
+     *
      * @param wmsTrans
      * @return
      */
@@ -174,6 +239,7 @@ public class WmsHqlPack {
 
     /**
      * 仓库分页查询条件
+     *
      * @param wareHouse
      * @return
      */
@@ -188,6 +254,7 @@ public class WmsHqlPack {
 
     /**
      * 供应商分页查询
+     *
      * @param basVendor
      * @return
      */
@@ -209,6 +276,7 @@ public class WmsHqlPack {
 
     /**
      * 作业类型分页查询
+     *
      * @param wmsOpType
      * @return
      */
@@ -216,7 +284,9 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
+        if(wmsOpType.getSeq()!= null){
             HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result);
+        }
         HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result);
         HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result);
         return result.toString();
@@ -224,6 +294,7 @@ public class WmsHqlPack {
 
     /**
      * 仓库唯一性校验查询条件【用于添加和修改】
+     *
      * @param wareHouse
      * @return
      */
@@ -237,6 +308,7 @@ public class WmsHqlPack {
 
     /**
      * 供应商唯一性校验查询条件【用于添加和修改】
+     *
      * @param basVendor
      * @return
      */
@@ -260,11 +332,14 @@ public class WmsHqlPack {
 
     /**
      * 存储区信息 查询条件封装
+     *
      * @param wmsZones
      * @return
      */
     public static String packHqlWmsZones(WmsZones wmsZones) {
         StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result);
         //仓库代码
         HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result);
         //库存地代码
@@ -276,27 +351,33 @@ public class WmsHqlPack {
 
     /**
      * 客户信息 查询条件封装
+     *
      * @param basCustomer
      * @return
      */
     public static String packHqlBasCustomer(BasCustomer basCustomer) {
         StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result);
         //客户编号
         HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
-        //客户简称
+        //聯係人
-        HqlPack.getStringLikerPack(basCustomer.getCustName(),"custName",result);
+        HqlPack.getStringLikerPack(basCustomer.getCustOwner(), "custOwner", result);
-        //客户全称
+        //電話號碼
-        HqlPack.getStringLikerPack(basCustomer.getCustDesc(),"custDesc",result);
+        HqlPack.getStringLikerPack(basCustomer.getCustTel(), "custTel", result);
         return result.toString();
     }
 
     /**
      * 客户发往地信息 查询条件封装
+     *
      * @param wmsShippingFlag
      * @return
      */
     public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) {
         StringBuffer result = new StringBuffer();
+        //有效性
+        HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result);
         //供应商编号
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
         //供应商简称