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

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

@@ -94,7 +94,37 @@ public class BaseResultBean<Obj> {
         return totalCount;
     }
 
-    public static BaseResultBean buildBaseResultBean(boolean success,String msg){
+    public BaseResultBean setMsg(String msg) {
+        this.msg = msg;
+        return this;
+    }
+
+    public BaseResultBean setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+        return this;
+    }
+
+    public BaseResultBean setResultList(List<Obj> resultList) {
+        this.resultList = resultList;
+        return this;
+    }
+
+    public BaseResultBean setResultObject(Obj resultObject) {
+        this.resultObject = resultObject;
+        return this;
+    }
+
+    public BaseResultBean setListPager(ListPager<Obj> listPager) {
+        this.listPager = listPager;
+        return this;
+    }
+
+    public BaseResultBean setResultMap(Map<String, Object> resultMap) {
+        this.resultMap = resultMap;
+        return this;
+    }
+
+    public static BaseResultBean buildBaseResultBean(boolean success, String msg){
         BaseResultBean rs = new BaseResultBean();
         rs.success = success;
         if (success) {

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

@@ -1871,4 +1871,37 @@ public class WmsEnumUtil {
     }
 
 
+
+    /**
+     * 可选项类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_ROLE_TYPE {
+        WAREHOUSE(1, "WAREHOUSE", "仓库"),
+        STOCK(2, "STOCK", "库存");
+
+        private String code;
+        private String description;
+        int value;
+
+        DATA_ROLE_TYPE(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;
+        }
+    }
+
+
 }

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

@@ -47,4 +47,8 @@ public interface BaseMongoRepository<T, ID extends Serializable> extends MongoRe
     List<T> listPager(Pager pager);
 
     List<T> listPager(Pager pager,String orderByParam, int ascOrDesc);
+
+    long deleteByProperty(Bson bson);
+    long deleteByPropertyIn(String propName, Object[] propValues);
+    long deleteByIds(ID[] ids);
 }

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

@@ -104,7 +104,7 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
                 Object val = idField.get(item);
                 if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){
                     // long类型主键，以snowflake为主键
-                    idField.set(item, snowflakeIdMaker.nextId());
+                    idField.set(item, snowflakeIdMaker.nextId() + System.currentTimeMillis());
                 } else if(type == String.class && (val==null || "".equals(val))){
                     // String类型主键，以UUID为主键
                     idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase());
@@ -324,4 +324,23 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
         findIter.forEach(saveBlock);
         return packObjectListFromDocument(dList);
     }
+
+    @Override
+    public long deleteByProperty(Bson bson) {
+        return mongoOperations.getCollection(this.entityInformation.getCollectionName()).deleteMany(bson).getDeletedCount();
+    }
+
+    @Override
+    public long deleteByPropertyIn(String propName, Object[] propValues) {
+        Bson bson = Filters.and(
+                Filters.in(propName, propValues)
+        );
+        return deleteByProperty(bson);
+    }
+
+    @Override
+    public long deleteByIds(ID[] ids) {
+        return deleteByPropertyIn("id",ids);
+    }
+
 }

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

@@ -34,29 +34,29 @@ public class SysConfig extends BaseBean {
     private String name;
 
     @Column(name="CONFIG_TYPE")
-    @ApiParam(value ="配置类型ID（枚举：1.系统配置...）" , example ="-1")
+    @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1")
     private Integer configType;
 
     @Column(name="CONFIG_CODE")
-    @ApiParam(value ="配置代码")
+    @ApiParam(value ="参数代码")
     private String configCode;
 
     // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
     @Column(name="CONFIG_GROUP")
-    @ApiParam(value ="配置组")
+    @ApiParam(value ="参数组")
     private Integer configGroup;
 
     // 枚举 ImppEnumUtil.SYS_VALUE_TYPE
     @Column(name="CONFIG_VALUE_TYPE")
-    @ApiParam(value ="配置值类型")
+    @ApiParam(value ="参数值类型")
     private String configValueType;
 
     @Column(name="CONFIG_VALUE")
-    @ApiParam(value ="配置值")
+    @ApiParam(value ="参数值")
     private String configValue;
 
     @Column(name="CONFIG_DESCRIPTION")
-    @ApiParam(value ="配置描述")
+    @ApiParam(value ="参数描述")
     private String configDescription;
 
 }

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

@@ -50,7 +50,7 @@ public class SysDepartment extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 
-    @Column(name="ORGANIZATION_NAME_RDD")
+    @Column(name="ORGANIZE_NAME_RDD")
     @ApiParam(value ="所属组织名称" , access ="所属组织名称")
     private String organizeNameRdd;
 

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

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+
+/**
+ * @Description : 测试类
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-02-24 16:21
+ * @Modify:
+ **/
+public class TestInfo extends BaseBean {
+
+    /**
+     * 内存信息
+     */
+    private double ram;
+
+    /**
+     * cpu信息
+     */
+    private double cpu;
+
+    /**
+     * 线程id
+     */
+    private String threadId;
+
+    /**
+     * 方法名
+     */
+    private String method;
+}

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

@@ -44,4 +44,39 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam("中文流程描述")
     private String agDescC;
 
+    @Column(name="INIT_AM_ID")
+    @ApiParam(value = "初始化组件编号", example = "0")
+    private Long initAmId;
+
+    @Column(name="DETAILS_AM_ID")
+    @ApiParam(value = "明细处理组件编号", example = "0")
+    private Long detailsAmId;
+
+    @Column(name="END_AM_ID")
+    @ApiParam(value = "结束组件编号", example = "0")
+    private Long endAmId;
+
+    public Long getInitAmId() {
+        if (initAmId != null) {
+            return initAmId.longValue();
+        } else {
+            return initAmId;
+        }
+    }
+
+    public Long getDetailsAmId() {
+        if (detailsAmId != null) {
+            return detailsAmId.longValue();
+        } else {
+            return detailsAmId;
+        }
+    }
+
+    public Long getEndAmId() {
+        if (endAmId != null) {
+            return endAmId.longValue();
+        } else {
+            return endAmId;
+        }
+    }
 }

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

@@ -81,5 +81,11 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "跳转按钮名称")
     private String goToBtnName;
 
+    @Column(name = "PRE_SHOW")
+    @ApiParam(value = "是否预显示", example = "1")
+    private Integer preShow;
 
+    @Column(name = "SHOW_AM_ID")
+    @ApiParam(value = "回显组件方法ID", example = "1")
+    private Long showAmId;
 }

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

@@ -126,4 +126,40 @@ public class WmsActionLog extends BaseBean {
     @Column(name="CURRENT_STEP")
     @ApiParam(value = "当前步骤", example = "1")
     public Integer currentStep;
+
+    @Column(name="INIT_AM_ID")
+    @ApiParam(value = "初始化组件编号", example = "0")
+    private Long initAmId;
+
+    @Column(name="DETAILS_AM_ID")
+    @ApiParam(value = "明细处理组件编号", example = "0")
+    private Long detailsAmId;
+
+    @Column(name="END_AM_ID")
+    @ApiParam(value = "结束组件编号", example = "0")
+    private Long endAmId;
+
+    public Long getInitAmId() {
+        if (initAmId != null) {
+            return initAmId.longValue();
+        } else {
+            return initAmId;
+        }
+    }
+
+    public Long getDetailsAmId() {
+        if (detailsAmId != null) {
+            return detailsAmId.longValue();
+        } else {
+            return detailsAmId;
+        }
+    }
+
+    public Long getEndAmId() {
+        if (endAmId != null) {
+            return endAmId.longValue();
+        } else {
+            return endAmId;
+        }
+    }
 }

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

@@ -36,15 +36,6 @@ public class WmsActionLogDetails extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long alId;
 
-    //get单独处理
-    public Long getAlId() {
-        if (alId != null) {
-            return alId.longValue();
-        } else {
-            return alId;
-        }
-    }
-
     @Transient
     @ApiParam(value = "流程名称")
     public String agNameC;
@@ -61,12 +52,17 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "失败跳转步骤", example = "1")
     public Integer ngSeq;
 
-    // 10=只输入一次,20=输入多次,30=输入多次不允许重复,40=本流程结束
+    /**
+     * 10=只输入一次,20=输入多次,
+     * 30=输入多次不允许重复,40=本流程结束
+     */
     @Column(name = "VALUE_TYPE")
     @ApiParam(value = "动作类型", example = "1")
     public Integer valueType;
 
-    // 1=是,2=否
+    /**
+     * 1=是,2=否
+     */
     @Column(name = "TO_UPPER")
     @ApiParam(value = "是否转为大写", example = "1")
     public Integer toUpper;
@@ -80,15 +76,6 @@ public class WmsActionLogDetails extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long asId;
 
-    //get单独处理
-    public Long getAsId() {
-        if (asId != null) {
-            return asId.longValue();
-        } else {
-            return asId;
-        }
-    }
-
     @Column(name = "ALD_STATUS")
     @ApiParam(value = "执行状态", example = "1")
     public Integer aldStatus;
@@ -109,14 +96,27 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "跳转按钮名称")
     private String goToBtnName;
 
-    public WmsActionLogDetails() {
+    @Column(name = "PRE_SHOW")
+    @ApiParam(value = "是否预显示", example = "1")
+    private Integer preShow;
+
+    @Column(name = "SHOW_AM_ID")
+    @ApiParam(value = "回显组件方法ID", example = "1")
+    private Long showAmId;
 
+    public Long getAsId() {
+        if (asId != null) {
+            return asId.longValue();
+        } else {
+            return asId;
+        }
     }
 
-    public WmsActionLogDetails(Long amId,String createUser, Long id, Integer seq) {
+    public Long getAlId() {
-        this.asId = amId;
+        if (alId != null) {
-        this.createUser = createUser;
+            return alId.longValue();
-        this.id = id;
+        } else {
-        this.seq = seq;
+            return alId;
+        }
     }
 }