解决冲突

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -92,9 +92,6 @@ public class SysUser extends BaseBean {
     @ApiParam(value ="用户类型（枚举，待定）" , example ="-1")
     private Integer userType;
 
-    @ApiParam(value ="用户信息")
-    private transient SysUserInfo userInfo;
-
     @ApiParam(value ="用户所有角色信息")
     private transient List<SysRole> roleList;
 

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

@@ -0,0 +1,47 @@
+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 : amy
+ * @CreateDate : 2018-11-23 13:13
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_GROUP")
+@Api("作业流程")
+public class WmsActionGroup extends BaseBean {
+
+    @Column(name="AG_NAME_E")
+    @ApiParam("英文流程名称")
+    private String agNameE;
+
+    @Column(name="AG_DESC_E")
+    @ApiParam("英文流程描述")
+    private String agDescE;
+
+    @Column(name="AG_NAME_C")
+    @ApiParam("中文流程名称")
+    private String agNameC;
+
+    @Column(name="AG_DESC_C")
+    @ApiParam("中文流程描述")
+    private String agDescC;
+
+}

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

@@ -0,0 +1,63 @@
+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 : amy
+ * @CreateDate : 2018-11-23 13:23
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_GROUP_DETAILS")
+@Api("作业流程明细")
+public class WmsActionGroupDetails extends BaseBean {
+
+    @Column(name = "AG_ID")
+    @ApiParam(value = "作业流程ID", example = "0")
+    private Long agId;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号", example = "0")
+    private Integer seq;
+
+    @Column(name = "OK_SEQ")
+    @ApiParam(value = "成功跳转步骤", example = "0")
+    private Integer okSeq;
+
+    @Column(name = "NG_SEQ")
+    @ApiParam(value = "失败跳转步骤", example = "0")
+    private Integer ngSeq;
+
+    @Column(name = "VALUE_TYPE")
+    @ApiParam(value = "动作类型", example = "10")
+    private Integer valueType;
+
+    @Column(name = "TO_UPPER")
+    @ApiParam(value = "是否转为大写", example = "2")
+    private Integer toUpper;
+
+    @Column(name = "LEN_CHECK")
+    @ApiParam(value = "长度检查", example = "0")
+    private Integer lenCheck;
+
+    @Column(name = "AS_ID")
+    @ApiParam(value = "作业步骤", example = "0")
+    private Long asId;
+
+}

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

@@ -1,11 +1,9 @@
 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 javax.persistence.Entity;
 import java.util.List;
 
 /**
@@ -17,7 +15,7 @@ import java.util.List;
  **/
 @Data
 @Api("返回前端数据实体")
-public class WmsActionResponseBean extends BaseBean {
+public class WmsActionResponseBean {
 
     @ApiParam("进度")
     public Double percent;

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

@@ -1,16 +1,9 @@
 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.List;
 
 /**
@@ -22,7 +15,7 @@ import java.util.List;
  **/
 @Data
 @Api("接受前端数据实体")
-public class WmsOperationBean extends BaseBean {
+public class WmsOperationBean {
 
     @ApiParam("扫描内容")
     public String barCode;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupDetailsRepository.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.WmsActionGroupDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-23 13:32
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionGroupDetailsRepository extends BaseRepository<WmsActionGroupDetails,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionGroupRepository.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.WmsActionGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-23 13:34
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionGroupRepository extends BaseRepository<WmsActionGroup,Long> {
+}

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

@@ -181,8 +181,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true);
+        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), wmsIbCheckPlan.getEndDate(), "startDate", result, true);
 
         getStringBuilderPack(wmsIbCheckPlan, result);
 
@@ -449,7 +448,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
-        HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result);
+        HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
@@ -1073,6 +1072,21 @@ public class WmsHqlPack {
     }
 
     /**
+     * 作业流程分页查询
+     * @return
+     */
+    public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup){
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装 agDescC;agNameC
+        HqlPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result);
+        HqlPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result);
+        getStringBuilderPack(wmsActionGroup, result);
+
+        return result.toString();
+    }
+
+    /**
      * 作业记录参数信息 查询条件封装
      *
      * @param wmsActionLogData