减少四车间硫化换模次数

yun-zuoyi
钮海涛 4 years ago
parent bcd683c684
commit 4a9ac431bb

@ -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,

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

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

@ -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
}

@ -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

@ -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,

@ -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

@ -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
}

@ -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

@ -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
}

@ -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
}

@ -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,

@ -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
}

@ -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,

@ -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,
}

@ -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,

@ -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,

@ -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,

@ -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,

@ -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
}

@ -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,

@ -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
}

@ -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

@ -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,

@ -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

@ -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

@ -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

@ -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
}

@ -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
}

@ -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
}

@ -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
}

@ -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,
}

@ -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,

@ -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,

@ -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,

@ -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,

@ -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,

@ -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

@ -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 {

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

@ -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;

@ -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;

@ -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;
}

@ -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;

@ -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;

@ -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<GanttOrderModel> children = new ArrayList<>();
private List<GanttLineModel> lineModels = new ArrayList<>();

@ -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;

@ -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;

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

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

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

@ -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;
}

@ -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;
}

@ -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 ="主执行进度")

@ -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<>();

@ -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<>();

Loading…
Cancel
Save