添加优化排单接口字段注释

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java

@@ -11,42 +11,46 @@ import java.util.List;
 @Data
 public class BlockPlaceMessage {
 
-    @Schema(description = "zzInfo")
+    @Schema(description = "自增板信息")
     private String zzInfo;
-    @Schema(description = "Bi")
+    @Schema(description = "大板ID")
     private Integer bi;
-    @Schema(description = "Bo")
+    @Schema(description = "小板号")
     private Long bo;
-    @Schema(description = "X")
+    @Schema(description = "位置X")
     private Double x;
-    @Schema(description = "Y")
+    @Schema(description = "位置Y")
     private Double y;
-    @Schema(description = "Pi")
+    @Schema(description = "优化顺序")
     private Double pi;
-    @Schema(description = "Ps")
+    @Schema(description = "放置方式")
     private Double ps;
-    @Schema(description = "Ci")
+    @Schema(description = "开料顺序")
     private Double ci;
-    @Schema(description = "Ca")
+    @Schema(description = "下刀点位置")
     private Double ca;
-    @Schema(description = "CP")
-    private Double cP;
-    private Boolean iA;
+    @Schema(description = "下刀点")
+    private Double cp;
+    @Schema(description = "未移动")
+    private Boolean ia;
+    @Schema(description = "是否重叠isOverlap")
     private Boolean iO;
-    @Schema(description = "Dh")
+    @Schema(description = "是否排钻")
     private Boolean dh;
-    @Schema(description = "Dm")
+    @Schema(description = "是否造型")
     private Boolean dm;
-    @Schema(description = "OF")
-    private Integer oF;
+    @Schema(description = "超限板 标识")
+    private Integer of;
+    @Schema(description = "板类型  普通=0 自增=1 ,余料=2(失效)")
     private Integer type;
-    private List<Point> pointList;
-    @Schema(description = "OrgSizeOutOff")
+    @Schema(description = "点阵")
+    private List<Point> points;
+    @Schema(description = "原造型偏移信息")
     private OrgSizeOutOff orgSizeOutOff;
-    @Schema(description = "SizeOutOff")
+    @Schema(description = "尺寸扩展信息(造型)")
     private SizeOutOff sizeOutOff;
-    @Schema(description = "PlaceOffX")
+    @Schema(description = "跟优化位置 漂移多少?X")
     private Double placeOffX;
-    @Schema(description = "PlaceOffY")
+    @Schema(description = "跟优化位置 漂移多少?Y")
     private Double placeOffY;
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java

@@ -1,7 +1,10 @@
 package com.cf.imes.module.executor.controller.admin.plan.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.swing.*;
+
 /**
  * @projectName: cf_imes_server
  * @author: 晨丰科技
@@ -11,13 +14,21 @@ import lombok.Data;
 public class HoleDetail {
 
     private Integer holeId;
-    private Integer holeType;// 请定义HoleType枚举类型
-    private Integer face; // 请定义FaceType枚举类型
+    @Schema(description = "孔类别 大孔 = 0, 小孔 = 10, 木削 = 20, 木削大孔 = 21, 层板钉 = 30, 通孔 = 40, 造型孔 = -10, 连接杆 = 50")
+    private Integer holeType;
+    @Schema(description = "面 正面 = 0, 反面 = 1, 侧面 = 2, 左侧面 = 21, 右侧面 = 22, 上侧面 = 23, 下侧面 = 24, 弧形侧面 = 29, 异形侧面 = 30")
+    private Integer face;
+    @Schema(description = "坐标x")
     private Integer pointX;
+    @Schema(description = "坐标y")
     private Integer pointY;
+    @Schema(description = "坐标z")
     private Integer pointZ;
+    @Schema(description = "半径")
     private Integer radius;
+    @Schema(description = "深度")
     private Integer depth;
+    @Schema(description = "起点坐标")
     private Integer endPoint;
     private Integer pointX2;
     private Integer pointY2;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java

@@ -17,13 +17,13 @@ public class Metrial {
     private Integer goodsID;
     @Schema(description = "商品名称")
     private String goodsName;
-    @Schema(description = "Specification")
+    @Schema(description = "规范")
     private String specification;
     @Schema(description = "材质")
     private String metrial;
     @Schema(description = "颜色")
     private String color;
-    @Schema(description = "Brank")
+    @Schema(description = "品牌")
     private String brank;
     @Schema(description = "宽")
     private Integer width;
@@ -31,25 +31,25 @@ public class Metrial {
     private Integer length;
     @Schema(description = "厚")
     private Integer thickness;
-    @Schema(description = "Border")
+    @Schema(description = "修边值")
     private Integer border;
-    @Schema(description = "CutDia")
+    @Schema(description = "开料刀直径")
     private Integer cutDia;
-    @Schema(description = "CutGap")
+    @Schema(description = "开料间隙")
     private Integer cutGap;
     @Schema(description = "IsSorted")
     private Boolean isSorted;
-    @Schema(description = "BoardCount")
+    @Schema(description = "大板数")
     private Integer boardCount;
-    @Schema(description = "MinBoardID")
+    @Schema(description = "最小大板ID")
     private Integer minBoardID;
-    @Schema(description = "MaxBoardID")
+    @Schema(description = "最大大板ID")
     private Integer maxBoardID;
-    @Schema(description = "AvgLyr_All")
+    @Schema(description = "平均利用率")
     private Double avgLyr_All;
-    @Schema(description = "AvgLyr_NoLastOne")
+    @Schema(description = "前N平均利用率")
     private Integer avgLyr_NoLastOne;
-    @Schema(description = "Lyr_LastOne")
+    @Schema(description = "尾张利用率")
     private Double lyr_LastOne;
     @Schema(description = "组织id")
     private Integer organId;
@@ -61,25 +61,25 @@ public class Metrial {
     private Integer state;
     @Schema(description = "有波纹")
     private Boolean hasWave;
-    @Schema(description = "OrgWidth")
+    @Schema(description = "板材原宽")
     private Integer orgWidth;
-    @Schema(description = "OrgLength")
+    @Schema(description = "板材原长")
     private Integer orgLength;
-    @Schema(description = "BoardCount_Remain")
+    @Schema(description = "余料板数")
     private Integer boardCount_Remain;
-    @Schema(description = "RemainBoardMessage")
+    @Schema(description = "余料板情况")
     private String remainBoardMessage;
-    @Schema(description = "PreCutValue")
+    @Schema(description = "预洗值")
     private Integer preCutValue;
     @Schema(description = "废料板列表")
     private List<ScrapBoard> scrapBoardList;
-    @Schema(description = "HelpCut")
+    @Schema(description = "是否辅助开料")
     private Boolean helpCut;
-    @Schema(description = "SameKnifeHelpCutGap")
+    @Schema(description = "同刀辅助 厚度")
     private Integer sameKnifeHelpCutGap;
-    @Schema(description = "CutKnifeID")
+    @Schema(description = "开料刀ID")
     private Integer cutKnifeID;
-    @Schema(description = "HelpKnifeID")
+    @Schema(description = "辅助刀ID")
     private Integer helpKnifeID;
     @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/ModelDetail.java

@@ -1,6 +1,7 @@
 package com.cf.imes.module.executor.controller.admin.plan.dto;
 
 import com.cf.imes.module.executor.util.deviseData.IOriginModelingData;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -13,11 +14,17 @@ import java.util.List;
 @Data
 public class ModelDetail {
 
+    @Schema(description = "造型ID")
     private Integer modelId;
+    @Schema(description = "线ID")
     private Integer lineId;
+    @Schema(description = "面 正面 = 0, 反面 = 1, 侧面 = 2, 左侧面 = 21, 右侧面 = 22, 上侧面 = 23, 下侧面 = 24, 弧形侧面 = 29, 异形侧面 = 30")
     private Integer face;
+    @Schema(description = "刀号")
     private String knifeName;
+    @Schema(description = "刀半径")
     private Integer knifeRadius;
+    @Schema(description = "深度")
     private Integer depth;
     private IOriginModelingData originModeling;
     private List<PointList> pointList;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OffSetList.java

@@ -1,5 +1,7 @@
 package com.cf.imes.module.executor.controller.admin.plan.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 /**
  * @projectName: cf_imes_server
  * @author: 晨丰科技
@@ -8,7 +10,8 @@ package com.cf.imes.module.executor.controller.admin.plan.dto;
 public class OffSetList {
 
     private String name;
-    private Integer face;// 请定义FaceType枚举类型
+    @Schema(description = "面 正面 = 0, 反面 = 1, 侧面 = 2, 左侧面 = 21, 右侧面 = 22, 上侧面 = 23, 下侧面 = 24, 弧形侧面 = 29, 异形侧面 = 30")
+    private Integer face;
     private Integer value;
     private Integer radius;
     private Integer deep;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java

@@ -1,5 +1,6 @@
 package com.cf.imes.module.executor.controller.admin.plan.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -11,9 +12,13 @@ public class OrgSizeOutOff {
     private Integer right;
     private Integer upper;
     private Integer under;
+    @Schema(description = "板外扩宽")
     private Integer width;
+    @Schema(description = "板外扩长")
     private Integer length;
+    @Schema(description = "排版外扩宽")
     private Integer outWidth;
+    @Schema(description = "排版外扩长")
     private Integer outLength;
     private Boolean hasDone;
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java

@@ -10,21 +10,22 @@ import java.util.List;
  */
 @Data
 public class ScrapBlock {
-    @Schema(description = "ScrapNo")
+    @Schema(description = "余料号")
     private Long scrapNo;
-    @Schema(description = "IsUnRegular")
+    @Schema(description = "是否异形")
     private Boolean isUnRegular;
-    @Schema(description = "IsOverlap")
+    @Schema(description = "是否重叠")
     private Boolean isOverlap;
+    @Schema(description = "是否已录入")
     private Boolean isInstored;
     private List<Point> points;
     private String remark;
-    @Schema(description = "PlaceX")
+    @Schema(description = "坐标X")
     private Double placeX;
-    @Schema(description = "PlaceY")
+    @Schema(description = "坐标Y")
     private Double placeY;
-    @Schema(description = "PlaceWidth")
+    @Schema(description = "开料宽")
     private Double placeWidth;
-    @Schema(description = "PlaceLength")
+    @Schema(description = "开料长")
     private Double placeLength;
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java

@@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * @author Beal
  */
@@ -11,33 +13,33 @@ import lombok.NoArgsConstructor;
 @Data
 public class ScrapBoard {
 
-    @Schema(description ="PlanCode")
+    @Schema(description ="源排单号")
     private String planCode;
-    @Schema(description ="UsedPlanCode")
+    @Schema(description ="使用排单号")
     private String usedPlanCode;
     @Schema(description ="ID")
     private Long id;
-    @Schema(description ="PlanID")
+    @Schema(description ="排单ID")
     private Long planId;
-    @Schema(description ="OrgPlanID")
+    @Schema(description ="源排单ID")
     private Long orgPlanId;
-    @Schema(description ="Status")
+    @Schema(description ="未使用 = 0, 已使用 = 1")
     private Integer status;
-    @Schema(description ="PlacedStyle")
+    @Schema(description ="正面 = 0, 正面右转 = 1, 正面后转 = 2, 正面左转 = 3, 反面 = 4, 反面右转 = 5, 反面后转 = 6, 反面左转 = 7")
     private Integer placedStyle;
-    @Schema(description ="StoreHouse")
+    @Schema(description ="仓库")
     private String storeHouse;
     @Schema(description ="Count")
     private Integer count;
-    @Schema(description ="Remark")
+    @Schema(description ="备注")
     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;
+    @Schema(description ="原始多段线")
+    private List<ScrapPt> basePolyline;
+    @Schema(description ="放置的多段线")
+    private List<ScrapPt> placedPolyline;
     private Boolean isUsed;
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java

@@ -1,5 +1,6 @@
 package com.cf.imes.module.executor.controller.admin.plan.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -11,9 +12,13 @@ public class SizeOutOff {
     private Double right;
     private Double upper;
     private Double under;
+    @Schema(description = "板外扩宽")
     private Double width;
+    @Schema(description = "板外扩长")
     private Double length;
+    @Schema(description = "排版外扩 宽")
     private Double outWidth;
+    @Schema(description = "排版外扩 长")
     private Double outLength;
     private Boolean hasDone;
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java

@@ -10,28 +10,30 @@ import java.util.List;
  */
 @Data
 public class UsedBoardMessage {
-    @Schema(description = "Bi")
+    @Schema(description = "大板id")
     private Integer bi;
-    @Schema(description = "W")
+    @Schema(description = "宽")
     private Integer w;
-    @Schema(description = "L")
+    @Schema(description = "长度")
     private Integer l;
-    @Schema(description = "Si")
+    @Schema(description = "余料板ID")
     private Integer si;
-    @Schema(description = "So")
+    @Schema(description = "仓库号")
     private String so;
-    @Schema(description = "No")
+    @Schema(description = "余料板号,大板为空")
     private String no;
     @Schema(description = "RM")
-    private String rM;
-    @Schema(description = "LK")
+    private String rm;
+    @Schema(description = "是否锁定")
     private Boolean lK;
+    @Schema(description = "余料母板")
     private List<ScrapPt> scrapPtList;
+    @Schema(description = "余料空间")
     private List<ScrapBlock> scrapBlocks;
-    @Schema(description = "LE")
-    private Boolean lE;
-    @Schema(description = "RE")
-    private Boolean rE;
+    @Schema(description = "左边不能加工区域，有造型")
+    private Boolean le;
+    @Schema(description = "右边不能加工区域，有造型")
+    private Boolean re;
     @Schema(description = "WLs")
     private List<String> wLs;
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java

@@ -5,6 +5,7 @@ import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial;
 import com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -18,6 +19,7 @@ import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT
  * @author Beal
  */
 @Data
+@Builder
 public class OptimizeParamRespVO {
     @Schema(description = "排单id")
     private Long planId;
@@ -29,8 +31,6 @@ public class OptimizeParamRespVO {
     private Integer type;
     @Schema(description = "排单状态 0 新单，1 板材已申请，2 开料中，3 已开料")
     private Integer status;
-    @Schema(description = "是否支付")
-    private Boolean isPay;
     @Schema(description = "机台 ID")
     private Long machineId;
     @Schema(description = "计划时间")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java

@@ -22,7 +22,7 @@ public class PlateDetailVO {
     @Schema(description = "孔详情列表")
     private List<HoleDetail> holeDetailList;
 
-    @Schema(description = "模型详情列表")
+    @Schema(description = "造型列表")
     private List<ModelDetail> modelDetailList;
 
     @Schema(description = "偏移量")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java

@@ -202,7 +202,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
     @Override
     public OptimizeParamRespVO getOptimizePlanParam(Long planId) {
-        return planMapper.getOptimizePlanParam(planId);
+
+        OptimizeParamRespVO optimizePlanParam = planMapper.getOptimizePlanParam(planId);
+
+        return optimizePlanParam;
     }
 
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IOriginModelingData.java

@@ -1,11 +1,13 @@
 package com.cf.imes.module.executor.util.deviseData;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import javax.swing.*;
 import java.util.Dictionary;
 
 /**
@@ -18,12 +20,20 @@ import java.util.Dictionary;
 @Accessors(chain = false) // 设置 chain = false，避免生产单导入有问
 public class IOriginModelingData {
 
-    private IContourData outline; //轮郭
-    private Dictionary<String, IContourData> holes; //孔轮廓
-    private Integer thickness; //厚度
-    private Integer dir; // 0正面、1反面、2侧面
-    private Integer knifeRadius; //刀半径
-    private Integer addLen; //槽加长
-    private Integer addWidth; //槽加宽
-    private Integer addDepth; //槽加深
+    @Schema(description = "轮郭")
+    private IContourData outline;
+    @Schema(description = "孔轮廓")
+    private Dictionary<String, IContourData> holes;
+    @Schema(description ="厚度" )
+    private Integer thickness;
+    @Schema(description = "0正面、1反面、2侧面")
+    private Integer dir;
+    @Schema(description = "刀半径")
+    private Integer knifeRadius;
+    @Schema(description = "槽加长")
+    private Integer addLen;
+    @Schema(description = "槽加宽")
+    private Integer addWidth;
+    @Schema(description = "槽加深")
+    private Integer addDepth;
 }