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/ImppEnumUtil.java

@@ -687,7 +687,7 @@ public class ImppEnumUtil {
      * 1.SYSTEM：系统参数
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MESSAGE_CONTENT_TYPE{
+    public enum MESSAGE_TYPE_CONTENT {
 
         HTML(1,"HTML","text/plain;charset=UTF-8"),
         TEXT(2,"TEXT","text/plain;charset=UTF-8");
@@ -696,10 +696,10 @@ public class ImppEnumUtil {
         private String name;
         private String description;
 
-        MESSAGE_CONTENT_TYPE() {
+        MESSAGE_TYPE_CONTENT() {
         }
 
-        MESSAGE_CONTENT_TYPE(int value, String name, String description) {
+        MESSAGE_TYPE_CONTENT(int value, String name, String description) {
             this.value = value;
             this.name = name;
             this.description = description;

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

@@ -72,8 +72,8 @@ public class SysFile extends BaseBean {
     @ApiParam(value ="文件大小(KB)" , example ="0")
     private Integer fileSize;
  
-    @Column(name="DOWNLOADS")
+    @Column(name="DOWNLOAD_NUM")
     @ApiParam(value ="下载次数" , example ="0")
-    private Integer downloads;
+    private Integer downloadNum;
 
 }

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

@@ -38,8 +38,8 @@ public class SysMessage extends BaseBean {
     @ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
     private Integer messageType;
 
-    @Column(name="MESSAGE_CONTENT_TYPE")
-    @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_CONTENT_TYPE)" , example ="-1")
+    @Column(name="MESSAGE_TYPE_CONTENT")
+    @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)" , example ="-1")
     private Integer messageContentType;
 
     @Column(name="MESSAGE_CONTENT")

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

@@ -30,7 +30,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="SYS_USER_INFO")
 @Api(value="用户详细",description = "用户详细")
-public class SysUserInfo extends BaseBean {
+public class  SysUserInfo extends BaseBean {
 
     @Column(name="NAME")
     @ApiParam(value ="名称" , access ="名称")
@@ -115,6 +115,9 @@ public class SysUserInfo extends BaseBean {
     @ApiParam(value ="用户所有部门信息")
     private transient List<SysDepartment> departmentList;
 
+    @ApiParam("用户的部门ID信息")
+    private transient List<String> departmentIdList;
+
     @ApiParam(value ="用户所有岗位信息")
     private transient List<SysPosition> positionList;
 

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

@@ -2,8 +2,6 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -15,8 +13,4 @@ import java.util.List;
  * @Modify:
  **/
 public interface WmsActionStepCallRepository extends BaseRepository<WmsActionStepCall, Long> {
-
-    @Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ")
-    List<WmsActionStepCall> findWmsActionStepCallByAmid(@Param("id") long id);
-
 }

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

@@ -1038,4 +1038,36 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 作业步骤处理组件查询条件封装
+     *
+     * @param wmsActionModuleParam
+     * @return
+     */
+    public static String packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result);
+        getStringBuilderPack(wmsActionModuleParam, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业步骤处理组件参数查询条件封装
+     *
+     * @param wmsActionModule
+     * @return
+     */
+    public static String packHqlWmsActionModule(WmsActionModule wmsActionModule) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
+        getStringBuilderPack(wmsActionModule, result);
+
+        return result.toString();
+    }
 }