减少四车间硫化换模次数

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 订单关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EBaseOrder {
     Works,
     Material,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 规则关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EBaseRule {
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 班次关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EDayShift {
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导出明细关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EExportDetail {
     Project
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导出关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EExportProject {
     Link,
     Details

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 炉计划关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EFurnacePlan {
     WorkPlans,
     MergePlan,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导入明细关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EImportDetail {
     Project,
     Fields

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导入字段关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EImportField {
     ImportDetail
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导入关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EImportProject {
     Link,
     Details

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 插单关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EInsertedOrder {
     ProductRouting
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 计算中间结果明细
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EInterMediateDetail {
     Result
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 计算中间结果
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EInterMediateResult {
     Work,
     Resource,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 库存关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EInventory {
     SafeStockOrders
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 物料关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EMaterial {
     Group,
     Childs,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 物料交期承诺
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EMaterialDeliveryPromise {
     Material,
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工序输入关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOperInput {
     Operation,
     InputMaterial,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工序输出关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOperOutput {
     Operation,
     OutputMaterial,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工序资源关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOperResource {
     Operation,
     Resource,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工序关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOperation {
     ProductRouting,
     OperInputs,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 成品检验报工关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOrderFeedback {
     Order
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 父工作关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EParentWork {
     ProductOrder,
     Operation,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工作报工关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EPlanFeedback {
     Work
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 生产订单关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EProductOrder {
     ProductRouting,
     ParentWorks

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工艺路线关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EProductRouting {
     Material,
     Operations,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 资源日历关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EResCalendar {
     DayShifts,
     Resources

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 资源关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EResource {
     WorkShop,
     WorkPlans

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 规则明细关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum ERuleDetail {
     RuleGroup,
     Rule

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 规则组合关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum ERuleGroup {
     Details
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 安全库存关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum ESafeStockOrder {
     Inventory
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java

@@ -1,8 +1,15 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 运输时间关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EShippingTime {
-    PrevRes,    // 前资源
+    PrevRes,
-    PostRes,    // 后资源
+    PostRes,
-    PrevStand,  // 前标准工序
+    PrevStand,
-    PostStand   // 后标准工序
+    PostStand
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 标准工序关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EStandOperation {
     WorkShop
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java

@@ -1,20 +1,27 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工作关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EWork {
-    Order,      // 订单
+    Order,
-    ParentWork, // 父工作
+    ParentWork,
-    WorkResources,  // 工作资源
+    WorkResources,
-    WorkInputs, // 工作输入
+    WorkInputs,
-    WorkOutputs,    // 工作输出
+    WorkOutputs,
-    PrevRelations,  // 前关联
+    PrevRelations,
-    PostRelations,  // 后关联
+    PostRelations,
-    Operation,      // 工序
+    Operation,
-    OriginOperation,    // 原始工序
+    OriginOperation,
-    PlanFeedback,  // 工作计划反馈
+    PlanFeedback,
-    MainPlan,    // 关联的为主资源的计划
+    MainPlan,
-    WorkPlans,   // 关联的工作计划
+    WorkPlans,
-    SpecifyResource, // 指定资源
+    SpecifyResource,
-    DynSplitWorks, // 动态拆分后的工作
+    DynSplitWorks,
-    OriginWork, // 动态拆分前的工作
+    OriginWork,
-    EvaluateResult, // 资源评估结果
+    EvaluateResult,
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工作输入关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EWorkInput {
     Work,
     WorkRelations,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工作输出关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EWorkOutput {
     Work,
     WorkRelations,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 生产计划关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EWorkPlan {
     Work,
     MainWork,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工作关联关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EWorkRelation {
     Material,
     PrevOrder,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工作资源关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EWorkResource {
     Work,
     Resource,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java

@@ -6,8 +6,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Bom接口数据
+ * @Description : Bom接口数据
- */
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class BomModel {
     @Data

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java

@@ -3,8 +3,12 @@ package cn.estsh.i3plus.pojo.aps.model;
 import lombok.Data;
 
 /**
- * 表格右键菜单
+ * @Description : 表格右键菜单
- */
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class ContextMenu {
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java

@@ -64,7 +64,9 @@ public class DelaySalesOrder {
     @ApiParam(value ="允许的最大延期时间")
     private String allowDelayTime;
 
-    // 0正常显示，1显示黄色，2显示红色
+    /**
+     * 0正常显示，1显示黄色，2显示红色
+     */
     @ApiParam(value ="背景显示颜色")
     private Integer backgroundColor;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java

@@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model;
 
 import lombok.Data;
 
+/**
+ * @Description : 枚举模型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class EnumModel {
     private String code;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java

@@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model;
 
 import lombok.Data;
 
+/**
+ * @Description : 表达式函数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class FunctionModel {
     private String code;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java

@@ -8,6 +8,13 @@ import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * @Description : 甘特图日历请求参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class GanttCalendarModel {
     private String resourceId;
@@ -18,9 +25,11 @@ public class GanttCalendarModel {
     @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date endDate;
     private String cls;
-    //private String timeRangeColor;
     private String eventColor;
     private String name;
 
-    private Double percentDone;//完成百分比
+    /**
+     * 完成百分比
+     */
+    private Double percentDone;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java

@@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model;
 
 import lombok.Data;
 
+/**
+ * @Description : 甘特图拖拽工作块请求参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class GanttDragModel {
     private Long workId;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java

@@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model;
 
 import lombok.Data;
 
+/**
+ * @Description : 甘特图连线
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class GanttLineModel {
     private long from;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java

@@ -10,6 +10,13 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @Description : 订单甘特图工作块
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class GanttOrderModel {
     private String id;
@@ -23,11 +30,22 @@ public class GanttOrderModel {
     @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date endDate;
     private String color;
-    private Double percentDone;//完成百分比
+    /**
-    private Boolean expanded;//是否展开树
+     * 完成百分比
-    private Boolean rollup;//自动把数据相加 在children的上层 当前
+     */
-    private String duration;//持续时间 天/小时/分钟
+    private Double percentDone;
-//    private String durationUnit;
+    /**
+     * 是否展开树
+     */
+    private Boolean expanded;
+    /**
+     * 自动把数据相加 在children的上层 当前
+     */
+    private Boolean rollup;
+    /**
+     * 持续时间 天/小时/分钟
+     */
+    private String duration;
     private Boolean manuallyScheduled;
     private List<GanttOrderModel> children = new ArrayList<>();
     private List<GanttLineModel> lineModels = new ArrayList<>();

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java

@@ -9,6 +9,13 @@ import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @Description : 甘特图生产计划
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 @Data
 public class GanttPlanModel {
     private Long resourceId;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java

@@ -3,8 +3,12 @@ package cn.estsh.i3plus.pojo.aps.model;
 import lombok.Data;
 
 /**
- * KPI接口数据
+ * @Description : KPI接口数据
- */
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
 @Data
 public class KPIModel {
     private Integer salesOrderCount;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java

@@ -60,7 +60,9 @@ public class LargeSpanOrder {
     @ApiParam(value ="跨度时间")
     private String spanTime;
 
-    // 0正常显示，1显示黄色，2显示红色
+    /**
+     * 0正常显示，1显示黄色，2显示红色
+     */
     @ApiParam(value ="背景显示颜色")
     private Integer backgroundColor;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java

@@ -52,7 +52,9 @@ public class MaterialDeliveryAnalyze {
     @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date arrivalDate;
 
-    // 0正常显示，1显示红色
+    /**
+     * 0正常显示，1显示红色
+     */
     @ApiParam(value ="背景显示颜色")
     private Integer backgroundColor;
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java

@@ -54,7 +54,9 @@ public class PrematureProduct {
     @ApiParam(value ="提前完成时间")
     private String times;
 
-    // 0正常显示，1显示红色
+    /**
+     * 0正常显示，1显示红色
+     */
     @ApiParam(value ="背景显示颜色")
     private Integer backgroundColor;
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java

@@ -20,13 +20,24 @@ import java.util.Date;
 @Data
 @Api("报表分页查询参数")
 public class ReportPager extends APSPager {
+    /**
+     * 统计开始时间
+     */
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)
-    private Date begin;     // 统计开始时间
+    private Date begin;
+
+    /**
+     * 统计结束时间
+     */
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)
-    private Date end;       // 统计结束时间
+    private Date end;
     private ApsEnumUtil.MATERIAL_REPORT_TYPE type;
-    private ApsEnumUtil.REPORT_TIME_SPAN span;  // 统计时间间隔
+
+    /**
+     * 统计时间间隔
+     */
+    private ApsEnumUtil.REPORT_TIME_SPAN span;
     private String shiftCode;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java

@@ -9,15 +9,30 @@ import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * @Description : 资源负荷请求参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
 @Data
 public class ResourceLoadRequest {
     private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
+
+    /**
+     * 统计开始时间
+     */
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)
-    private Date begin;     // 统计开始时间
+    private Date begin;
+
+    /**
+     * 统计结束时间
+     */
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)
-    private Date end;       // 统计结束时间
+    private Date end;
 
     private Long[] resourceIds;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java

@@ -3,6 +3,13 @@ package cn.estsh.i3plus.pojo.aps.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+/**
+ * @Description : 规则执行结果明细
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
 @Data
 public class RuleDetailModel {
     @ApiParam(value ="主执行进度")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java

@@ -6,6 +6,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
 @Data
 public class ShiftReportModel {
     private List<String> dates = new ArrayList<>();

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java

@@ -6,6 +6,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2021-04-15
+ * @Modify:
+ **/
 @Data
 public class StatisticReportReponse {
     private List<String> headers = new ArrayList<>();