Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java

@@ -96,16 +96,43 @@ public class BaseResultBean<Obj> {
     }
 
     public static BaseResultBean buildBaseResultBean(boolean success,String msg){
-        BaseResultBean rs =  new BaseResultBean();
+        BaseResultBean rs = new BaseResultBean();
         rs.success = success;
-        if(success) {
+        if (success) {
             rs.msg = msg;
             rs.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
-        }else {
+        } else {
             rs.code = ResourceEnumUtil.MESSAGE.FAIL.getCode();
             rs.errorMsg = msg;
         }
 
         return rs;
     }
+
+    public BaseResultBean setResultList(List<Obj> resultList) {
+        this.resultList = resultList;
+        return this;
+    }
+
+    public BaseResultBean setResultObject(Obj resultObject) {
+        this.resultObject = resultObject;
+        return this;
+    }
+
+    public BaseResultBean setResultMap(Map<String, Object> resultMap) {
+        this.resultMap = resultMap;
+        return this;
+    }
+
+    public BaseResultBean setPager(Pager pager) {
+        this.pager = pager;
+        return this;
+    }
+
+    public BaseResultBean setListPager(ListPager<Obj> listPager) {
+        this.listPager = listPager;
+        this.setPager(listPager.getObjectPager());
+        this.setResultList(listPager.getObjectList());
+        return this;
+    }
 }

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

@@ -20,11 +20,18 @@ public class CommonEnumUtil {
         CORE(2, "i3core", "i3业务平台"),
         WMS(3, "i3wms", "仓库管理软件"),
         MES(4, "i3mes", "生产管理软件"),
-        CONSOLE(95,"impp-console","服务监控台"),
+        QMS(5, "i3qms", "质量管理软件"),
-        GATEWAY(96,"impp-gateway","服务网关"),
+        FORM(20,"block-form","智能表单"),
-        CLOUD(97,"i3cloud","微服务"),
+        REPORT(21,"block-report","智能报表"),
+        WORKFLOW(22,"block-workflow","智能工作流"),
+        JOBFLOW(23,"block-jobflow","智能作业流"),
+        SOFTSWITCH(24,"block-softswitch","智能软件适配器"),
+        HARDSWITCH(25,"block-hardswitch","智能硬件适配器"),
+        CENTER(99,"icloud-server","注册中心"),
         SURFACE(98,"i3surface","对外服务"),
-        CENTER(99,"icloud-server","注册中心");
+        CLOUD(97,"i3cloud","微服务"),
+        GATEWAY(96,"impp-gateway","服务网关"),
+        CONSOLE(95,"impp-console","服务监控台");
 
         private int value;
         private String code;
@@ -375,7 +382,7 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_STATUS {
         ENABLE(1, "启用", "fa fa-success cell-fa fa-check"),
-        DISABLE(2, "禁止", "fa fa-disabled cell-fa fa-times-circle"),
+        DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"),
         LOCKING(3, "锁定", "fa cell-fa fa-lock");
 
         private int value;
@@ -608,35 +615,195 @@ public class CommonEnumUtil {
      * 服务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum CLOUD_STATUS {
+    public enum CLOUD_APP_STATUS {
-        REGISTERED(1, "注册"),
+        UP(1,"UP" ,"在线"),
-        DISCONNECT(2, "断开");
+        DOWN(2, "DOWN","断线");
 
         private int value;
+        private String code;
         private String description;
 
+        private CLOUD_APP_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
         public int getValue() {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
 
-        private CLOUD_STATUS(int value, String description) {
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(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 String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 客户端操作系统
+     *             return "Windows";
+     *             return "Mac";
+     *             return "Unix";
+     *             return "Android";
+     *             return "IPhone";
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOG_LOGIN_PLATFORM {
+        WINDOWS(1, "Windows", "Windows 操作系统"),
+        MAC(2, "Mac", "Mac 操作系统"),
+        UNIX(3, "Unix", "Linux 操作系统"),
+        ANDROID(4, "Android", "Android 操作系统"),
+        IPHONE(5, "IPhone", "IPhone 操作系统");
+
+        private int value;
+        private String name;
+        private String description;
+
+        LOG_LOGIN_PLATFORM() {
+        }
+
+        LOG_LOGIN_PLATFORM(int value, String name, String description) {
             this.value = value;
+            this.name = name;
             this.description = description;
         }
 
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName() {
+            return name;
+        }
+
         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;
+                    tmp = values()[i].getName();
+                }
+            }
+            return tmp;
+        }
+
+        /**
+         * -1 未识别操作系统
+         * @param desc
+         * @return
+         */
+        public static int descOf(String desc) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(desc)) {
+                    tmp = values()[i].value;
                 }
             }
             return tmp;
         }
     }
 
+    /**
+     * 用户登录状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USER_LOGIN_STATUS {
+        LOGIN_SUCCESS(1, "登录成功", "登录成功"),
+        WRONG_PASSWORD(3, "密码错误", "Linux 密码错误"),
+        WRONG_USERNAME_OR_PASSWORD(2, "用户名或密码错误", "用户名或密码错误"),
+        USER_LOGIN_LOCKING(4, "账号已锁定", "账号已锁定"),
+        USER_INFO_NULL(5, "用户信息不存在", "用户信息不存在"),
+        SYSTEM_ERROR(6, "系统异常", "系统异常");
+
+        private int value;
+        private String name;
+        private String description;
+
+        USER_LOGIN_STATUS() {
+        }
+
+        USER_LOGIN_STATUS(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        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].getName();
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -209,6 +209,16 @@ public class ImppEnumUtil {
             return tmp;
         }
 
+        public static String valueOfName(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {

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

@@ -1265,7 +1265,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_INFO_STATUS {
-        CREATE(1, "新建"),
+        CREATE(1, "创建"),
         FINISH(5, "待处理"),
         FAIL(10, "已完成"),
         CLOSE(90, "已关闭"),

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -252,4 +252,19 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
 
     public boolean isExitBySql(String sql);
 
+    public double findSumByProperty(String sumPropertyName,String groupByName,String propertyName, Object value);
+
+    public double findSumByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue);
+
+    public double findAvgByProperty(String sumPropertyName,String groupByName,String propertyName, Object value);
+
+    public double findAvgByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue);
+
+    public double findMaxByProperty(String sumPropertyName,String groupByName,String propertyName, Object value);
+
+    public double findMaxByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue);
+
+    public double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value);
+
+    public double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue);
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -1018,4 +1018,100 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public boolean isExitBySql(String sql) {
         return findBySqlCount(sql) > 0;
     }
+
+    @Override
+    public double findSumByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) {
+        return findSumByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value});
+    }
+
+    @Override
+    public double findSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
+        if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
+            StringBuffer sb = new StringBuffer("select sum(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
+            appendQL(sb,paramName,paramValue);
+            sb.append(" group by :groupByName");
+
+            Query query = entityManager.createQuery(sb.toString());
+            query.setParameter(":sumPropertyName", sumPropertyName);
+            setParameter(query,paramName,paramValue);
+            query.setParameter(":groupByName", groupByName);
+
+            Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
+            return sumResult == null ? 0.0 : sumResult.doubleValue();
+        }else{
+            throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
+        }
+    }
+
+    @Override
+    public double findAvgByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) {
+        return findAvgByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value});
+    }
+
+    @Override
+    public double findAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
+        if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
+            StringBuffer sb = new StringBuffer("select avg(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
+            appendQL(sb,paramName,paramValue);
+            sb.append(" group by :groupByName");
+
+            Query query = entityManager.createQuery(sb.toString());
+            query.setParameter(":sumPropertyName", sumPropertyName);
+            setParameter(query,paramName,paramValue);
+            query.setParameter(":groupByName", groupByName);
+
+            Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
+            return sumResult == null ? 0.0 : sumResult.doubleValue();
+        }else{
+            throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
+        }
+    }
+
+    @Override
+    public double findMaxByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) {
+        return findMaxByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value});
+    }
+
+    @Override
+    public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
+        if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
+            StringBuffer sb = new StringBuffer("select max(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
+            appendQL(sb,paramName,paramValue);
+            sb.append(" group by :groupByName");
+
+            Query query = entityManager.createQuery(sb.toString());
+            query.setParameter(":sumPropertyName", sumPropertyName);
+            setParameter(query,paramName,paramValue);
+            query.setParameter(":groupByName", groupByName);
+
+            Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
+            return sumResult == null ? 0.0 : sumResult.doubleValue();
+        }else{
+            throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
+        }
+    }
+
+    @Override
+    public double findMinByProperty(String sumPropertyName, String groupByName, String propertyName, Object value) {
+        return findMinByProperties(sumPropertyName,groupByName,new String[]{propertyName},new Object[]{value});
+    }
+
+    @Override
+    public double findMinByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
+        if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
+            StringBuffer sb = new StringBuffer("select min(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
+            appendQL(sb,paramName,paramValue);
+            sb.append(" group by :groupByName");
+
+            Query query = entityManager.createQuery(sb.toString());
+            query.setParameter(":sumPropertyName", sumPropertyName);
+            setParameter(query,paramName,paramValue);
+            query.setParameter(":groupByName", groupByName);
+
+            Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
+            return sumResult == null ? 0.0 : sumResult.doubleValue();
+        }else{
+            throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
+        }
+    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-form</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>

modules/i3plus-pojo-hardswitch/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-hardswitch</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>

modules/i3plus-pojo-jobflow/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-jobflow</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 基类：组件参数
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-12-17 11:39
+ * @Modify:
+ **/
+@Data
+public abstract class BaseComponetsParam implements Serializable {
+
+    @ApiParam(value = "单据号")
+    public String orderNo;
+
+    @ApiParam(value = "单据类型")
+    public String orderType;
+
+    @ApiParam(value = "条码")
+    public String sn;
+
+    @ApiParam(value = "条码类型")
+    public String snType;
+
+    @ApiParam(value = "用户编号")
+    public String userNo;
+
+    @ApiParam(value = "设备编号")
+    public String fixNo;
+
+    @ApiParam(value = "工厂代码")
+    public String organizeCode;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 收货扫描条码组件 参数封装
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-12-17 11:50
+ * @Modify:
+ **/
+@Data
+public class TransSnModle extends BaseComponetsParam{
+
+    @ApiParam(value = "移动单号")
+    public String moveNo;
+
+    @ApiParam(value = "交易类型代码")
+    public String transTypeCode;
+}

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

@@ -31,23 +31,27 @@ public class SysLogUserLogin extends BaseBean {
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , access ="用户ID")
     private Long userId;
- 
+
     @Column(name="LOG_LOGIN_NAME")
     @ApiParam(value ="登录名称" , access ="登录名称")
     private String logLoginName;
- 
+
     @Column(name="LOG_LOGIN_STATUS")
     @ApiParam(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1")
     private Integer logLoginStatus;
- 
+
     @Column(name="LOG_LOGIN_PLATFORM")
     @ApiParam(value ="登录平台ID（枚举）" , example ="1")
     private Integer logLoginPlatform;
- 
+
     @Column(name="LOG_LOGIN_HOST")
     @ApiParam(value ="登录IP" , access ="登录IP")
     private String logLoginHost;
- 
+
+    @Column(name="LOG_LOGIN_BROWSER")
+    @ApiParam(value ="登录浏览器" , access ="登录的浏览器")
+    private String logLoginBrowser;
+
     @Column(name="LOG_LOGIN_DATE_TIME")
     @ApiParam(value ="登录时间" , access ="登录时间")
     private String logLoginDateTime;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java

@@ -1,6 +1,7 @@
-package cn.estsh.i3plus.pojo.platform.bean;
+package cn.estsh.i3plus.pojo.platform.platbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,6 +34,14 @@ public class SysLogException extends BaseBean {
     @ApiParam(value ="系统模块（枚举）", example = "1")
     private Integer excModule;
 
+    private String excModuleName;
+    public String getExcModuleName(){
+        if(this.excModule != null){
+            return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.excModule);
+        }
+        return excModuleName;
+    }
+
     @Column(name="EXC_CLASS_NAME")
     @ApiParam(value ="异常类名")
     private String excClassName;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java

@@ -1,6 +1,7 @@
-package cn.estsh.i3plus.pojo.platform.bean;
+package cn.estsh.i3plus.pojo.platform.platbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -35,6 +36,14 @@ public class SysLogOperate extends BaseBean {
     @ApiParam(value ="系统模块（枚举）", example = "1")
     private Integer operateModule;
 
+    private String operateModuleName;
+    public String getOperateModuleName(){
+        if(this.operateModule != null){
+            return CommonEnumUtil.SOFT_TYPE.valueOfDescription(this.operateModule);
+        }
+        return operateModuleName;
+    }
+
     //ImppEnumUtil.OPERATE_TYPE（枚举）
     @Column(name="OPERATE_TYPE")
     @ApiParam(value ="操作类型" , example = "-1")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.platform.bean;
+package cn.estsh.i3plus.pojo.platform.platbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogExceptionRepository.java

@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.platform.repositorymongo;
+package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
-import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
 
 /**
  * @Description : 异常记录表(使用Mongodb)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogOperateRepository.java

@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.platform.repositorymongo;
+package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
-import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
 
 /**
  * @Description : 操作日志表(使用Mongodb)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogSystemRepository.java

@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.platform.repositorymongo;
+package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
-import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
 
 /**
  * @Description : 系统日志表

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java

@@ -1,9 +1,9 @@
 package cn.estsh.i3plus.pojo.platform.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
-import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
-import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
-import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem;
+import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
 import com.mongodb.BasicDBObject;
 import org.bson.conversions.Bson;
 

modules/i3plus-pojo-report/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-report</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>

modules/i3plus-pojo-softswitch/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-softswitch</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>

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

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -32,13 +31,17 @@ public class WmsOperationBean extends BaseBean {
     public String alId;
 
     /**
-     * 触发源:10=扫描枪,
+     * 触发源:
-     * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)
+     * 10=扫描枪,
+     * 20=提交按钮,
+     * 30=重置按钮,
+     * 40=查看明细,
+     * 50=明细(删除),
      * 60=明细（清空）
      */
     @ApiParam("触发源")
     public int sourceOwner;
 
     @ApiParam("选中的明细数据")
-    public List<Map<String, Object>> details;
+    public List<String> details;
 }

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

@@ -42,10 +42,10 @@ public class WmsQCMaster extends BaseBean {
     public Integer orderType;
 
     /**
-     * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消
+     * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消
      */
     @Column(name="ORDER_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
     public Integer orderStatus;
 
     @Column(name="REMARK")

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

@@ -37,10 +37,10 @@ public class WmsQCTrans extends BaseBean {
     public String item;
 
     /**
-     * 状态:0=创建,10=已处理
+     * 状态:1=创建,10=已处理
      */
     @Column(name="ITEM_STATUS")
-    @ApiParam(value = "状态", example = "0")
+    @ApiParam(value = "状态", example = "1")
     public Integer itemStatus;
 
     @Column(name="REMARK")

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

@@ -832,6 +832,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
+        HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result.toString();

modules/i3plus-pojo-workflow/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>i3plus-pojo</artifactId>
+        <groupId>i3plus.pojo</groupId>
+        <version>1.0-DEV-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>i3plus-pojo-workflow</artifactId>
+    <packaging>jar</packaging>
+
+
+</project>

pom.xml

@@ -23,6 +23,12 @@
         <module>modules/i3plus-pojo-model</module>
         <module>modules/i3plus-pojo-mes</module>
         <module>modules/i3plus-pojo-wms</module>
+        <module>modules/i3plus-pojo-form</module>
+        <module>modules/i3plus-pojo-hardswitch</module>
+        <module>modules/i3plus-pojo-jobflow</module>
+        <module>modules/i3plus-pojo-report</module>
+        <module>modules/i3plus-pojo-softswitch</module>
+        <module>modules/i3plus-pojo-workflow</module>
     </modules>
 
     <dependencies>

readme.txt

@@ -1,5 +1,5 @@
 模型工程
-主要用于各类对象木星
+主要用于各类对象模型
 
 i3plus-pojo-mes:生产相关的对象模型
 i3plus-pojo-wms:仓库相关的对象模型