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

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

@@ -18,23 +18,45 @@ public class BaseFallBackBean {
 //        LOGGER.error("【微服出错，熔断】{}",cause.getCause());
 //        cause.printStackTrace();
 
+    /**
+     * 基本熔断信息封装方法
+     * @param cause 错误原因
+     * @return 基础结果类
+     */
     public BaseResultBean makeBaseFallBack(Throwable cause){
-        LOGGER.error("【熔断信息】{}",cause.getMessage());
+        LOGGER.error("【熔断信息】{}", cause.getMessage());
-        LOGGER.error("【熔断原因】{}",cause.getCause());
+        LOGGER.error("【熔断原因】{}", cause.getCause());
-        return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。",cause);
+        cause.printStackTrace();
+        return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。", cause);
     }
 
-    public BaseResultBean makeBaseFallBack(String msg,Throwable cause){
+    /**
-        LOGGER.error("【熔断信息】{}",cause.getMessage());
+     *  自定义熔断信息封装方法
-        LOGGER.error("【熔断原因】{}",cause.getCause());
+     * @param msg 错误提示
-        return BaseResultBean.buildBaseResultBean(false,cause.getMessage() + "，信息：" + msg);
+     * @param cause 错误原因
+     * @return 基础结果类
+     */
+    public BaseResultBean makeBaseFallBack(String msg, Throwable cause){
+        LOGGER.error("【熔断信息】{}", cause.getMessage());
+        LOGGER.error("【熔断原因】{}", cause.getCause());
+        cause.printStackTrace();
+        return BaseResultBean.buildBaseResultBean(false, cause.getMessage() + "，信息：" + msg);
     }
 
+    /**
+     * 简化熔断信息方法
+     * @return 基础结果类
+     */
     public BaseResultBean makeBaseFallBack(){
         return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。");
     }
 
+    /**
+     * 自定义简化熔断方法
+     * @param msg 自定义信息
+     * @return 基础结果类
+     */
     public BaseResultBean makeBaseFallBack(String msg){
-        return BaseResultBean.buildBaseResultBean(false,msg);
+        return BaseResultBean.buildBaseResultBean(false, msg);
     }
 }

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 /**
  * @Description :
  * @Reference :
@@ -8,4 +10,40 @@ package cn.estsh.i3plus.pojo.base.enumutil;
  * @Modify:
  **/
 public class MesEnumUtil {
+    /**
+     * MesMethod实体对应的methodType值
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum METHOD_TYPE{
+
+        EXEC(10,"执行方法"),
+        COMPLETE(20,"完成方法");
+
+        private int value;
+        private String description;
+
+        METHOD_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -105,6 +105,15 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     int updateByProperties(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue);
 
     /**
+     * 通过属性进行多个值更新
+     * @param propertyName
+     * @param propertyValue
+     */
+    int updateByProperties(String propertyName, Object propertyValue,DdlPackBean packBean);
+    int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean);
+
+
+    /**
      * 通过多个属性进行单个值更新
      * @param conditionName
      * @param conditionValue

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

@@ -5,8 +5,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
 import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import com.alibaba.fastjson.JSONObject;
+import com.mongodb.BasicDBObject;
 import com.mongodb.Block;
 import com.mongodb.client.FindIterable;
+import com.mongodb.client.model.CountOptions;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Sorts;
 import org.apache.commons.lang3.StringUtils;
@@ -21,6 +23,7 @@ import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.repository.support.SimpleMongoRepository;
 
@@ -271,13 +274,9 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
 
         FindIterable findIter = null;
         if(bson == null) {
-            findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find()
+            findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find();
-                    .skip(pager.getStartRow())
-                    .limit(pager.getPageSize());
         }else{
-            findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson)
+            findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson);
-                    .skip(pager.getStartRow())
-                    .limit(pager.getPageSize());
         }
         if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
             //排序
@@ -286,8 +285,13 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
             }else{
                 findIter.sort(Sorts.descending(orderByParam));
             }
+        }else{
+            //根据id排序
+            findIter.sort(new BasicDBObject("_id", 1));
         }
+        findIter.skip(pager.getStartRow()).limit(pager.getPageSize());
         findIter.forEach(saveBlock);
+
         return packObjectListFromDocument(dList);
     }
 
@@ -310,9 +314,7 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
                 dList.add(document);
             }
         };
-        FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find()
+        FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find();
-                .skip(pager.getStartRow())
-                .limit(pager.getPageSize());
         if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){
             //排序
             if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){
@@ -320,7 +322,11 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
             }else{
                 findIter.sort(Sorts.descending(orderByParam));
             }
+        }else{
+            //根据id排序
+            findIter.sort(new BasicDBObject("_id", 1));
         }
+        findIter.skip(pager.getStartRow()).limit(pager.getPageSize());
         findIter.forEach(saveBlock);
         return packObjectListFromDocument(dList);
     }

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

@@ -222,6 +222,40 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
+    public int updateByProperties(String propertyName, Object propertyValue,DdlPackBean packBean) {
+        return updateByProperties(new String[] { propertyName }, new Object[] { propertyValue },packBean);
+    }
+
+    @Override
+    public int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) {
+        if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null)
+                && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)) {
+            StringBuffer sb = new StringBuffer();
+
+            sb.append("update " + persistentClass.getName() + " model set ");
+            for (int i = 0; i < propertyName.length; i++) {
+                sb.append(propertyName[i] + " = :p_" + propertyName[i] + ",");
+            }
+            sb.deleteCharAt(sb.length() - 1);
+            sb.append(" where 1=1 " + packBean.getWhereAppend());
+
+            Query query = entityManager.createQuery(sb.toString());
+            //更新值
+            for (int i = 0; i < propertyName.length; i++) {
+                query.setParameter("p_" + propertyName[i], propertyValue[i]);
+            }
+            //查询条件
+            for (String key : packBean.getHqlPreparedMap().keySet()) {
+                query.setParameter(key,packBean.getHqlPreparedMap().get(key));
+            }
+
+            return query.executeUpdate();
+        } else {
+            throw new IllegalArgumentException("参数值错误!,propertyName:" + propertyName + ",propertyValue:" + propertyValue);
+        }
+    }
+
+    @Override
     public int updateByHqlWhere(String hqlWhere, String propertyName, Object propertyValue) {
         return updateByHqlWhere(hqlWhere, new String[]{propertyName}, new Object[]{propertyValue});
     }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -41,6 +41,9 @@ public class BfIntercept extends BaseBean {
 
     @Column(name="EXECUTE_CONTENT")
     @ApiParam(value ="执行内容")
-    @JsonSerialize(using = ToStringSerializer.class)
+    private String executeContent;
-    private Integer executeContent;
+
+    @Column(name="INTERCEPT_DESCRIPTION")
+    @ApiParam(value ="拦截器描述")
+    private String interceptDescription;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java

@@ -48,9 +48,9 @@ public class BfInterceptDetail extends BaseBean {
     @ApiParam(value ="拦截器位置")
     private Integer interceptPosition;
 
-    public Integer getInterceptPosition() {
+    public int getInterceptPositionVal() {
         if(this.interceptPosition == null){
-            return null;
+            return 0;
         } else {
             return this.interceptPosition.intValue();
         }
@@ -69,4 +69,22 @@ public class BfInterceptDetail extends BaseBean {
     @ApiParam(value ="拦截器业务结果处理")
     private Integer interceptProcessResult;
 
+    public int getInterceptProcessResultVal(){
+        if(interceptProcessResult == null ){
+            return 0;
+        }
+        return interceptProcessResult.intValue();
+    }
+
+    @Column(name="INTERCEPT_EXECUTE_SORT")
+    @ApiParam(value ="拦截器业务执行顺序")
+    private Integer interceptExecuteSort;
+
+    public int getInterceptExecuteSortVal(){
+        if(interceptExecuteSort == null ){
+            return 0;
+        }
+        return interceptExecuteSort.intValue();
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.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 :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_ACTION")
+@Api("系统业务动作")
+public class MesAction extends BaseBean {
+    @Column(name="ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name="ACTION_NAME")
+    @ApiParam("动作名称")
+    private String actionName;
+
+    @Column(name="ACTION_TYPE")
+    @ApiParam("动作类型")
+    private Integer actionType;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.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 :mes系统业务动作方法
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_ACTION_METHOD")
+@Api("系统业务动作方法")
+public class MesActionMethod extends BaseBean {
+    @Column(name="ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name="METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name="SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.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 :mes系统业务事件
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EVENT")
+@Api("系统业务事件")
+public class MesEvent extends BaseBean {
+    @Column(name="EVENT_CODE")
+    @ApiParam("事件代码")
+    private String eventCode;
+
+    @Column(name="EVENT_NAME")
+    @ApiParam("事件名称")
+    private String eventName;
+
+    @Column(name="EVENT_TYPE")
+    @ApiParam("事件类型")
+    private Integer eventType;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.mes.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 :mes系统业务事件动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EVENT_ACTION")
+@Api("系统业务事件动作")
+public class MesEventAction extends BaseBean {
+    @Column(name="EVENT_CODE")
+    @ApiParam("事件代码")
+    private String eventCode;
+
+    @Column(name="ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name="SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.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 :mes系统业务方法
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_METHOD")
+@Api("系统业务方法")
+public class MesMethod extends BaseBean {
+    @Column(name="METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name="METHOD_NAME")
+    @ApiParam("方法名称")
+    private String methodName;
+
+    @Column(name="CALL_CLASS")
+    @ApiParam("具体实现类")
+    private String callClass;
+
+    @Column(name="METHOD_TYPE")
+    @ApiParam("方法类型")
+    private Integer methodType;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 动作请求参数
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+public class ActionRequestBean<Obj> implements Serializable {
+
+    @ApiParam("事件代码")
+    public String eventCode;
+
+    @ApiParam("单个结果")
+    public Obj resultObject;
+
+    @ApiParam("List请求集")
+    public List<Obj> resultList;
+
+    @ApiParam("Map请求集")
+    public Map<String, Object> resultMap;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionMethodRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesActionMethodRepository extends BaseRepository<MesActionMethod, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesAction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesActionRepository extends BaseRepository<MesAction, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEventAction;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEventActionRepository extends BaseRepository<MesEventAction, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesEvent;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEventRepository extends BaseRepository<MesEvent, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesMethod;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
+}

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

@@ -160,6 +160,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("前端表格编辑使用")
     private Boolean isSet = false;
 
+    @Transient
+    @ApiParam("生产日期")
+    public String dateCode;
+
+    @ApiParam(value = "散件移库输入移库数量")
+    @Transient
+    public Double inputMoveQty;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }