From c5d8ba231396aa4d10ede3cf2e3fe7c31350bf5e Mon Sep 17 00:00:00 2001 From: yangsb Date: Wed, 27 Mar 2024 17:04:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=93=8D=E5=BA=94=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/dto/Metrial.java | 16 +++---- .../controller/admin/plan/dto/ScrapBoard.java | 43 +++++++++++++++++++ .../admin/plan/vo/OptimizeParamRespVO.java | 9 ++-- 3 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java index 21ae3671e..25a2d9aa9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java @@ -51,15 +51,15 @@ public class Metrial { private Integer avgLyr_NoLastOne; @Schema(description = "Lyr_LastOne") private Double lyr_LastOne; - @Schema(description = "organId") + @Schema(description = "组织id") private Integer organId; - @Schema(description = "usedBoardMessageList") + @Schema(description = "使用板信息列表") private List usedBoardMessageList; - @Schema(description = "blockPlaceMessageList") + @Schema(description = "小板信息列表") private List blockPlaceMessageList; - @Schema(description = "State") + @Schema(description = "状态") private Integer state; - @Schema(description = "HasWave") + @Schema(description = "有波纹") private Boolean hasWave; @Schema(description = "OrgWidth") private Integer orgWidth; @@ -71,8 +71,8 @@ public class Metrial { private String remainBoardMessage; @Schema(description = "PreCutValue") private Integer preCutValue; - @Schema(description = "ScrapBoardList") - private List scrapBoardList; + @Schema(description = "废料板列表") + private List scrapBoardList; @Schema(description = "HelpCut") private Boolean helpCut; @Schema(description = "SameKnifeHelpCutGap") @@ -81,7 +81,7 @@ public class Metrial { private Integer cutKnifeID; @Schema(description = "HelpKnifeID") private Integer helpKnifeID; - @Schema(description = "LastSaveDate") + @Schema(description = "最后保存时间") private Date lastSaveDate; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java new file mode 100644 index 000000000..7338cd805 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java @@ -0,0 +1,43 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Beal + */ +@NoArgsConstructor +@Data +public class ScrapBoard { + + @Schema(description ="PlanCode") + private String planCode; + @Schema(description ="UsedPlanCode") + private String usedPlanCode; + @Schema(description ="ID") + private Long id; + @Schema(description ="PlanID") + private Long planId; + @Schema(description ="OrgPlanID") + private Long orgPlanId; + @Schema(description ="Status") + private Integer status; + @Schema(description ="PlacedStyle") + private Integer placedStyle; + @Schema(description ="StoreHouse") + private String storeHouse; + @Schema(description ="Count") + private Integer count; + @Schema(description ="Remark") + private String remark; + @Schema(description ="OutLineJson") + private String outLineJson; + @Schema(description ="组织id") + private Integer organId; + @Schema(description ="BasePolyline") + private Object basePolyline; + @Schema(description ="PlacedPolyline") + private Object placedPolyline; + private Boolean isUsed; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java index b83513d50..b97d75159 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java @@ -34,7 +34,8 @@ public class OptimizeParamRespVO { @Schema(description = "机台 ID") private Long machineId; @Schema(description = "计划时间") - private LocalDateTime planTime; + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) + private Date planTime; @Schema(description = "生产单号") private String orderNos; @Schema(description = "排单优化文件地址") @@ -50,10 +51,10 @@ public class OptimizeParamRespVO { private Date produceTime; @Schema(description = "生产单列表") private List orderList; - @Schema(description = "MetrialList") + @Schema(description = "大板使用信息列表") private List metrialList; - @Schema(description = "商品列表") - private List goodsList; + /*@Schema(description = "商品列表") + private List goodsList;*/ @Schema(description = "小板列表") private List plateList; @Schema(description = "区域删除")