diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java new file mode 100644 index 0000000..ef929bb --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicator; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms健康指标模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthIndicatorModel implements Serializable { + + private static final long serialVersionUID = -6376849949646448495L; + + @ApiParam(value = "模块名称") + public String groupName; + + @ApiParam(value = "指标代码") + public String indicatorCode; + + @ApiParam(value = "指标名称") + public String indicatorName; + + @ApiParam(value = "开始时间") + public String startDateTime; + + @ApiParam(value = "结束时间") + public String endDateTime; + + @ApiParam(value = "健康指标集合") + public List healthIndicatorList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java new file mode 100644 index 0000000..5e0d8f8 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthIndicatorReportModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : Wms健康指标报表模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-15 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthIndicatorReportModel implements Serializable { + + private static final long serialVersionUID = -6376850049646448495L; + + @ApiParam(value = "图表标题名称") + public String titleName; + + @ApiParam(value = "图例集合") + public List legendList; + + @ApiParam(value = "X轴数据集合") + public List xAxisList; + + @ApiParam(value = "图表数据集合") + public List> seriesDataList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java new file mode 100644 index 0000000..d4cff64 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableParamsModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms健康变量参数 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthVariableParamsModel implements Serializable { + + private static final long serialVersionUID = -6376849939646448495L; + + @ApiParam(value = "开始时间") + public String startDateTime; + + @ApiParam(value = "结束时间") + public String endDateTime; + + @ApiParam(value = "适应存储区") + private String applyArea; + + @ApiParam(value = "适应物料组") + private String applyPartGroup; + + @ApiParam(value = "变量参数") + private String variableParam; + + @ApiParam(value = "工厂代码") + private String organizeCode; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java new file mode 100644 index 0000000..c64a611 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsHealthVariableResultModel.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms健康变量参数 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-05-14 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class WmsHealthVariableResultModel implements Serializable { + + private static final long serialVersionUID = -6376849949646448495L; + + @ApiParam(value = "订单号") + public String orderNo; + + @ApiParam(value = "供应商名称") + public String vendorName; + + @ApiParam(value = "需求数量") + private Double qty; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partNameRdd; + + @ApiParam(value = "计划到货日期") + private String planDateTime; + + @ApiParam(value = "实际到货日期") + private String actDateTime; + + @ApiParam(value = "物料组编号") + private String partGroupNo; +} diff --git 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 index 9b4ac5c..e82b4f0 100644 --- 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 @@ -10,9 +10,7 @@ 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; +import javax.persistence.*; /** * @Description : 仓库健康度指标 @@ -23,7 +21,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_HEALTH_INDICATOR") +@Table(name="WMS_HEALTH_INDICATOR", indexes = { + @Index(columnList = "INDICATOR_CODE"), + @Index(columnList = "GROUP_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) @@ -51,4 +52,14 @@ public class WmsHealthIndicator extends BaseBean { @ApiParam(value = "指标测算公式") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String calcFormula; + + @Transient + @ApiParam(value = "指标等级") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorGrade; + + @Transient + @ApiParam(value = "指标颜色") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String indicatorColor; } diff --git 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 index fd49a58..317c3e9 100644 --- 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -23,7 +24,9 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_HEALTH_INDICATOR_LEVEL") +@Table(name="WMS_HEALTH_INDICATOR_LEVEL", indexes = { + @Index(columnList = "INDICATOR_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git 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 index 8d051a5..f5d7d59 100644 --- 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 @@ -10,10 +10,7 @@ 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; +import javax.persistence.*; /** * @Description : 仓库健康度指标结果 @@ -24,7 +21,9 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_HEALTH_INDICATOR_RESULT") +@Table(name="WMS_HEALTH_INDICATOR_RESULT", indexes = { + @Index(columnList = "INDICATOR_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) diff --git 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 index d57680e..831993b 100644 --- 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 @@ -85,6 +85,11 @@ public class WmsHealthVariable extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String sqlStatement; + @Column(name = "CLASS_PATH") + @ApiParam(value = "调用类名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String className; + @Column(name = "FUNCTION_NAME") @ApiParam(value = "方法名称") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) diff --git 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 index 7820d95..cd066ab 100644 --- 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 @@ -46,7 +46,7 @@ public class WmsHealthVariableResult extends BaseBean { @Column(name = "VARIABLE_VALUE") @ApiParam(value = "变量测算值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) - private Double variableValue; + private Integer variableValue; @Lob @Column(name = "VARIABLE_DETAILS") diff --git 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 index c81035f..104f22f 100644 --- 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 @@ -3296,6 +3296,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsHealthIndicatorResult(WmsHealthIndicatorResult healthIndicatorResult) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getIndicatorCode(), "indicatorCode", result); + DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getCreateDatetime(), "createDatetime", result); getStringBuilderPack(healthIndicatorResult, result); return result; }