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

5 years ago · 3462e33aac
parent 0e5bf3488b 486e655394
commit 3462e33aac
11 changed files with 469 additions and 5 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java
@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+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 : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标",description = "仓库健康度指标")
+public class WmsHealthIndicator extends BaseBean {
+
+    private static final long serialVersionUID = 7332606119041273554L;
+
+    @Column(name = "INDICATOR_CODE")
+    @ApiParam(value = "指标代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorCode;
+
+    @Column(name = "INDICATOR_NAME")
+    @ApiParam(value = "指标名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorName;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam(value = "模块名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String groupName;
+
+    @Column(name = "CALC_FORMULA")
+    @ApiParam(value = "指标测算公式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String calcFormula;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java
@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+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 : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR_LEVEL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标分级",description = "仓库健康度指标分级")
+public class WmsHealthIndicatorLevel extends BaseBean {
+
+    private static final long serialVersionUID = 7332606229041273554L;
+
+    @Column(name = "INDICATOR_CODE")
+    @ApiParam(value = "指标代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorCode;
+
+    @Column(name = "INDICATOR_NAME")
+    @ApiParam(value = "指标名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorName;
+
+    @Column(name = "INDICATOR_LOWER_LIMIT")
+    @ApiParam(value = "指标下限")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double indicatorLowerLimit;
+
+    @Column(name = "INDICATOR_UPPER_LIMIT")
+    @ApiParam(value = "指标上限")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double indicatorUpperLimit;
+
+    @Column(name = "INDICATOR_GRADE")
+    @ApiParam(value = "指标等级")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorGrade;
+
+    @Column(name = "INDICATOR_COLOR")
+    @ApiParam(value = "指标颜色")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorColor;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java
@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度指标结果
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR_RESULT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标结果",description = "仓库健康度指标结果")
+public class WmsHealthIndicatorResult extends BaseBean {
+
+    private static final long serialVersionUID = 7332606339041273554L;
+
+    @Column(name = "INDICATOR_CODE")
+    @ApiParam(value = "指标代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorCode;
+
+    @Column(name = "INDICATOR_NAME")
+    @ApiParam(value = "指标名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorName;
+
+    @Column(name = "INDICATOR_VALUE")
+    @ApiParam(value = "指标测算值")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double indicatorValue;
+
+    @Lob
+    @Column(name = "INDICATOR_DETAILS")
+    @ApiParam(value = "指标测算明细")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorDetails;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java
@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度变量
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_VARIABLE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度变量",description = "仓库健康度变量")
+public class WmsHealthVariable extends BaseBean {
+
+    private static final long serialVersionUID = 7332606449041273554L;
+
+    @Column(name = "VARIABLE_CODE")
+    @ApiParam(value = "变量代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableCode;
+
+    @Column(name = "VARIABLE_NAME")
+    @ApiParam(value = "变量名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableName;
+
+    @Column(name = "CYCLE_RANGE")
+    @ApiParam(value = "周期(天)")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer cycleRange;
+
+    @Column(name = "CALC_FREQUENCY")
+    @ApiParam(value = "计算频次(天)")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer calcFrequency;
+
+    @Column(name = "LAST_CALC_TIME")
+    @ApiParam(value = "末次计算时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String LastCalcTime;
+
+    @Column(name = "NEXT_CALC_TIME")
+    @ApiParam(value = "下次计算时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String nextCalcTime;
+
+    @Column(name = "APPLY_AREA")
+    @ApiParam(value = "适应存储区")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String applyArea;
+
+    @Column(name = "APPLY_PART_GROUP")
+    @ApiParam(value = "适应物料组")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String applyPartGroup;
+
+    @Lob
+    @Column(name = "VARIABLE_PARAM")
+    @ApiParam(value = "变量参数")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableParam;
+
+    @Lob
+    @Column(name = "SQL_STATEMENT")
+    @ApiParam(value = "SQL语句")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String sqlStatement;
+
+    @Column(name = "FUNCTION_NAME")
+    @ApiParam(value = "方法名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String functionName;
+
+    @Column(name = "SCRIPT_NO")
+    @ApiParam(value = "脚本编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String scriptNo;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java
@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度变量测算结果
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_VARIABLE_RESULT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度变量测算结果",description = "仓库健康度变量测算结果")
+public class WmsHealthVariableResult extends BaseBean {
+
+    private static final long serialVersionUID = 7332606559041273554L;
+
+    @Column(name = "VARIABLE_CODE")
+    @ApiParam(value = "变量代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableCode;
+
+    @Column(name = "VARIABLE_NAME")
+    @ApiParam(value = "变量名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableName;
+
+    @Column(name = "VARIABLE_VALUE")
+    @ApiParam(value = "变量测算值")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double variableValue;
+
+    @Lob
+    @Column(name = "VARIABLE_DETAILS")
+    @ApiParam(value = "变量测算明细")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableDetails;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.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.WmsHealthIndicatorLevel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorLevelRepository extends BaseRepository<WmsHealthIndicatorLevel, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.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.WmsHealthIndicator;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorRepository extends BaseRepository<WmsHealthIndicator, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.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.WmsHealthIndicatorResult;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorResultRepository extends BaseRepository<WmsHealthIndicatorResult, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.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.WmsHealthVariable;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthVariableRepository extends BaseRepository<WmsHealthVariable, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.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.WmsHealthVariableResult;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthVariableResultRepository extends BaseRepository<WmsHealthVariableResult, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@ -21,11 +21,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;

-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;

 /**
@ -3254,4 +3250,65 @@ public class WmsHqlPack {
        getStringBuilderPack(thymeleaf, result);
        return result;
    }
+
+    /**
+     * 仓库健康指标信息分页查询条件
+     * @param healthIndicator
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthIndicator(WmsHealthIndicator healthIndicator) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(healthIndicator.getIndicatorCode(), "indicatorCode", result);
+        DdlPreparedPack.getStringEqualPack(healthIndicator.getGroupName(), "groupName", result);
+        getStringBuilderPack(healthIndicator, result);
+        return result;
+    }
+
+    /**
+     * 仓库健康指标分级信息分页查询条件
+     * @param healthIndicatorLevel
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthIndicatorLevel(WmsHealthIndicatorLevel healthIndicatorLevel) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(healthIndicatorLevel.getIndicatorCode(), "indicatorCode", result);
+        getStringBuilderPack(healthIndicatorLevel, result);
+        return result;
+    }
+
+    /**
+     * 仓库健康指标分级信息分页查询条件
+     * @param wmsHealthVariable
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthVariable(WmsHealthVariable wmsHealthVariable) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsHealthVariable.getVariableCode(), "variableCode", result);
+        getStringBuilderPack(wmsHealthVariable, result);
+        return result;
+    }
+
+    /**
+     * 仓库健康指标测算结果信息查询条件
+     * @param healthIndicatorResult
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthIndicatorResult(WmsHealthIndicatorResult healthIndicatorResult) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getIndicatorCode(), "indicatorCode", result);
+        getStringBuilderPack(healthIndicatorResult, result);
+        return result;
+    }
+
+    /**
+     * 仓库健康指标变量测算结果信息查询条件
+     * @param healthVariableResult
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthVariableResult(WmsHealthVariableResult healthVariableResult) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(healthVariableResult.getVariableCode(), "variableCode", result);
+        getStringBuilderPack(healthVariableResult, result);
+        return result;
+    }
 }