From 4a9ac431bb4759e142e6f7c35ab464bcb44292a0 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 24 Sep 2021 10:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=9B=9B=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E7=A1=AB=E5=8C=96=E6=8D=A2=E6=A8=A1=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/holders/EBaseOrder.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EBaseRule.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EDayShift.java | 7 ++++ .../i3plus/pojo/aps/holders/EExportDetail.java | 7 ++++ .../i3plus/pojo/aps/holders/EExportProject.java | 7 ++++ .../i3plus/pojo/aps/holders/EFurnacePlan.java | 7 ++++ .../i3plus/pojo/aps/holders/EImportDetail.java | 7 ++++ .../i3plus/pojo/aps/holders/EImportField.java | 7 ++++ .../i3plus/pojo/aps/holders/EImportProject.java | 7 ++++ .../i3plus/pojo/aps/holders/EInsertedOrder.java | 7 ++++ .../pojo/aps/holders/EInterMediateDetail.java | 7 ++++ .../pojo/aps/holders/EInterMediateResult.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EInventory.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EMaterial.java | 7 ++++ .../pojo/aps/holders/EMaterialDeliveryPromise.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EOperInput.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EOperOutput.java | 7 ++++ .../i3plus/pojo/aps/holders/EOperResource.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EOperation.java | 7 ++++ .../i3plus/pojo/aps/holders/EOrderFeedback.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EParentWork.java | 7 ++++ .../i3plus/pojo/aps/holders/EPlanFeedback.java | 7 ++++ .../i3plus/pojo/aps/holders/EProductOrder.java | 7 ++++ .../i3plus/pojo/aps/holders/EProductRouting.java | 7 ++++ .../i3plus/pojo/aps/holders/EResCalendar.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EResource.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/ERuleDetail.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/ERuleGroup.java | 7 ++++ .../i3plus/pojo/aps/holders/ESafeStockOrder.java | 7 ++++ .../i3plus/pojo/aps/holders/EShippingTime.java | 15 ++++++--- .../i3plus/pojo/aps/holders/EStandOperation.java | 7 ++++ .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 39 +++++++++++++--------- .../estsh/i3plus/pojo/aps/holders/EWorkInput.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EWorkOutput.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 7 ++++ .../i3plus/pojo/aps/holders/EWorkRelation.java | 7 ++++ .../i3plus/pojo/aps/holders/EWorkResource.java | 7 ++++ .../cn/estsh/i3plus/pojo/aps/model/BomModel.java | 8 +++-- .../estsh/i3plus/pojo/aps/model/ContextMenu.java | 8 +++-- .../i3plus/pojo/aps/model/DelaySalesOrder.java | 4 ++- .../cn/estsh/i3plus/pojo/aps/model/EnumModel.java | 7 ++++ .../estsh/i3plus/pojo/aps/model/FunctionModel.java | 7 ++++ .../i3plus/pojo/aps/model/GanttCalendarModel.java | 13 ++++++-- .../i3plus/pojo/aps/model/GanttDragModel.java | 7 ++++ .../i3plus/pojo/aps/model/GanttLineModel.java | 7 ++++ .../i3plus/pojo/aps/model/GanttOrderModel.java | 28 +++++++++++++--- .../i3plus/pojo/aps/model/GanttPlanModel.java | 7 ++++ .../cn/estsh/i3plus/pojo/aps/model/KPIModel.java | 8 +++-- .../i3plus/pojo/aps/model/LargeSpanOrder.java | 4 ++- .../pojo/aps/model/MaterialDeliveryAnalyze.java | 4 ++- .../i3plus/pojo/aps/model/PrematureProduct.java | 4 ++- .../estsh/i3plus/pojo/aps/model/ReportPager.java | 17 ++++++++-- .../i3plus/pojo/aps/model/ResourceLoadRequest.java | 19 +++++++++-- .../i3plus/pojo/aps/model/RuleDetailModel.java | 7 ++++ .../i3plus/pojo/aps/model/ShiftReportModel.java | 7 ++++ .../pojo/aps/model/StatisticReportReponse.java | 7 ++++ 56 files changed, 430 insertions(+), 42 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index d6720fa..5236a10 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java index 9753913..8342a93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java +++ b/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 { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java index 1c7f79e..052c635 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java +++ b/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 { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java index 70098c7..47a3150 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java index be46ca5..dea1750 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java +++ b/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 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java index f944cd0..f5e11f8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java index 50772bb..00bcc79 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java +++ b/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 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java index eeff1ef..c723817 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java index 5f00e96..8df1fcb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java +++ b/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 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java index c8a6248..a1abc31 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java index 0683e8f..0d9adab 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java index 0465f7d..a32686e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java index 9c0719a..f7d036d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index 16f5f77..e4702ed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java index abc6ec5..848cc93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java +++ b/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, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java index 9ce8642..eb13f50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java index df02363..e91b487 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java index 36345e9..97db425 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java index 85a4795..8f84aa3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java index 5719df5..365c2e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java index 334c388..378c042 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java index 5ce71a5..62bba5c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java index 5b2f068..3577b9c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java +++ b/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 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java index 9fe315f..1882b55 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java index 1717230..50e753e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java +++ b/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 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index ded90db..b03a61e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/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 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java index d63f726..a23953c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java +++ b/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 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java index db3dba0..e981d66 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java index bec040c..87bfc37 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java index 100379b..430cef1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java +++ b/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, // 前资源 - PostRes, // 后资源 - PrevStand, // 前标准工序 - PostStand // 后标准工序 + PrevRes, + PostRes, + PrevStand, + PostStand } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java index 6e9ac1b..d710c15 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java +++ b/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 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 689d599..a0406b3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/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, // 订单 - ParentWork, // 父工作 - WorkResources, // 工作资源 - WorkInputs, // 工作输入 - WorkOutputs, // 工作输出 - PrevRelations, // 前关联 - PostRelations, // 后关联 - Operation, // 工序 - OriginOperation, // 原始工序 - PlanFeedback, // 工作计划反馈 - MainPlan, // 关联的为主资源的计划 - WorkPlans, // 关联的工作计划 - SpecifyResource, // 指定资源 - DynSplitWorks, // 动态拆分后的工作 - OriginWork, // 动态拆分前的工作 - EvaluateResult, // 资源评估结果 + Order, + ParentWork, + WorkResources, + WorkInputs, + WorkOutputs, + PrevRelations, + PostRelations, + Operation, + OriginOperation, + PlanFeedback, + MainPlan, + WorkPlans, + SpecifyResource, + DynSplitWorks, + OriginWork, + EvaluateResult, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java index ddfbd3a..6a54dbb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java index e2f1de2..7e731b0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index cec9e5a..7398237 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java index 1fc05e6..6fc5188 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java index 2f77bcc..0a2a131 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java +++ b/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, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java index 59d8be4..cfd3fe7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java +++ b/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 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java index 2331242..feaeef9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java +++ b/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 { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java index 540a328..b888f46 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java index db5b676..aad92f9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java index b810c25..6799813 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 7a80b06..8d16f9c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java index 53496da..0171f62 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java index 0c5ab45..d0d00e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java index d486f26..df3d311 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java +++ b/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 String durationUnit; + /** + * 完成百分比 + */ + private Double percentDone; + /** + * 是否展开树 + */ + private Boolean expanded; + /** + * 自动把数据相加 在children的上层 当前 + */ + private Boolean rollup; + /** + * 持续时间 天/小时/分钟 + */ + private String duration; private Boolean manuallyScheduled; private List children = new ArrayList<>(); private List lineModels = new ArrayList<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 6e2e3bb..077e605 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java index 7a4c619..c1dae27 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java index 5ddc2dd..e81abef 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java index c7a0500..5142f87 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java index 4080aa9..896cd06 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java +++ b/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; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java index 788b585..9cd8071 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java index b7bcac0..ac6f52a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java index 6c0b455..f40114a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java +++ b/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 ="主执行进度") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java index 112618a..b9b28b0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java +++ b/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 dates = new ArrayList<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java index 91a36ab..9318579 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java +++ b/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 headers = new ArrayList<>();