微调响应参数结果

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<UsedBoardMessage> usedBoardMessageList;
-    @Schema(description = "blockPlaceMessageList")
+    @Schema(description = "小板信息列表")
     private List<BlockPlaceMessage> 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<ScrapBoard> 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;
     
 }

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

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<OrderResp> orderList;
-    @Schema(description = "MetrialList")
+    @Schema(description = "大板使用信息列表")
     private List<Metrial> metrialList;
-    @Schema(description = "商品列表")
-    private List<GoodsRespVO> goodsList;
+    /*@Schema(description = "商品列表")
+    private List<GoodsRespVO> goodsList;*/
     @Schema(description = "小板列表")
     private List<PlateRespVO> plateList;
     @Schema(description = "区域删除")