添加机台字段

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

@@ -2,10 +2,7 @@ package com.cf.imes.module.executor.controller.admin.plan;
 
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
-import com.cf.imes.module.executor.controller.admin.plan.vo.AddRemainReqVO;
+import com.cf.imes.module.executor.controller.admin.plan.vo.*;
-import com.cf.imes.module.executor.controller.admin.plan.vo.OptimizeParamResVO;
-import com.cf.imes.module.executor.controller.admin.plan.vo.PlateOptimize;
-import com.cf.imes.module.executor.controller.admin.plan.vo.SavePlanPlateResult;
 import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -73,7 +70,15 @@ public class OptimizePlanController {
     @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')")
     public CommonResult<OptimizeParamResVO> getCfData(@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) {
         //todo
-        return CommonResult.success(null);//optimizePlanService.getCfData(planId));
+        return CommonResult.success(null);
+    }
+
+    @GetMapping("/getOptimizePlanParam")
+    @Operation(summary = "获取优化排单参数 (未完成)")
+    @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')")
+    public CommonResult<OptimizeParamRespVO> getOptimizePlanParam (@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) {
+        //todo
+        return CommonResult.success(optimizePlanService.getOptimizePlanParam(planId));
     }
 
 }

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

@@ -0,0 +1,59 @@
+package com.cf.imes.module.executor.controller.admin.plan.vo;
+
+import com.cf.imes.module.executor.controller.admin.goods.vo.GoodsRespVO;
+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.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
+
+/**
+ * @author Beal
+ */
+@Data
+public class OptimizeParamRespVO {
+    @Schema(description = "排单id")
+    private Long planId;
+    @Schema(description = "排单号")
+    private String planNo;
+    @Schema(description = "排序优先级")
+    private Integer sort;
+    @Schema(description = "排单类型：1 混单排单，2 生产单排单")
+    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 = "计划时间")
+    private LocalDateTime planTime;
+    @Schema(description = "生产单号")
+    private String orderNos;
+    @Schema(description = "排单优化文件地址")
+    private String placeDateFileUrl;
+    @Schema(description = "排单优化文件地址")
+    private String placeOrderFileUrl;
+    @Schema(description = "备注")
+    private String remark;
+    @Schema(description = "生产操作人")
+    private String operator;
+    @Schema(description = "生产时间")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private Date produceTime;
+
+    @Schema(description = "生产单列表")
+    private List<OrderResp> orderList;
+
+    @Schema(description = "商品列表")
+    private List<GoodsRespVO> goodsList;
+
+    @Schema(description = "小板列表")
+    private List<PlateRespVO> plateList;
+}

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

@@ -0,0 +1,52 @@
+package com.cf.imes.module.executor.controller.admin.plan.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
+
+/**
+ * @author Beal
+ */
+@Data
+public class OrderResp {
+    @Schema(description = "生产单id")
+    private Long orderId;
+    @Schema(description = "父id")
+    private Long parentNo;
+    @Schema(description = "自定义单号")
+    private String customOrderNo;
+    @Schema(description = "客户")
+    private String customer;
+    @Schema(description = "地址")
+    private String address;
+    @Schema(description = "客户电话")
+    private String phoneNumber;
+    @Schema(description = "经销商")
+    private String dealer;
+    @Schema(description = "经销商电话")
+    private String dealerPhoneNumber;
+    @Schema(description = "业务员")
+    private String salesman;
+    @Schema(description = "拆单员")
+    private String splitter;
+    @Schema(description = "备注")
+    private String remark;
+    @Schema(description = "交付日期")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private Date deliveryDate;
+    @Schema(description = "生产单类型，1主单 2子单")
+    private Integer type;
+    @Schema(description = "生产单排序号")
+    private Integer sort;
+    @Schema(description = "CAD数据类型，1CAD 2WebCAD 3Excel")
+    private Integer dataType;
+    @Schema(description = "订单状态，0未排单1已排单2生产中3加工完成4打包完成5入库完成6出库完成")
+    private Integer status;
+
+}

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java

@@ -35,4 +35,7 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
     }
 
     List<PlateOptimize> selectPlateListByPlanId(Long planId);
+
+    OptimizeParamRespVO getOptimizePlanParam(Long planId);
+
 }

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

@@ -1,9 +1,6 @@
 package com.cf.imes.module.executor.service.optimizeplan;
 
-import com.cf.imes.module.executor.controller.admin.plan.vo.AddRemainReqVO;
+import com.cf.imes.module.executor.controller.admin.plan.vo.*;
-import com.cf.imes.module.executor.controller.admin.plan.vo.OptimizeParamResVO;
-import com.cf.imes.module.executor.controller.admin.plan.vo.PlateOptimize;
-import com.cf.imes.module.executor.controller.admin.plan.vo.SavePlanPlateResult;
 
 import java.util.List;
 
@@ -17,4 +14,6 @@ public interface OptimizePlanService {
     Boolean commit(Long planId);
 
     OptimizeParamResVO getOptimizeParam(Long planId);
+
+    OptimizeParamRespVO getOptimizePlanParam(Long planId);
 }

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

@@ -200,5 +200,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
 
     }
 
+    @Override
+    public OptimizeParamRespVO getOptimizePlanParam(Long planId) {
+        return planMapper.getOptimizePlanParam(planId);
+    }
+
 
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml

@@ -19,6 +19,56 @@
         <collection property="plateDOList" javaType="java.util.List" ofType="com.cf.imes.module.executor.dal.dataobject.remainplaten.RemainPlateDO"/>
     </resultMap>
 
+    <resultMap id="optimizeMap" type="com.cf.imes.module.executor.controller.admin.plan.vo.OptimizeParamRespVO">
+        <result column="planId" property="planId"/>
+        <result column="plan_no" property="planNo"/>
+        <result column="sort" property="sort"/>
+        <result column="type" property="type"/>
+        <result column="status" property="status"/>
+        <result column="is_pay" property="isPay"/>
+        <result column="machine_id" property="machineId"/>
+        <result column="plan_time" property="planTime"/>
+        <result column="remark" property="remark"/>
+        <collection property="goodsList" javaType="java.util.List" ofType="com.cf.imes.module.executor.controller.admin.goods.vo.GoodsRespVO"/>
+        <collection property="orderList" javaType="java.util.List" ofType="com.cf.imes.module.executor.controller.admin.plan.vo.OrderResp"/>
+        <collection property="plateList" javaType="java.util.List" ofType="com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO" >
+            <result column="plateId" property="id"/>
+            <result column="plan_no" property="plateNo"/>
+            <result column="type" property="type"/>
+            <result column="goods_id" property="goodsId"/>
+            <result column="width" property="width"/>
+            <result column="height" property="height"/>
+            <result column="thickness" property="thickness"/>
+            <result column="split_width" property="splitWidth"/>
+            <result column="split_height" property="splitHeight"/>
+            <result column="split_thickness" property="splitThickness"/>
+            <result property="sealLeft" column="seal_left"/>
+            <result property="sealRight" column="seal_right"/>
+            <result property="sealUp" column="seal_up"/>
+            <result property="sealDown" column="seal_down"/>
+            <result property="area" column="area"/>
+            <result property="texture" column="texture"/>
+            <result property="holeFace" column="hole_face"/>
+            <result property="holeArrange" column="hole_arrange"/>
+            <result property="unregularPointCount" column="unregular_point_count"/>
+            <result property="frontHoleCount" column="front_hole_count"/>
+            <result property="backHoleCount" column="back_hole_count"/>
+            <result property="sideHoleCount" column="side_hole_count"/>
+            <result property="backModelCount" column="back_model_count"/>
+            <result property="isDoor" column="is_door"/>
+            <result property="openDoorType" column="open_door_type"/>
+            <result property="offsetX" column="offset_x"/>
+            <result property="offsetY" column="offset_y"/>
+            <result property="isArcAcross" column="is_arc_across"/>
+            <result property="moduleTypeId" column="module_typeId"/>
+            <result property="filterType" column="filter_type"/>
+            <result property="filterType" column="filter_type"/>
+            <result property="isCancel" column="is_cancel"/>
+            <result property="createTime" column="create_time"/>
+        </collection>
+    </resultMap>
+
+
     <select id="selectPlateListByPlanId"
             resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateOptimize">
         select a.goods_id,  a.goods_name, a.material, a.color, a.width, a.height, a.thickness, count(b.id) as plateNum, d.*
@@ -30,4 +80,15 @@
         GROUP BY a.id, d.id
 
     </select>
+
+    <select id="getOptimizePlanParam" resultMap="optimizeMap">
+        select op.*, oi.order_id, opl.id as plateId, opl.*, og.*
+        from order_plan op
+        left JOIN order_plan_item opi on op.id = opi.plan_id
+        left join order_item oi on opi.item_id = oi.id
+        left join order_plate opl on oi.plate_id = opl.id
+        left join order_goods og on opl.goods_id = og.goods_id
+        where op.id = #{planId}
+
+    </select>
 </mapper>

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java

@@ -15,17 +15,14 @@ public class CuttingSettingDO extends ESDocument {
 
     @Schema(description = "机台id")
     private Long machineId;
-    @Schema(description = "默认true，按机台尺寸排版/按板材尺寸排版，false台面尺寸范围内自适应材料尺寸")
+    @Schema(description = "默认1，开料刀缝间隙")
-    private Boolean useWorkPanelSize;
+    private Integer cutGap;
+
+    //基础配置
     @Schema(description = "默认1220，机台台面宽度（原料板宽）")
     private Integer boardWidth;
     @Schema(description = "默认2440，机台台面长度（原料板长）")
     private Integer boardLength;
-    @Schema(description = "默认3，总修边值")
-    private Integer reverseTrimValue;
-
-    @Schema(description = "默认1，开料刀缝间隙")
-    private Integer cutGap;
     @Schema(description = "默认0，工位1原点位置")
     private Integer originPoIntegerPosition;
     @Schema(description = "工作原点Z0基准面")
@@ -34,6 +31,8 @@ public class CuttingSettingDO extends ESDocument {
     private String layoutBenchmark;
     @Schema(description = "排版基准点跟随大板定位")
     private Boolean useLocator4Place;
+    @Schema(description = "默认true，按机台尺寸排版/按板材尺寸排版，false台面尺寸范围内自适应材料尺寸")
+    private Boolean useWorkPanelSize;
     @Schema(description = "默认0 短边坐标轴向")
     private Integer widthSideAxis;
     @Schema(description = "默认2 长边坐标轴向")
@@ -50,99 +49,70 @@ public class CuttingSettingDO extends ESDocument {
     private Integer offsetX_Block;
     @Schema(description = "默认0，小板定位坐标Y偏移")
     private Integer offsetY_Block;
-    @Schema(description = "默认200，余料生成规则1-两边均大于限定值")
+    @Schema(description = "矩形板件R角开料 默认否")
-    private Integer scrapBlockSquare;
+    private Boolean rectanglR;
-    @Schema(description = "默认100，余料生成规则2-短边最小限定值")
+    @Schema(description = "圆弧加工使用IJ指令 默认否，使用R指令")
-    private Integer srcapBlockWidthMin;
+    private Boolean arcUseIJ;
-    @Schema(description = "默认600，余料生成规则2-长边最小限定值")
+    @Schema(description = "圆弧方向反转 默认否 顺时针G2/逆时针G3")
-    private Integer scrapBlockWidthMax;
+    private Boolean arcInversion;
-    @Schema(description = "余料归方")
+    @Schema(description = "圆弧转多段线长度 默认0 不转")
-    private Boolean scrapDirection;
+    private Boolean arcTurnLength;
-    @Schema(description = "钻孔延时")
-    private Boolean drillingDelay;
-    @Schema(description = "钻孔延时条件-孔直径上限")
-    private Double drillingDelayConditionMaxDiameter;
-    @Schema(description = "钻孔延时指令")
-    private String drillingDelayInstruction;
 
+
+
+    //加工
     @Schema(description = "默认40，安全高度")
     private Integer freeHeight;
     @Schema(description = "总修边值")
     private Double totalTrimValue;
-    /*@Schema(description = "默认0，停刀位置X坐标")
+    @Schema(description = "默认3，总修边值")
-    private Integer freeLocationX;*/
+    private Integer reverseTrimValue;
-/*    @Schema(description = "默认2440，停刀位置Y坐标")
-    private Integer freeLocationY;*/
     @Schema(description = "默认15000，空程速度")
     private Integer freeSpeed;
-   /* @Schema(description = "默认0，起始下刀高度（距板面）")
+    @Schema(description = "默认2400，排钻空程速度")
-    private Integer workStartHeight;*/
+    private Integer holeFreeSpeed;
     @Schema(description = "默认3000，下刀速度")
     private Integer workStartSpeed;
-    @Schema(description = "默认20，斜向下刀水平距离")
-    private Integer workStartDistance;
     @Schema(description = "默认2，开料提前")
     private Integer workPreDistance;
+    @Schema(description = "默认25，收刀距离")
+    private Integer workEndDistace;
+    @Schema(description = "默认3000，收刀速度")
+    private Integer workEndSpeed;
+    @Schema(description = "默认1200，排钻速度")
+    private Integer holeSpeed;
+    @Schema(description = "默认8000，造型速度")
+    private Integer modelSpeed;
     @Schema(description = "默认8000，开料速度")
     private Integer cuttingSpeedForMaterial;
     @Schema(description = "公边切割速度")
     private Double cuttingSpeedForEdge;
     @Schema(description = "外转角切割速度")
     private Double outerCornerCuttingSpeed;
-  /*  @Schema(description = "默认3000，转角切割速度")
-    private Integer workCornerSpeed;*/
-    @Schema(description = "默认3000，收刀速度")
-    private Integer workEndSpeed;
-    @Schema(description = "默认25，收刀距离")
-    private Integer workEndDistace;
- /*   @Schema(description = "默认0，共边加速")
-    private Integer sameBorderHighSpeed;*/
     @Schema(description = "默认0，内转角减速提前距离")
     private Integer innerCornerDistence;
     @Schema(description = "默认3000，内转角速度")
     private Integer innerCornerSpeed;
-    @Schema(description = "默认2400，排钻空程速度")
-    private Integer holeFreeSpeed;
     @Schema(description = "默认2，排钻初始段深度")
     private Integer holeFirstDepth;
     @Schema(description = "默认800，排钻初始段速度")
     private Integer holeFirstSpeed;
-    @Schema(description = "默认1200，排钻速度")
-    private Integer holeSpeed;
-    @Schema(description = "默认8000，造型速度")
-    private Integer modelSpeed;
-    @Schema(description = "默认true，双面加工优先排版")
-    private Boolean allowDoubleHoleFirstSort;
-    @Schema(description = "余料板允许排入双面加工的板件")
-    private Boolean yuLiaoBoardDo2FaceBlock;
-   /* @Schema(description = "默认150，开料优先最小宽度")
-    private Integer autoSortingMinWidth;*/
-    @Schema(description = "默认true，反面加工先修边后加工孔槽")
-    private Boolean firstCutBorderInFaceB;
     @Schema(description = "默认false，通孔一刀打穿")
     private Boolean tongHoleOnlyOneTime;
     @Schema(description = "穿孔对面加工")
     private Boolean tongKongDoBackFace;
     @Schema(description = "先修边加工")
     private Boolean priorTrimmingProcessing;
-  /*  @Schema(description = "默认false，通孔(穿孔)分正反两刀加工（失效？）")
-    private Boolean tongHoleUseTwoTime;*/
     @Schema(description = "默认false，开料分工")
     private Boolean allowDoubleSplit;
     @Schema(description = "默认8，分刀步进深度")
     private Integer splitDepth;
-/*    @Schema(description = "默认false，最小板件分刀开料")
+    @Schema(description = "仅加工孔/造型，")
-    private Boolean limitDouleSplit;*/
+    private Boolean disposeCutBlock;
     @Schema(description = "默认100，小板分刀-短边上限")
     private Integer doubleSplitWidth;
     @Schema(description = "默认100，小板分刀-长边上限")
     private Integer doubleSplitLength;
-  /*  @Schema(description = "默认空，强制分刀小板顺序号，如：1,-1,-2，第一片、最后一片、倒数第二片分刀")
-    private String splitBlockSeqIds;*/
-  /*  @Schema(description = "默认false，使用横竖算法（电子锯）优化，目前无效")
-    private Boolean useDianZiJuMethod;*/
-    @Schema(description = "仅加工孔/造型，")
-    private Boolean disposeCutBlock;
     @Schema(description = "挖穿板内板件优先开料")
     private Boolean cutBlockInModelFirst;
     @Schema(description = "同刀辅助开料")
@@ -157,89 +127,22 @@ public class CuttingSettingDO extends ESDocument {
     private Double helpCutKnifeDepth;
     @Schema(description = "辅助开料指令")
     private String auxiliaryCuttingInstruction;
-   /* @Schema(description = "默认false，旧版本刀库配置（不带轴号、排钻启停使用排钻包启停参数项设置）；true，使用新模式刀库配置（支持轴号、组合刀、多轴预启动）。")
+    @Schema(description = "默认200，余料生成规则1-两边均大于限定值")
-    private Boolean useNewKnifeModule;*/
+    private Integer scrapBlockSquare;
-   /* @Schema(description = "默认[]，造型刀组")
+    @Schema(description = "默认100，余料生成规则2-短边最小限定值")
-    private List<String> modelKnifeGroup;*/
+    private Integer srcapBlockWidthMin;
-    @Schema(description = "KnifeList")
+    @Schema(description = "默认600，余料生成规则2-长边最小限定值")
-    private List<KnifeListBean> knifeList;
+    private Integer scrapBlockWidthMax;
-    @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
+    @Schema(description = "余料归方")
-    private List<String> exportOrderPathName;
+    private Boolean scrapDirection;
-    @Schema(description = "大板NC正(A)面文件名")
+    @Schema(description = "钻孔延时")
-    private String largePlateNcPositiveFileName;
+    private Boolean drillingDelay;
-    @Schema(description = "大板NC反(B)面文件名")
+    @Schema(description = "钻孔延时条件-孔直径上限")
-    private String largePlateNcNegativeFileName;
+    private Double drillingDelayConditionMaxDiameter;
-    @Schema(description = "小板NC正(A)面文件名")
+    @Schema(description = "钻孔延时指令")
-    private String smallPlateNcPositiveFileName;
+    private String drillingDelayInstruction;
-    @Schema(description = "小板NC反(B)面文件名")
-    private String smallPlateNcNegativeFileName;
-    @Schema(description = "大板DXF(排版图)文件名")
-    private String largePlateDxfLayoutFileName;
-    @Schema(description = "小板DXF(孔槽加工图)文件名")
-    private String smallPlateDxfProcessingFileName;
-    @Schema(description = "导出大板NC反(B)面文件")
-    private String exportLargePlateNcNegativeFile;
-    @Schema(description = "合并大板NC正反(AB)面文件")
-    private String mergeLargePlateNcFiles;
-    @Schema(description = "导出小板NC正(A)面文件")
-    private String exportSmallPlateNcPositiveFile;
-    @Schema(description = "导出小板NC反(B)面文件")
-    private String exportSmallPlateNcNegativeFile;
-    @Schema(description = "合并小板NC正反(AB)面文件")
-    private String mergeSmallPlateNcFiles;
-    @Schema(description = "导出大板DXF(排版图)文件")
-    private String exportLargePlateDxfLayoutFile;
-    @Schema(description = "导出小板DXF(孔槽加工图)文件")
-    private String exportSmallPlateDxfProcessingFile;
-    @Schema(description = "NC文件编码")
-    private String ncFileEncoding;
-    @Schema(description = "添加NC文件注释")
-    private String addNcFileComments;
-    @Schema(description = "上料代码插入到NC文件头前")
-    private Boolean insertLoadingCodeAtFileHeader;
-    @Schema(description = "上料代码")
-    private String loadingCode;
-    @Schema(description = "大板NC正(A)面文件头")
-    private String largePlateNcPositiveFileHeader;
-    @Schema(description = "大板NC正(A)面文件尾")
-    private String largePlateNcPositiveFileFooter;
-    @Schema(description = "大板NC反(B)面文件头")
-    private String largePlateNcNegativeFileHeader;
-    @Schema(description = "大板NC反(B)面文件尾")
-    private String largePlateNcNegativeFileFooter;
-    @Schema(description = "小板NC文件头")
-    private String smallPlateNcFileHeader;
-    @Schema(description = "小板NC文件尾")
-    private String smallPlateNcFileFooter;
-    @Schema(description = "小板切割开始")
-    private String smallPlateCuttingStart;
-    @Schema(description = "小板切割结束")
-    private String smallPlateCuttingEnd;
-
-   /* @Schema(description = "默认{0} {1}，导出NC文件路径")
-    private String exportBoardPathName;*/
-   /* @Schema(description = "默认{0}_A.nc，正面NC文件名")
-    private String boardFileA;
-    @Schema(description = "默认{0}_B.nc，反面NC文件名")
-    private String boardFileB;
-    @Schema(description = "默认{0}.nc，小板文件名")
-    private String blockFile;
-    @Schema(description = "默认空，正面NC文件头")
-    private String ncFileHead;
-    @Schema(description = "默认空，正面NC文件尾")
-    private String ncFileEnd;
-    @Schema(description = "默认空，反面NC文件头")
-    private String ncFileHead_B;
-    @Schema(description = "默认空，反面NC文件尾")
-    private String ncFileEnd_B;
-    @Schema(description = "默认空，小板（补孔）NC文件头")
-    private String ncFileHead_Block;
-    @Schema(description = "默认空，小板（补孔）NC文件尾")
-    private String ncFileEnd_Block;*/
     @Schema(description = "默认false，矩形板件开料R拐角")
     private Boolean regularBlockFilletCurve;
-   /* @Schema(description = "默认true，非矩形板R倒角")
-    private Boolean unregularBlockFilletCurve;*/
     @Schema(description = "默认false，加工圆弧使用IJ指令")
     private Boolean dealCircleWithIJ;
     @Schema(description = "默认false，G2/G3圆弧方向反转")
@@ -248,28 +151,16 @@ public class CuttingSettingDO extends ESDocument {
     private Boolean arcLineMaxLength;
     @Schema(description = "排钻按位置加工")
     private Boolean holePositionProcessing;
-  /*  @Schema(description = "默认true，导出NC文件注释")
+
-    private Boolean allowNCComments;*/
+
-   /* @Schema(description = "默认false，G代码行尾加结束符")
+    @Schema(description = "默认20，斜向下刀水平距离")
-    private Boolean allowAddGcodeEndChar;
+    private Integer workStartDistance;
-    @Schema(description = "默认空，G代码行结尾代码")
+    @Schema(description = "刀库")
-    private String gcodeEndChar;
+    private List<KnifeListBean> knifeList;
-    @Schema(description = "默认false（utf8），NC文件编码，true（gb2312）")
+
-    private Boolean ncFileIsGB2312;
+
-    @Schema(description = "默认true，导出反面NC文件")
+
-    private Boolean allowExportNC_BackFace;
+    //高级设置
-    @Schema(description = "默认false，正反面加工合成一个文件")
-    private Boolean oneBoardFile;
-    @Schema(description = "默认false，导出小板NC文件")
-    private Boolean allowExportNC_block;
-    @Schema(description = "默认false，是否导出优化结果cfdat文件")
-    private Boolean allowExportDataFile;
-    @Schema(description = "默认false，导出大板dxf文件")
-    private Boolean allowExportBoardDxf;
-    @Schema(description ="默认false，显示双工位配置")
-    private Boolean showTwoWorkSpace;
-    @Schema(description ="默认false，显示选择开料刀配置")
-    private Boolean showChooseCutKnife;*/
     @Schema(description ="默认true，显示开料机工作模式(是否排钻/造型，sc)配置")
     private Boolean showPriorFacing;
     @Schema(description = "双工位")
@@ -344,19 +235,358 @@ public class CuttingSettingDO extends ESDocument {
     private Double cNCModelingSpeed;
     @Schema(description = "NC指令可配置")
     private String configurableNCCommands;
+
+
+
     @Schema(description = "默认false，启用自定义板件编号")
     private Boolean allowBlockNo_Note;
     @Schema(description = "默认空，机台备注")
     private String remark;
-    @Schema(description = "矩形板件R角开料 默认否")
-    private Boolean rectanglR;
-    @Schema(description = "圆弧加工使用IJ指令 默认否，使用R指令")
-    private Boolean arcUseIJ;
-    @Schema(description = "圆弧方向反转 默认否 顺时针G2/逆时针G3")
-    private Boolean arcInversion;
-    @Schema(description = "圆弧转多段线长度 默认0 不转")
-    private Boolean arcTurnLength;
 
+
+
+    //文件导出
+    @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
+    private List<String> exportOrderPathName;
+    @Schema(description = "大板NC正(A)面文件名")
+    private String largePlateNcPositiveFileName;
+    @Schema(description = "大板NC反(B)面文件名")
+    private String largePlateNcNegativeFileName;
+    @Schema(description = "小板NC正(A)面文件名")
+    private String smallPlateNcPositiveFileName;
+    @Schema(description = "小板NC反(B)面文件名")
+    private String smallPlateNcNegativeFileName;
+    @Schema(description = "大板DXF(排版图)文件名")
+    private String largePlateDxfLayoutFileName;
+    @Schema(description = "小板DXF(孔槽加工图)文件名")
+    private String smallPlateDxfProcessingFileName;
+    @Schema(description = "导出大板NC反(B)面文件")
+    private String exportLargePlateNcNegativeFile;
+    @Schema(description = "合并大板NC正反(AB)面文件")
+    private String mergeLargePlateNcFiles;
+    @Schema(description = "导出小板NC正(A)面文件")
+    private String exportSmallPlateNcPositiveFile;
+    @Schema(description = "导出小板NC反(B)面文件")
+    private String exportSmallPlateNcNegativeFile;
+    @Schema(description = "合并小板NC正反(AB)面文件")
+    private String mergeSmallPlateNcFiles;
+    @Schema(description = "导出大板DXF(排版图)文件")
+    private String exportLargePlateDxfLayoutFile;
+    @Schema(description = "导出小板DXF(孔槽加工图)文件")
+    private String exportSmallPlateDxfProcessingFile;
+    @Schema(description = "NC文件编码")
+    private String ncFileEncoding;
+    @Schema(description = "添加NC文件注释")
+    private String addNcFileComments;
+    @Schema(description = "上料代码插入到NC文件头前")
+    private Boolean insertLoadingCodeAtFileHeader;
+    @Schema(description = "上料代码")
+    private String loadingCode;
+    @Schema(description = "大板NC正(A)面文件头")
+    private String largePlateNcPositiveFileHeader;
+    @Schema(description = "大板NC正(A)面文件尾")
+    private String largePlateNcPositiveFileFooter;
+    @Schema(description = "大板NC反(B)面文件头")
+    private String largePlateNcNegativeFileHeader;
+    @Schema(description = "大板NC反(B)面文件尾")
+    private String largePlateNcNegativeFileFooter;
+    @Schema(description = "小板NC文件头")
+    private String smallPlateNcFileHeader;
+    @Schema(description = "小板NC文件尾")
+    private String smallPlateNcFileFooter;
+    @Schema(description = "小板切割开始")
+    private String smallPlateCuttingStart;
+    @Schema(description = "小板切割结束")
+    private String smallPlateCuttingEnd;
+
+    //优化排版
+    @Schema(description = "默认true，双面加工优先排版")
+    private Boolean allowDoubleHoleFirstSort;
+    @Schema(description = "余料板允许排入双面加工的板件")
+    private Boolean yuLiaoBoardDo2FaceBlock;
+
+    //样式排版
+    @Schema(description = "标尺(工件坐标)-刻度标线 间距")
+    private Double scaleLineSpacing;
+    @Schema(description = "标尺(工件坐标)-刻度标线线宽")
+    private Double scaleLineWidth;
+    @Schema(description = "标尺(工件坐标)-刻度标线线长")
+    private Double scaleLineLong;
+    @Schema(description = "标尺(工件坐标)-刻度标线颜色")
+    private String scaleLineColor;
+    @Schema(description = "标尺(工件坐标)-刻度标线 偏移标尺线距离")
+    private Double scaleLineDistance;
+    @Schema(description = "标尺(工件坐标)-数值 字体")
+    private String rulerValueFont;
+    @Schema(description = "标尺(工件坐标)-数值 大小")
+    private Double rulerValueSize;
+    @Schema(description = "标尺(工件坐标)-颜色")
+    private String rulerValueColor;
+    @Schema(description = "标尺(工件坐标)-数值 ")
+    private Double rulerValueDistance;
+    @Schema(description = "台面轮廓-轮廓线 线宽")
+    private Double tableContorLineWidth;
+    @Schema(description = "台面轮廓-轮廓线 颜色")
+    private String tableContorColor;
+    @Schema(description = "台面轮廓-填充 颜色")
+    private String tableFillColor;
+    @Schema(description = "台面轮廓-填充 平铺几何线条")
+    private Double tableFillGeometry;
+    @Schema(description = "工位号 字体")
+    private String useDoubleworkFont;
+    @Schema(description = "工位号 大小")
+    private Double useDoubleworkSize;
+    @Schema(description = "工位号 颜色")
+    private String useDoubleworkColor;
+    @Schema(description = "工位号 偏移台面轮廓线距离")
+    private String useDoubleworkDistance;
+    @Schema(description = "原始轮廓-轮廓线 线宽")
+    private Double originContourWidth;
+    @Schema(description = "原始轮廓-轮廓线 颜色")
+    private String originContourColor;
+    @Schema(description = "原始轮廓-填充 颜色")
+    private String originFillColor;
+    @Schema(description = "原始轮廓-填充 平铺几何线条")
+    private Double originFillGeometry;
+    @Schema(description = "修边偏移轮廓-轮廓线 线宽")
+    private Double wheelContourWidth;
+    @Schema(description = "修边偏移轮廓-轮廓线 颜色")
+    private String wheelContourColor;
+    @Schema(description = "修边偏移轮廓-与原始轮廓间的填充 颜色")
+    private String wheelFillColor;
+    @Schema(description = "修边偏移轮廓-与原始轮廓间的填充 平铺几何线条")
+    private Double wheelFillGeometry;
+    @Schema(description = "尺寸规格-长*宽 字体")
+    private String dimensionFont;
+    @Schema(description = "尺寸规格-长*宽 大小")
+    private Double dimensionSize;
+    @Schema(description = "尺寸规格-长*宽 颜色")
+    private String dimensionColor;
+    @Schema(description = "尺寸规格-长*宽 偏移台面轮廓线距离")
+    private Double dimensionDistance;
+    @Schema(description = "开料原始轮廓-轮廓线 线宽")
+    private Double cuttingMaterialWidth;
+    @Schema(description = "开料原始轮廓-轮廓线 颜色")
+    private String cuttingMaterialColor;
+    @Schema(description = "开料原始轮廓-轮廓线 正纹/反纹区分")
+    private Boolean cuttingMaterialDistinguish;
+    @Schema(description = "开料原始轮廓-填充 颜色")
+    private String cuttingFillColor;
+    @Schema(description = "开料原始轮廓-填充 平铺几何线条")
+    private Double cuttingFillGeometry;
+    @Schema(description = "扩展尺寸轮廓-轮廓线 线宽")
+    private Double expandContourWidth;
+    @Schema(description = "扩展尺寸轮廓-轮廓线 颜色")
+    private String expandContourColor;
+    @Schema(description = "扩展尺寸轮廓-与原始轮廓间的填充 颜色")
+    private String expandFillColor;
+    @Schema(description = "扩展尺寸轮廓-与原始轮廓间的填充 平铺几何线条")
+    private Double expandFillGeometry;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-标线/界线 线宽")
+    private Double checkLineWidth;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-标线/界线 线长")
+    private Double checkLineLong;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-标线/界线 颜色")
+    private String checkLineColor;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-标线/界线 偏移标尺线距离")
+    private Double checkLineDistance;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-数值 字体")
+    private String checkNumberFont;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-数值 大小")
+    private Double checkNumberSize;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-数值 颜色")
+    private String checkNumberColor;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-数值 偏移标尺线距离")
+    private Double checkNumberDistance;
+    @Schema(description = "干涉显示-填充 颜色")
+    private String displayFillColor;
+    @Schema(description = "干涉显示-填充 平铺几何线条")
+    private Double displayFillGeometry;
+    @Schema(description = "移动/拖拽显示-填充 颜色")
+    private String dragFillColor;
+    @Schema(description = "移动/拖拽显示-填充 平铺几何线条")
+    private Double dragFillGeometry;
+    @Schema(description = "开料顺序-数值 字体")
+    private String cuttingOrderFont;
+    @Schema(description = "开料顺序-数值 大小")
+    private Double cuttingOrderSize;
+    @Schema(description = "开料顺序-数值 颜色")
+    private String cuttingOrderColor;
+    @Schema(description = "下刀点-圆点 大小")
+    private Double cuttingPointSize;
+    @Schema(description = "下刀点-圆点 颜色")
+    private String cuttingPointColor;
+    @Schema(description = "对齐参考点-圆点 大小")
+    private Double alignPointSize;
+    @Schema(description = "对齐参考点-圆点 颜色")
+    private String alignPointColor;
+    @Schema(description = "对齐参考点-圆点 移动/对齐参考点")
+    private Double alignPointType;
+    @Schema(description = "反面加工标记-圆圈 直径")
+    private Double reverseDiameter;
+    @Schema(description = "反面加工标记-圆圈 线宽")
+    private Double reverseLineWidth;
+    @Schema(description = "反面加工标记-圆圈 颜色")
+    private String reverseColor;
+    @Schema(description = "板高方向标记-箭头 大小")
+    private Double flagArrowSize;
+    @Schema(description = "板高方向标记-箭头 颜色")
+    private String flagArrowColor;
+    @Schema(description = "板件编号-编码 字体")
+    private String banCodeFont;
+    @Schema(description = "板件编号-编码 大小")
+    private Double banCodeSize;
+    @Schema(description = "板件编号-编码 颜色")
+    private String banCodeColor;
+    @Schema(description = "板件编号-板件尺寸 字体")
+    private String banNumFont;
+    @Schema(description = "板件编号-板件尺寸 大小")
+    private Double banNumSize;
+    @Schema(description = "板件编号-板件尺寸 颜色")
+    private String banNumColor;
+    @Schema(description = "余料板-轮廓线 线宽")
+    private Double restTourWidth;
+    @Schema(description = "余料板-轮廓线 颜色")
+    private String restTourColor;
+    @Schema(description = "余料板-填充 颜色")
+    private String restFillColor;
+    @Schema(description = "余料板-填充 平铺几何线条")
+    private Double restFillGeometry;
+    @Schema(description = "孔位显示-轮廓线 线宽")
+    private Double holeTourWidth;
+    @Schema(description = "孔位显示-轮廓线 颜色")
+    private String holeTourColor;
+    @Schema(description = "孔位显示-填充 颜色")
+    private String holeFillColor;
+    @Schema(description = "孔位显示-填充 平铺几何线条")
+    private Double holeFillGeometry;
+    @Schema(description = "孔位显示-填充 正反面挖穿区分")
+    private Boolean holeFillType;
+    @Schema(description = "造型刀路/槽轮廓显示-轮廓线 线宽")
+    private Double profilingTourWidth;
+    @Schema(description = "造型刀路/槽轮廓显示-轮廓线 颜色")
+    private String profilingTourColor;
+    @Schema(description = "造型刀路/槽轮廓显示-填充 颜色")
+    private String profilingFillColor;
+    @Schema(description = "造型刀路/槽轮廓显示-填充 平铺几何线条")
+    private Double profilingFillGeometry;
+    @Schema(description = "造型刀路/槽轮廓显示-填充 正反面挖穿区分")
+    private Boolean profilingFillType;
+    @Schema(description = "孔槽标注-位置 距小板边")
+    private Double holePositionSmall;
+    @Schema(description = "孔槽标注-位置 距大板/台面")
+    private Double holePositionLarge;
+    @Schema(description = "孔槽标注-位置 字体")
+    private String holePositionFont;
+    @Schema(description = "孔槽标注-位置 大小")
+    private Double holePositionSize;
+    @Schema(description = "孔槽标注-位置 颜色")
+    private String holePositionColor;
+    @Schema(description = "孔槽标注-位置 线宽")
+    private Double holePositionWidth;
+    @Schema(description = "孔槽标注-尺寸 直径/宽度")
+    private Double holeSizeDiameter;
+    @Schema(description = "孔槽标注-尺寸 深度")
+    private Double holeSizeDepth;
+    @Schema(description = "孔槽标注-尺寸 字体")
+    private String holeSizeFont;
+    @Schema(description = "孔槽标注-尺寸 大小")
+    private Double holeSizeSize;
+    @Schema(description = "孔槽标注-尺寸 颜色")
+    private String holeSizeColor;
+
+
+
+    @NoArgsConstructor
+    @Data
+    public static class KnifeListBean {
+        @Schema(description = "KnifeID")
+        private Integer knifeID;
+        @Schema(description = "刀具")
+        private String knifeName;
+        @Schema(description = "刀具类型")
+        private Integer knifeType;
+        @Schema(description = "轴号")
+        private Integer axleID;
+        @Schema(description = "辅助开料")
+        private Boolean allowCut;
+        @Schema(description = "排钻")
+        private Boolean allowHole;
+        @Schema(description = "辅助开料")
+        private Boolean allowHole1;
+        @Schema(description = "是否运行铣孔")
+        private Boolean isXiKnif;
+        @Schema(description = "AllowPrevRun")
+        private Boolean allowPrevRun;
+        @Schema(description = "直径")
+        private Integer diameter;
+        @Schema(description = "刀长")
+        private Integer length;
+        @Schema(description = "步进深度")
+        private Double stepDepth;
+        @Schema(description = "是否主刀")
+        private Boolean mainKnife;
+        @Schema(description = "组号")
+        private Integer groupNumber;
+        @Schema(description = "X轴偏移")
+        private Double f_offsetX;
+        @Schema(description = "Y轴偏移")
+        private Double f_offsetY;
+        @Schema(description = "Diameter2")
+        private Integer diameter2;
+        @Schema(description = "GroupType")
+        private String groupType;
+        @Schema(description = "X轴偏移")
+        private Integer offsetX;
+        @Schema(description = "Y轴偏移")
+        private Integer offsetY;
+        @Schema(description = "Z轴偏移")
+        private Integer offsetZ;
+        @Schema(description = "速度")
+        private Integer speed;
+        @Schema(description = "轴启动指令")
+        private String axisStartInstruction;
+        @Schema(description = "刀启动指令")
+        private String knifeStartInstruction;
+        @Schema(description = "刀停止指令")
+        private String knifeStopInstruction;
+        @Schema(description = "轴停止指令")
+        private String axisStopInstruction;
+        @Schema(description = "是否预启动")
+        private String preStartEnabled;
+        @Schema(description = "高级加工")
+        private Boolean advancedProcessingEnabled;
+        @Schema(description = "集合加工")
+        private Boolean batchProcessingEnabled;
+        @Schema(description = "默认开料刀")
+        private Boolean defaultCuttingToolSelected;
+
+    }
+
+      /* @Schema(description = "默认false，旧版本刀库配置（不带轴号、排钻启停使用排钻包启停参数项设置）；true，使用新模式刀库配置（支持轴号、组合刀、多轴预启动）。")
+    private Boolean useNewKnifeModule;*/
+   /* @Schema(description = "默认[]，造型刀组")
+    private List<String> modelKnifeGroup;*/
+    /*  @Schema(description = "默认false，使用横竖算法（电子锯）优化，目前无效")
+      private Boolean useDianZiJuMethod;*/
+    /*  @Schema(description = "默认空，强制分刀小板顺序号，如：1,-1,-2，第一片、最后一片、倒数第二片分刀")
+      private String splitBlockSeqIds;*/
+    /*    @Schema(description = "默认false，最小板件分刀开料")
+        private Boolean limitDouleSplit;*/
+  /*  @Schema(description = "默认false，通孔(穿孔)分正反两刀加工（失效？）")
+    private Boolean tongHoleUseTwoTime;*/
+    /* @Schema(description = "默认150，开料优先最小宽度")
+    private Integer autoSortingMinWidth;*/
+    /*   @Schema(description = "默认0，共边加速")
+    private Integer sameBorderHighSpeed;*/
+    /*  @Schema(description = "默认3000，转角切割速度")
+      private Integer workCornerSpeed;*/
+    /*Schema(description = "默认0，停刀位置X坐标")
+    private Integer freeLocationX;
+    @Schema(description = "默认2440，停刀位置Y坐标")
+    private Integer freeLocationY;
+    @Schema(description = "默认0，起始下刀高度（距板面）")
+    private Integer workStartHeight;*/
     /*@Schema(description ="默认false，显示自动上料代码配置")
     private Boolean showAutoLoadBoard;
     @Schema(description ="默认false，显示排钻包起停配置")
@@ -566,70 +796,50 @@ public class CuttingSettingDO extends ESDocument {
     private Boolean allowOppositeDealChuanHole;
     @Schema(description = "默认cftech123456789，高级配置密码")
     private String managerPassword;*/
+    /* @Schema(description = "默认{0} {1}，导出NC文件路径")
+    private String exportBoardPathName;*/
+   /* @Schema(description = "默认{0}_A.nc，正面NC文件名")
+    private String boardFileA;
+    @Schema(description = "默认{0}_B.nc，反面NC文件名")
+    private String boardFileB;
+    @Schema(description = "默认{0}.nc，小板文件名")
+    private String blockFile;
+    @Schema(description = "默认空，正面NC文件头")
+    private String ncFileHead;
+    @Schema(description = "默认空，正面NC文件尾")
+    private String ncFileEnd;
+    @Schema(description = "默认空，反面NC文件头")
+    private String ncFileHead_B;
+    @Schema(description = "默认空，反面NC文件尾")
+    private String ncFileEnd_B;
+    @Schema(description = "默认空，小板（补孔）NC文件头")
+    private String ncFileHead_Block;
+    @Schema(description = "默认空，小板（补孔）NC文件尾")
+    private String ncFileEnd_Block;*/
+   /* @Schema(description = "默认true，非矩形板R倒角")
+    private Boolean unregularBlockFilletCurve;*/
 
-    @NoArgsConstructor
+  /*  @Schema(description = "默认true，导出NC文件注释")
-    @Data
+    private Boolean allowNCComments;*/
-    public static class KnifeListBean {
+   /* @Schema(description = "默认false，G代码行尾加结束符")
-        @Schema(description = "KnifeID")
+    private Boolean allowAddGcodeEndChar;
-        private Integer knifeID;
+    @Schema(description = "默认空，G代码行结尾代码")
-        @Schema(description = "刀具")
+    private String gcodeEndChar;
-        private String knifeName;
+    @Schema(description = "默认false（utf8），NC文件编码，true（gb2312）")
-        @Schema(description = "刀具类型")
+    private Boolean ncFileIsGB2312;
-        private Integer knifeType;
+    @Schema(description = "默认true，导出反面NC文件")
-        @Schema(description = "轴号")
+    private Boolean allowExportNC_BackFace;
-        private Integer axleID;
+    @Schema(description = "默认false，正反面加工合成一个文件")
-        @Schema(description = "辅助开料")
+    private Boolean oneBoardFile;
-        private Boolean allowCut;
+    @Schema(description = "默认false，导出小板NC文件")
-        @Schema(description = "排钻")
+    private Boolean allowExportNC_block;
-        private Boolean allowHole;
+    @Schema(description = "默认false，是否导出优化结果cfdat文件")
-        @Schema(description = "辅助开料")
+    private Boolean allowExportDataFile;
-        private Boolean allowHole1;
+    @Schema(description = "默认false，导出大板dxf文件")
-        @Schema(description = "是否运行铣孔")
+    private Boolean allowExportBoardDxf;
-        private Boolean isXiKnif;
+    @Schema(description ="默认false，显示双工位配置")
-        @Schema(description = "AllowPrevRun")
+    private Boolean showTwoWorkSpace;
-        private Boolean allowPrevRun;
+    @Schema(description ="默认false，显示选择开料刀配置")
-        @Schema(description = "直径")
+    private Boolean showChooseCutKnife;*/
-        private Integer diameter;
-        @Schema(description = "刀长")
-        private Integer length;
-        @Schema(description = "步进深度")
-        private Double stepDepth;
-        @Schema(description = "是否主刀")
-        private Boolean mainKnife;
-        @Schema(description = "组号")
-        private Integer groupNumber;
-        @Schema(description = "X轴偏移")
-        private Double f_offsetX;
-        @Schema(description = "Y轴偏移")
-        private Double f_offsetY;
-        @Schema(description = "Diameter2")
-        private Integer diameter2;
-        @Schema(description = "GroupType")
-        private String groupType;
-        @Schema(description = "X轴偏移")
-        private Integer offsetX;
-        @Schema(description = "Y轴偏移")
-        private Integer offsetY;
-        @Schema(description = "Z轴偏移")
-        private Integer offsetZ;
-        @Schema(description = "速度")
-        private Integer speed;
-        @Schema(description = "轴启动指令")
-        private String axisStartInstruction;
-        @Schema(description = "刀启动指令")
-        private String knifeStartInstruction;
-        @Schema(description = "刀停止指令")
-        private String knifeStopInstruction;
-        @Schema(description = "轴停止指令")
-        private String axisStopInstruction;
-        @Schema(description = "是否预启动")
-        private String preStartEnabled;
-        @Schema(description = "高级加工")
-        private Boolean advancedProcessingEnabled;
-        @Schema(description = "集合加工")
-        private Boolean batchProcessingEnabled;
-        @Schema(description = "默认开料刀")
-        private Boolean defaultCuttingToolSelected;
 
-    }
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java

@@ -19,16 +19,14 @@ public class CuttingTemplateMachineDO extends ESDocument {
 
     @Schema(description = "开料机台模板id")
     private Long templateId;
-    @Schema(description = "默认true，按机台尺寸排版/按板材尺寸排版，false台面尺寸范围内自适应材料尺寸")
+    @Schema(description = "默认1，开料刀缝间隙")
-    private Boolean useWorkPanelSize;
+    private Integer cutGap;
+
+    //基础配置
     @Schema(description = "默认1220，机台台面宽度（原料板宽）")
     private Integer boardWidth;
     @Schema(description = "默认2440，机台台面长度（原料板长）")
     private Integer boardLength;
-    @Schema(description = "默认3，总修边值")
-    private Integer reverseTrimValue;
-    @Schema(description = "默认1，开料刀缝间隙")
-    private Integer cutGap;
     @Schema(description = "默认0，工位1原点位置")
     private Integer originPoIntegerPosition;
     @Schema(description = "工作原点Z0基准面")
@@ -37,6 +35,8 @@ public class CuttingTemplateMachineDO extends ESDocument {
     private String layoutBenchmark;
     @Schema(description = "排版基准点跟随大板定位")
     private Boolean useLocator4Place;
+    @Schema(description = "默认true，按机台尺寸排版/按板材尺寸排版，false台面尺寸范围内自适应材料尺寸")
+    private Boolean useWorkPanelSize;
     @Schema(description = "默认0 短边坐标轴向")
     private Integer widthSideAxis;
     @Schema(description = "默认2 长边坐标轴向")
@@ -53,99 +53,70 @@ public class CuttingTemplateMachineDO extends ESDocument {
     private Integer offsetX_Block;
     @Schema(description = "默认0，小板定位坐标Y偏移")
     private Integer offsetY_Block;
-    @Schema(description = "默认200，余料生成规则1-两边均大于限定值")
+    @Schema(description = "矩形板件R角开料 默认否")
-    private Integer scrapBlockSquare;
+    private Boolean rectanglR;
-    @Schema(description = "默认100，余料生成规则2-短边最小限定值")
+    @Schema(description = "圆弧加工使用IJ指令 默认否，使用R指令")
-    private Integer srcapBlockWidthMin;
+    private Boolean arcUseIJ;
-    @Schema(description = "默认600，余料生成规则2-长边最小限定值")
+    @Schema(description = "圆弧方向反转 默认否 顺时针G2/逆时针G3")
-    private Integer scrapBlockWidthMax;
+    private Boolean arcInversion;
-    @Schema(description = "余料归方")
+    @Schema(description = "圆弧转多段线长度 默认0 不转")
-    private Boolean scrapDirection;
+    private Boolean arcTurnLength;
-    @Schema(description = "钻孔延时")
-    private Boolean drillingDelay;
-    @Schema(description = "钻孔延时条件-孔直径上限")
-    private Double drillingDelayConditionMaxDiameter;
-    @Schema(description = "钻孔延时指令")
-    private String drillingDelayInstruction;
 
+
+
+    //加工
     @Schema(description = "默认40，安全高度")
     private Integer freeHeight;
     @Schema(description = "总修边值")
     private Double totalTrimValue;
-    /*@Schema(description = "默认0，停刀位置X坐标")
+    @Schema(description = "默认3，总修边值")
-    private Integer freeLocationX;*/
+    private Integer reverseTrimValue;
-/*    @Schema(description = "默认2440，停刀位置Y坐标")
-    private Integer freeLocationY;*/
     @Schema(description = "默认15000，空程速度")
     private Integer freeSpeed;
-    /* @Schema(description = "默认0，起始下刀高度（距板面）")
+    @Schema(description = "默认2400，排钻空程速度")
-     private Integer workStartHeight;*/
+    private Integer holeFreeSpeed;
     @Schema(description = "默认3000，下刀速度")
     private Integer workStartSpeed;
-    @Schema(description = "默认20，斜向下刀水平距离")
-    private Integer workStartDistance;
     @Schema(description = "默认2，开料提前")
     private Integer workPreDistance;
+    @Schema(description = "默认25，收刀距离")
+    private Integer workEndDistace;
+    @Schema(description = "默认3000，收刀速度")
+    private Integer workEndSpeed;
+    @Schema(description = "默认1200，排钻速度")
+    private Integer holeSpeed;
+    @Schema(description = "默认8000，造型速度")
+    private Integer modelSpeed;
     @Schema(description = "默认8000，开料速度")
     private Integer cuttingSpeedForMaterial;
     @Schema(description = "公边切割速度")
     private Double cuttingSpeedForEdge;
     @Schema(description = "外转角切割速度")
     private Double outerCornerCuttingSpeed;
-    /*  @Schema(description = "默认3000，转角切割速度")
-      private Integer workCornerSpeed;*/
-    @Schema(description = "默认3000，收刀速度")
-    private Integer workEndSpeed;
-    @Schema(description = "默认25，收刀距离")
-    private Integer workEndDistace;
-    /*   @Schema(description = "默认0，共边加速")
-       private Integer sameBorderHighSpeed;*/
     @Schema(description = "默认0，内转角减速提前距离")
     private Integer innerCornerDistence;
     @Schema(description = "默认3000，内转角速度")
     private Integer innerCornerSpeed;
-    @Schema(description = "默认2400，排钻空程速度")
-    private Integer holeFreeSpeed;
     @Schema(description = "默认2，排钻初始段深度")
     private Integer holeFirstDepth;
     @Schema(description = "默认800，排钻初始段速度")
     private Integer holeFirstSpeed;
-    @Schema(description = "默认1200，排钻速度")
-    private Integer holeSpeed;
-    @Schema(description = "默认8000，造型速度")
-    private Integer modelSpeed;
-    @Schema(description = "默认true，双面加工优先排版")
-    private Boolean allowDoubleHoleFirstSort;
-    @Schema(description = "余料板允许排入双面加工的板件")
-    private Boolean yuLiaoBoardDo2FaceBlock;
-    /* @Schema(description = "默认150，开料优先最小宽度")
-     private Integer autoSortingMinWidth;*/
-    @Schema(description = "默认true，反面加工先修边后加工孔槽")
-    private Boolean firstCutBorderInFaceB;
     @Schema(description = "默认false，通孔一刀打穿")
     private Boolean tongHoleOnlyOneTime;
     @Schema(description = "穿孔对面加工")
     private Boolean tongKongDoBackFace;
     @Schema(description = "先修边加工")
     private Boolean priorTrimmingProcessing;
-    /*  @Schema(description = "默认false，通孔(穿孔)分正反两刀加工（失效？）")
-      private Boolean tongHoleUseTwoTime;*/
     @Schema(description = "默认false，开料分工")
     private Boolean allowDoubleSplit;
     @Schema(description = "默认8，分刀步进深度")
     private Integer splitDepth;
-    /*    @Schema(description = "默认false，最小板件分刀开料")
+    @Schema(description = "仅加工孔/造型，")
-        private Boolean limitDouleSplit;*/
+    private Boolean disposeCutBlock;
     @Schema(description = "默认100，小板分刀-短边上限")
     private Integer doubleSplitWidth;
     @Schema(description = "默认100，小板分刀-长边上限")
     private Integer doubleSplitLength;
-    /*  @Schema(description = "默认空，强制分刀小板顺序号，如：1,-1,-2，第一片、最后一片、倒数第二片分刀")
-      private String splitBlockSeqIds;*/
-  /*  @Schema(description = "默认false，使用横竖算法（电子锯）优化，目前无效")
-    private Boolean useDianZiJuMethod;*/
-    @Schema(description = "仅加工孔/造型，")
-    private Boolean disposeCutBlock;
     @Schema(description = "挖穿板内板件优先开料")
     private Boolean cutBlockInModelFirst;
     @Schema(description = "同刀辅助开料")
@@ -160,89 +131,22 @@ public class CuttingTemplateMachineDO extends ESDocument {
     private Double helpCutKnifeDepth;
     @Schema(description = "辅助开料指令")
     private String auxiliaryCuttingInstruction;
-    /* @Schema(description = "默认false，旧版本刀库配置（不带轴号、排钻启停使用排钻包启停参数项设置）；true，使用新模式刀库配置（支持轴号、组合刀、多轴预启动）。")
+    @Schema(description = "默认200，余料生成规则1-两边均大于限定值")
-     private Boolean useNewKnifeModule;*/
+    private Integer scrapBlockSquare;
-   /* @Schema(description = "默认[]，造型刀组")
+    @Schema(description = "默认100，余料生成规则2-短边最小限定值")
-    private List<String> modelKnifeGroup;*/
+    private Integer srcapBlockWidthMin;
-    @Schema(description = "KnifeList")
+    @Schema(description = "默认600，余料生成规则2-长边最小限定值")
-    private List<CuttingSettingDO.KnifeListBean> knifeList;
+    private Integer scrapBlockWidthMax;
-    @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
+    @Schema(description = "余料归方")
-    private String exportOrderPathName;
+    private Boolean scrapDirection;
-    @Schema(description = "大板NC正(A)面文件名")
+    @Schema(description = "钻孔延时")
-    private String largePlateNcPositiveFileName;
+    private Boolean drillingDelay;
-    @Schema(description = "大板NC反(B)面文件名")
+    @Schema(description = "钻孔延时条件-孔直径上限")
-    private String largePlateNcNegativeFileName;
+    private Double drillingDelayConditionMaxDiameter;
-    @Schema(description = "小板NC正(A)面文件名")
+    @Schema(description = "钻孔延时指令")
-    private String smallPlateNcPositiveFileName;
+    private String drillingDelayInstruction;
-    @Schema(description = "小板NC反(B)面文件名")
-    private String smallPlateNcNegativeFileName;
-    @Schema(description = "大板DXF(排版图)文件名")
-    private String largePlateDxfLayoutFileName;
-    @Schema(description = "小板DXF(孔槽加工图)文件名")
-    private String smallPlateDxfProcessingFileName;
-    @Schema(description = "导出大板NC反(B)面文件")
-    private String exportLargePlateNcNegativeFile;
-    @Schema(description = "合并大板NC正反(AB)面文件")
-    private String mergeLargePlateNcFiles;
-    @Schema(description = "导出小板NC正(A)面文件")
-    private String exportSmallPlateNcPositiveFile;
-    @Schema(description = "导出小板NC反(B)面文件")
-    private String exportSmallPlateNcNegativeFile;
-    @Schema(description = "合并小板NC正反(AB)面文件")
-    private String mergeSmallPlateNcFiles;
-    @Schema(description = "导出大板DXF(排版图)文件")
-    private String exportLargePlateDxfLayoutFile;
-    @Schema(description = "导出小板DXF(孔槽加工图)文件")
-    private String exportSmallPlateDxfProcessingFile;
-    @Schema(description = "NC文件编码")
-    private String ncFileEncoding;
-    @Schema(description = "添加NC文件注释")
-    private String addNcFileComments;
-    @Schema(description = "上料代码插入到NC文件头前")
-    private Boolean insertLoadingCodeAtFileHeader;
-    @Schema(description = "上料代码")
-    private Boolean loadingCode;
-    @Schema(description = "大板NC正(A)面文件头")
-    private String largePlateNcPositiveFileHeader;
-    @Schema(description = "大板NC正(A)面文件尾")
-    private String largePlateNcPositiveFileFooter;
-    @Schema(description = "大板NC反(B)面文件头")
-    private String largePlateNcNegativeFileHeader;
-    @Schema(description = "大板NC反(B)面文件尾")
-    private String largePlateNcNegativeFileFooter;
-    @Schema(description = "小板NC文件头")
-    private String smallPlateNcFileHeader;
-    @Schema(description = "小板NC文件尾")
-    private String smallPlateNcFileFooter;
-    @Schema(description = "小板切割开始")
-    private String smallPlateCuttingStart;
-    @Schema(description = "小板切割结束")
-    private String smallPlateCuttingEnd;
-
-    /* @Schema(description = "默认{0} {1}，导出NC文件路径")
-     private String exportBoardPathName;*/
-   /* @Schema(description = "默认{0}_A.nc，正面NC文件名")
-    private String boardFileA;
-    @Schema(description = "默认{0}_B.nc，反面NC文件名")
-    private String boardFileB;
-    @Schema(description = "默认{0}.nc，小板文件名")
-    private String blockFile;
-    @Schema(description = "默认空，正面NC文件头")
-    private String ncFileHead;
-    @Schema(description = "默认空，正面NC文件尾")
-    private String ncFileEnd;
-    @Schema(description = "默认空，反面NC文件头")
-    private String ncFileHead_B;
-    @Schema(description = "默认空，反面NC文件尾")
-    private String ncFileEnd_B;
-    @Schema(description = "默认空，小板（补孔）NC文件头")
-    private String ncFileHead_Block;
-    @Schema(description = "默认空，小板（补孔）NC文件尾")
-    private String ncFileEnd_Block;*/
     @Schema(description = "默认false，矩形板件开料R拐角")
     private Boolean regularBlockFilletCurve;
-    /* @Schema(description = "默认true，非矩形板R倒角")
-     private Boolean unregularBlockFilletCurve;*/
     @Schema(description = "默认false，加工圆弧使用IJ指令")
     private Boolean dealCircleWithIJ;
     @Schema(description = "默认false，G2/G3圆弧方向反转")
@@ -251,28 +155,16 @@ public class CuttingTemplateMachineDO extends ESDocument {
     private Boolean arcLineMaxLength;
     @Schema(description = "排钻按位置加工")
     private Boolean holePositionProcessing;
-    /*  @Schema(description = "默认true，导出NC文件注释")
+
-      private Boolean allowNCComments;*/
+
-   /* @Schema(description = "默认false，G代码行尾加结束符")
+    @Schema(description = "默认20，斜向下刀水平距离")
-    private Boolean allowAddGcodeEndChar;
+    private Integer workStartDistance;
-    @Schema(description = "默认空，G代码行结尾代码")
+    @Schema(description = "刀库")
-    private String gcodeEndChar;
+    private List<CuttingSettingDO.KnifeListBean> knifeList;
-    @Schema(description = "默认false（utf8），NC文件编码，true（gb2312）")
+
-    private Boolean ncFileIsGB2312;
+
-    @Schema(description = "默认true，导出反面NC文件")
+
-    private Boolean allowExportNC_BackFace;
+    //高级设置
-    @Schema(description = "默认false，正反面加工合成一个文件")
-    private Boolean oneBoardFile;
-    @Schema(description = "默认false，导出小板NC文件")
-    private Boolean allowExportNC_block;
-    @Schema(description = "默认false，是否导出优化结果cfdat文件")
-    private Boolean allowExportDataFile;
-    @Schema(description = "默认false，导出大板dxf文件")
-    private Boolean allowExportBoardDxf;
-    @Schema(description ="默认false，显示双工位配置")
-    private Boolean showTwoWorkSpace;
-    @Schema(description ="默认false，显示选择开料刀配置")
-    private Boolean showChooseCutKnife;*/
     @Schema(description ="默认true，显示开料机工作模式(是否排钻/造型，sc)配置")
     private Boolean showPriorFacing;
     @Schema(description = "双工位")
@@ -347,228 +239,267 @@ public class CuttingTemplateMachineDO extends ESDocument {
     private Double cNCModelingSpeed;
     @Schema(description = "NC指令可配置")
     private String configurableNCCommands;
+
+
+
     @Schema(description = "默认false，启用自定义板件编号")
     private Boolean allowBlockNo_Note;
     @Schema(description = "默认空，机台备注")
     private String remark;
-    @Schema(description = "矩形板件R角开料 默认否")
-    private Boolean rectanglR;
-    @Schema(description = "圆弧加工使用IJ指令 默认否，使用R指令")
-    private Boolean arcUseIJ;
-    @Schema(description = "圆弧方向反转 默认否 顺时针G2/逆时针G3")
-    private Boolean arcInversion;
-    @Schema(description = "圆弧转多段线长度 默认0 不转")
-    private Boolean arcTurnLength;
 
-    /*@Schema(description ="默认false，显示自动上料代码配置")
-    private Boolean showAutoLoadBoard;
-    @Schema(description ="默认false，显示排钻包起停配置")
-    private Boolean showHoleGroup;
-    @Schema(description ="自动贴标机配置")
-    private Boolean showAutoNotePrIntegerer;
-    @Schema(description ="默认false，自定义板标签编号")
-    private Boolean showCustomBlockNo;
-    @Schema(description ="默认false，显示可开料不排钻(有CNC/PTP，erp)配置")
-    private Boolean showMachine;
-    @Schema(description = "默认false，启用双工位")
-    private Boolean allowDoubleWorkSpace;
-    @Schema(description = "工位2与工位1同工件原点（同一坐标系")
-    private Boolean sameOriginPoIntegerPosition;
-    @Schema(description = "认0，工位2相对工位1坐标X偏移值")
-    private Integer offsetX_WorkNum2;
-    @Schema(description = "默认2600，工位2相对工位1坐标Y偏移值")
-    private Integer offsetY_WorkNum2;
-    @Schema(description = "默认0，工位2原点位置")
-    private Integer originPoIntegerPosition2;
-    @Schema(description = "默认0")
-    private Integer widthSideAxis2;
-    @Schema(description = "默认2")
-    private Integer lengthSideAxis2;
-    @Schema(description = "默认0，工位2定位点（靠点）")
-    private Integer locatorPosition2;
-    @Schema(description = "默认0，工位2大板定位坐标（工件坐标原点）X偏移值")
-    private Integer offsetX_Board2;
-    @Schema(description = "默认0，工位2大板定位坐标（工件坐标原点）Y偏移值")
-    private Integer offsetY_Board2;
-    @Schema(description = "默认false，正反面文件合并成一个NC文件")
-    private Boolean allowCombineNCWithDoubleWorkSpace;
-    @Schema(description = "默认true")
-    private Boolean isOddNumInWorkSpace1;
-    @Schema(description = "默认true")
-    private Boolean isHoleBlockInSpace1;
-    @Schema(description = "默认空，工位2正面NC文件头")
-    private String ncFileHead_WorkSpace2;
-    @Schema(description = "默认空，工位2正面NC文件尾")
-    private String ncFileEnd_WorkSpace2;
-    @Schema(description = "默认空，工位2反面NC文件头")
-    private String ncFileHead_B_WorkSpace2;
-    @Schema(description = "默认空，工位2反面NC文件尾")
-    private String ncFileEnd_B_WorkSpace2;
-    @Schema(description = "默认false，根据板厚选择开料刀")
-    private Boolean allowChangeCutKnifeWithThickness;
-    @Schema(description = "默认false，根据刀号选择开料刀")
-    private Boolean allowChangeCutKnifeWidthID;
-    @Schema(description = "默认[]空")
-    private List<String> boardKnifeList;
-    @Schema(description = "默认0，加工模式")
-    private Integer isPriorFacing_RoleNum;
-    @Schema(description = "默认true，开料机加工超小板")
-    private Boolean isForceHoling_MultiSide_Minimum;
-    @Schema(description = "默认50，超小板（两边都小于）值")
-    private Integer ignoreValue_MultiSide_Minimum;
-    @Schema(description = "默认true，开料机加工超细板")
-    private Boolean isForceHoling_SingleSide_Minimum;
-    @Schema(description = "默认50，超细板（一边小于）值")
-    private Integer ignoreValue_SingleSide_Minimum;
-    @Schema(description = "默认true，开料机加工超长板")
-    private Boolean isForceHoling_SingleSide_Maximum;
-    @Schema(description = "默认2440，超长板（一边大于）值")
-    private Integer ignoreValue_SingleSide_Maximum;
-    @Schema(description = "默认true，开料机加工超大板")
-    private Boolean isForceHoling_MultiSide_Maximun;
-    @Schema(description = "默认850，超大板（两边都大于）值")
-    private Integer ignoreValue_MultiSide_Maximun;
-    @Schema(description = "默认true，开料机加工异形板")
-    private Boolean isForceHoling_UnRegularBlock;
-    @Schema(description = "默认false，开料机加工孔-有造型的板件")
-    private Boolean isForceHoling_HasModel;
-    @Schema(description = "默认false，开料机加工全部造型")
-    private Boolean doModel_hasModel;
-    @Schema(description = "默认false，开料机加工异形板件的造型")
-    private Boolean doModel_UnRegular;
-    @Schema(description = "默认false，超小（两边都小于")
-    private Boolean doModel_twoSmall;
-    @Schema(description = "默认50，超小值")
-    private Integer doModel_twoSmall_Value;
-    @Schema(description = "默认false，超短（单边小于")
-    private Boolean doModel_oneSmall;
-    @Schema(description = "默认50，超短值")
-    private Integer doModel_oneSmall_Value;
-    @Schema(description = "默认false，超大（两边都大于）")
-    private Boolean doModel_twoBig;
-    @Schema(description = "默认850，超大值")
-    private Integer doModel_twoBig_Value;
-    @Schema(description = "默认false，超长（单边大于")
-    private Boolean doModel_oneBig;
-    @Schema(description = "默认2434，超长值")
-    private Integer doModel_oneBig_Value;
-    @Schema(description = "默认false，开料机加工造型-所有造型")
-    private Boolean isFoceModeling_hasModel;
-    @Schema(description = "默认false，开料机加工造型-有孔的板件")
-    private Boolean isFoceModeling_SameHoling;
-    @Schema(description = "默认false，开料机加工多段线造型")
-    private Boolean isFoceModeling_MultiLine;
-    @Schema(description = "默认false，开料机加工圆弧造型板")
-    private Boolean isForceModeling_Arc;
-    @Schema(description = "默认false，开料机加工挖穿造型板")
-    private Boolean isForceModeling_Through;
-    @Schema(description = "默认false，排版优先-排版面")
-    private Boolean isPriorFacing_KaiLiaoMian;
-    @Schema(description = "默认false，排版优先-反转开料面")
-    private Boolean isPriorFacing_Reverse;
-    @Schema(description = "默认true，排版优先-单面有造型")
-    private Boolean isPriorFacing_SingleModel;
-    @Schema(description = "默认true，排版优先-单面有造型-正面朝上??")
-    private Boolean isPriorFacing_SingleModel_Front;
-    @Schema(description = "默认true，排版优先-双面有造型")
-    private Boolean isPriorFacing_DoubleModel;
-    @Schema(description = "默认true，排版优先-双面有造型-正面朝上??")
-    private Boolean isPriorFacing_DoubleModel_Front;
-    @Schema(description = "默认true，排版优先-单面有孔")
-    private Boolean isPriorFacing_SingleHole;
-    @Schema(description = "默认true，排版优先-单面有孔-正面朝上??")
-    private Boolean isPriorFacing_SingleHole_Front;
-    @Schema(description = "IsPriorFacing_BigHole")
-    private Boolean isPriorFacing_BigHole;
-    @Schema(description = "默认true，排版优先-有大孔")
-    private Boolean isPriorFacing_BigHole_Front;
-    @Schema(description = "默认true，排版优先-双面有孔")
-    private Boolean isPriorFacing_DoubleHole;
-    @Schema(description = "默认true，排版优先-双面有孔-孔多面")
-    private Boolean isPriorFacing_DoubleHole_More;
-    @Schema(description = "默认空，自定义排版面规则")
-    private String isPriorFacing_CustomFunction;*/
 
- /*   @Schema(description = "认true，上料代码放文件头前")
+
-    private Boolean isLoadBoardBeforeFileHead;
+    //文件导出
-    @Schema(description = "默认空，上料代码??")
+    @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
-    private String ncLoadBoard;
+    private List<String> exportOrderPathName;
-    @Schema(description = "默认空，钻包启动代码")
+    @Schema(description = "大板NC正(A)面文件名")
-    private String ncFileHoleBegin;
+    private String largePlateNcPositiveFileName;
-    @Schema(description = "默认空，钻包停止代码")
+    @Schema(description = "大板NC反(B)面文件名")
-    private String ncFileHoleEnd;
+    private String largePlateNcNegativeFileName;
-    @Schema(description = "默认true，排钻按孔分组加工，false排钻就近调刀")
+    @Schema(description = "小板NC正(A)面文件名")
-    private Boolean holingByKnifeDia;
+    private String smallPlateNcPositiveFileName;
-    @Schema(description = "默认false，是否启用自动贴标")
+    @Schema(description = "小板NC反(B)面文件名")
-    private Boolean noteAutoPrIntegerer;
+    private String smallPlateNcNegativeFileName;
-    @Schema(description = "默认print_{0}.nc，标签贴标路径/文件名")
+    @Schema(description = "大板DXF(排版图)文件名")
-    private String noteNcName;
+    private String largePlateDxfLayoutFileName;
-    @Schema(description = "默认“标签/{0}_{1}.bmp”，标签导出路径/文件名")
+    @Schema(description = "小板DXF(孔槽加工图)文件名")
-    private String notePicName;
+    private String smallPlateDxfProcessingFileName;
-    @Schema(description = "默认jpg，标签导出图片格式")
+    @Schema(description = "导出大板NC反(B)面文件")
-    private String notePicType;
+    private String exportLargePlateNcNegativeFile;
-    @Schema(description = "默认24，图片位深")
+    @Schema(description = "合并大板NC正反(AB)面文件")
-    private String notePicBit;
+    private String mergeLargePlateNcFiles;
-    @Schema(description = "默认true，标签贴在开料正面")
+    @Schema(description = "导出小板NC正(A)面文件")
-    private Boolean notePrIntegerOnFaceA;
+    private String exportSmallPlateNcPositiveFile;
-    @Schema(description = "默认true，标签避让孔位")
+    @Schema(description = "导出小板NC反(B)面文件")
-    private Boolean notePositionAvoidHole;
+    private String exportSmallPlateNcNegativeFile;
-    @Schema(description = "默认60，自动贴标标签宽")
+    @Schema(description = "合并小板NC正反(AB)面文件")
-    private Integer noteWidth;
+    private String mergeSmallPlateNcFiles;
-    @Schema(description = "默认40，自动贴标标签高")
+    @Schema(description = "导出大板DXF(排版图)文件")
-    private Integer nOteHeight;
+    private String exportLargePlateDxfLayoutFile;
-    @Schema(description = "默认空，自动贴标函数")
+    @Schema(description = "导出小板DXF(孔槽加工图)文件")
-    private String noteContent;
+    private String exportSmallPlateDxfProcessingFile;
-    @Schema(description = "默认false，自动贴标文件生成在nc文件")
+    @Schema(description = "NC文件编码")
-    private Boolean notePushInNcFile;
+    private String ncFileEncoding;
-    @Schema(description = "默认false，自动贴标函数文件编码方式")
+    @Schema(description = "添加NC文件注释")
-    private Boolean noteGB2312;
+    private String addNcFileComments;
-    @Schema(description = "默认false，自动贴标其他函数是否导出")
+    @Schema(description = "上料代码插入到NC文件头前")
-    private Boolean noteOtherExport;
+    private Boolean insertLoadingCodeAtFileHeader;
-    @Schema(description = "默认空，自动贴标其他函数")
+    @Schema(description = "上料代码")
-    private String noteOtherFun;
+    private String loadingCode;
-    @Schema(description = "默认return obj.BlockNo; 自定义板件编号")
+    @Schema(description = "大板NC正(A)面文件头")
-    private String blockNo_Note;
+    private String largePlateNcPositiveFileHeader;
-   *//* @Schema(description = "默认{0}_{1}_{2}_{3}，")
+    @Schema(description = "大板NC正(A)面文件尾")
-    private String boardName;*//*
+    private String largePlateNcPositiveFileFooter;
-    @Schema(description = "默认10，最小板件宽度")
+    @Schema(description = "大板NC反(B)面文件头")
-    private Integer minBlockWidth;
+    private String largePlateNcNegativeFileHeader;
-    @Schema(description = "默认1，最小排钻孔半径")
+    @Schema(description = "大板NC反(B)面文件尾")
-    private Integer minHoleRadius;
+    private String largePlateNcNegativeFileFooter;
-    @Schema(description = "默认1，最小排钻深度")
+    @Schema(description = "小板NC文件头")
-    private Integer minHoleDepth;
+    private String smallPlateNcFileHeader;
-    @Schema(description = "默认0，最小造型深度")
+    @Schema(description = "小板NC文件尾")
-    private Integer minModelDepth;
+    private String smallPlateNcFileFooter;
-    @Schema(description = "默认1，最小造型刀半径")
+    @Schema(description = "小板切割开始")
-    private Integer minModelRadius;
+    private String smallPlateCuttingStart;
-    @Schema(description = "默认10，最大封边值（防止出错）")
+    @Schema(description = "小板切割结束")
-    private Integer maxBorderThickness;
+    private String smallPlateCuttingEnd;
-    @Schema(description = "默认false，过滤侧孔")
+
-    private Boolean ignore2in1SideHole;
+    //优化排版
-    @Schema(description = "默认0.01，过滤最小侧孔深度")
+    @Schema(description = "默认true，双面加工优先排版")
-    private Double ignore2in1SideHoleGap;
+    private Boolean allowDoubleHoleFirstSort;
-    @Schema(description = "默认false，是否可重新加载cfdat")
+    @Schema(description = "余料板允许排入双面加工的板件")
-    private Boolean canReloadPlaceInfo;
+    private Boolean yuLiaoBoardDo2FaceBlock;
-    @Schema(description = "默认5，最小排版空间")
+
-    private Integer miniumSpaceSize;
+    //样式排版
-    @Schema(description = "默认0，锯缝")
+    @Schema(description = "标尺(工件坐标)-刻度标线 间距")
-    private Integer neatenSpaceGap;
+    private Double scaleLineSpacing;
-    @Schema(description = "默认false，根据大板定位点，排版移动对齐到定位点")
+    @Schema(description = "标尺(工件坐标)-刻度标线线宽")
-    private Boolean resetPositionWithLocator;
+    private Double scaleLineWidth;
-    @Schema(description = "默认3，nc中小数点位数")
+    @Schema(description = "标尺(工件坐标)-刻度标线线长")
-    private Integer ncNumberFixNumber;
+    private Double scaleLineLong;
-    @Schema(description = "默认true，nc文件忽略空行")
+    @Schema(description = "标尺(工件坐标)-刻度标线颜色")
-    private Boolean ncFileRemoveEmptyLine;
+    private String scaleLineColor;
-    @Schema(description = "默认空，排钻悬停等待代码，如：G04 X1.500 暂停抬刀1.5秒")
+    @Schema(description = "标尺(工件坐标)-刻度标线 偏移标尺线距离")
-    private String holeWaitingCode;
+    private Double scaleLineDistance;
-    @Schema(description = "默认5，预启动提前动作（下刀——抬刀记作1个动作）")
+    @Schema(description = "标尺(工件坐标)-数值 字体")
-    private Integer prevRunActionCount;
+    private String rulerValueFont;
-    @Schema(description = "默认false，正面是否修边（L型）")
+    @Schema(description = "标尺(工件坐标)-数值 大小")
-    private Boolean shearBorderFaceA;
+    private Double rulerValueSize;
-    @Schema(description = "默认值false，穿孔对面打")
+    @Schema(description = "标尺(工件坐标)-颜色")
-    private Boolean allowOppositeDealChuanHole;
+    private String rulerValueColor;
-    @Schema(description = "默认cftech123456789，高级配置密码")
+    @Schema(description = "标尺(工件坐标)-数值 ")
-    private String managerPassword;*/
+    private Double rulerValueDistance;
+    @Schema(description = "台面轮廓-轮廓线 线宽")
+    private Double tableContorLineWidth;
+    @Schema(description = "台面轮廓-轮廓线 颜色")
+    private String tableContorColor;
+    @Schema(description = "台面轮廓-填充 颜色")
+    private String tableFillColor;
+    @Schema(description = "台面轮廓-填充 平铺几何线条")
+    private Double tableFillGeometry;
+    @Schema(description = "工位号 字体")
+    private String useDoubleworkFont;
+    @Schema(description = "工位号 大小")
+    private Double useDoubleworkSize;
+    @Schema(description = "工位号 颜色")
+    private String useDoubleworkColor;
+    @Schema(description = "工位号 偏移台面轮廓线距离")
+    private String useDoubleworkDistance;
+    @Schema(description = "原始轮廓-轮廓线 线宽")
+    private Double originContourWidth;
+    @Schema(description = "原始轮廓-轮廓线 颜色")
+    private String originContourColor;
+    @Schema(description = "原始轮廓-填充 颜色")
+    private String originFillColor;
+    @Schema(description = "原始轮廓-填充 平铺几何线条")
+    private Double originFillGeometry;
+    @Schema(description = "修边偏移轮廓-轮廓线 线宽")
+    private Double wheelContourWidth;
+    @Schema(description = "修边偏移轮廓-轮廓线 颜色")
+    private String wheelContourColor;
+    @Schema(description = "修边偏移轮廓-与原始轮廓间的填充 颜色")
+    private String wheelFillColor;
+    @Schema(description = "修边偏移轮廓-与原始轮廓间的填充 平铺几何线条")
+    private Double wheelFillGeometry;
+    @Schema(description = "尺寸规格-长*宽 字体")
+    private String dimensionFont;
+    @Schema(description = "尺寸规格-长*宽 大小")
+    private Double dimensionSize;
+    @Schema(description = "尺寸规格-长*宽 颜色")
+    private String dimensionColor;
+    @Schema(description = "尺寸规格-长*宽 偏移台面轮廓线距离")
+    private Double dimensionDistance;
+    @Schema(description = "开料原始轮廓-轮廓线 线宽")
+    private Double cuttingMaterialWidth;
+    @Schema(description = "开料原始轮廓-轮廓线 颜色")
+    private String cuttingMaterialColor;
+    @Schema(description = "开料原始轮廓-轮廓线 正纹/反纹区分")
+    private Boolean cuttingMaterialDistinguish;
+    @Schema(description = "开料原始轮廓-填充 颜色")
+    private String cuttingFillColor;
+    @Schema(description = "开料原始轮廓-填充 平铺几何线条")
+    private Double cuttingFillGeometry;
+    @Schema(description = "扩展尺寸轮廓-轮廓线 线宽")
+    private Double expandContourWidth;
+    @Schema(description = "扩展尺寸轮廓-轮廓线 颜色")
+    private String expandContourColor;
+    @Schema(description = "扩展尺寸轮廓-与原始轮廓间的填充 颜色")
+    private String expandFillColor;
+    @Schema(description = "扩展尺寸轮廓-与原始轮廓间的填充 平铺几何线条")
+    private Double expandFillGeometry;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-标线/界线 线宽")
+    private Double checkLineWidth;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-标线/界线 线长")
+    private Double checkLineLong;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-标线/界线 颜色")
+    private String checkLineColor;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-标线/界线 偏移标尺线距离")
+    private Double checkLineDistance;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-数值 字体")
+    private String checkNumberFont;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-数值 大小")
+    private Double checkNumberSize;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-数值 颜色")
+    private String checkNumberColor;
+    @Schema(description = "选中后显示边界坐标和尺寸数值-数值 偏移标尺线距离")
+    private Double checkNumberDistance;
+    @Schema(description = "干涉显示-填充 颜色")
+    private String displayFillColor;
+    @Schema(description = "干涉显示-填充 平铺几何线条")
+    private Double displayFillGeometry;
+    @Schema(description = "移动/拖拽显示-填充 颜色")
+    private String dragFillColor;
+    @Schema(description = "移动/拖拽显示-填充 平铺几何线条")
+    private Double dragFillGeometry;
+    @Schema(description = "开料顺序-数值 字体")
+    private String cuttingOrderFont;
+    @Schema(description = "开料顺序-数值 大小")
+    private Double cuttingOrderSize;
+    @Schema(description = "开料顺序-数值 颜色")
+    private String cuttingOrderColor;
+    @Schema(description = "下刀点-圆点 大小")
+    private Double cuttingPointSize;
+    @Schema(description = "下刀点-圆点 颜色")
+    private String cuttingPointColor;
+    @Schema(description = "对齐参考点-圆点 大小")
+    private Double alignPointSize;
+    @Schema(description = "对齐参考点-圆点 颜色")
+    private String alignPointColor;
+    @Schema(description = "对齐参考点-圆点 移动/对齐参考点")
+    private Double alignPointType;
+    @Schema(description = "反面加工标记-圆圈 直径")
+    private Double reverseDiameter;
+    @Schema(description = "反面加工标记-圆圈 线宽")
+    private Double reverseLineWidth;
+    @Schema(description = "反面加工标记-圆圈 颜色")
+    private String reverseColor;
+    @Schema(description = "板高方向标记-箭头 大小")
+    private Double flagArrowSize;
+    @Schema(description = "板高方向标记-箭头 颜色")
+    private String flagArrowColor;
+    @Schema(description = "板件编号-编码 字体")
+    private String banCodeFont;
+    @Schema(description = "板件编号-编码 大小")
+    private Double banCodeSize;
+    @Schema(description = "板件编号-编码 颜色")
+    private String banCodeColor;
+    @Schema(description = "板件编号-板件尺寸 字体")
+    private String banNumFont;
+    @Schema(description = "板件编号-板件尺寸 大小")
+    private Double banNumSize;
+    @Schema(description = "板件编号-板件尺寸 颜色")
+    private String banNumColor;
+    @Schema(description = "余料板-轮廓线 线宽")
+    private Double restTourWidth;
+    @Schema(description = "余料板-轮廓线 颜色")
+    private String restTourColor;
+    @Schema(description = "余料板-填充 颜色")
+    private String restFillColor;
+    @Schema(description = "余料板-填充 平铺几何线条")
+    private Double restFillGeometry;
+    @Schema(description = "孔位显示-轮廓线 线宽")
+    private Double holeTourWidth;
+    @Schema(description = "孔位显示-轮廓线 颜色")
+    private String holeTourColor;
+    @Schema(description = "孔位显示-填充 颜色")
+    private String holeFillColor;
+    @Schema(description = "孔位显示-填充 平铺几何线条")
+    private Double holeFillGeometry;
+    @Schema(description = "孔位显示-填充 正反面挖穿区分")
+    private Boolean holeFillType;
+    @Schema(description = "造型刀路/槽轮廓显示-轮廓线 线宽")
+    private Double profilingTourWidth;
+    @Schema(description = "造型刀路/槽轮廓显示-轮廓线 颜色")
+    private String profilingTourColor;
+    @Schema(description = "造型刀路/槽轮廓显示-填充 颜色")
+    private String profilingFillColor;
+    @Schema(description = "造型刀路/槽轮廓显示-填充 平铺几何线条")
+    private Double profilingFillGeometry;
+    @Schema(description = "造型刀路/槽轮廓显示-填充 正反面挖穿区分")
+    private Boolean profilingFillType;
+    @Schema(description = "孔槽标注-位置 距小板边")
+    private Double holePositionSmall;
+    @Schema(description = "孔槽标注-位置 距大板/台面")
+    private Double holePositionLarge;
+    @Schema(description = "孔槽标注-位置 字体")
+    private String holePositionFont;
+    @Schema(description = "孔槽标注-位置 大小")
+    private Double holePositionSize;
+    @Schema(description = "孔槽标注-位置 颜色")
+    private String holePositionColor;
+    @Schema(description = "孔槽标注-位置 线宽")
+    private Double holePositionWidth;
+    @Schema(description = "孔槽标注-尺寸 直径/宽度")
+    private Double holeSizeDiameter;
+    @Schema(description = "孔槽标注-尺寸 深度")
+    private Double holeSizeDepth;
+    @Schema(description = "孔槽标注-尺寸 字体")
+    private String holeSizeFont;
+    @Schema(description = "孔槽标注-尺寸 大小")
+    private Double holeSizeSize;
+    @Schema(description = "孔槽标注-尺寸 颜色")
+    private String holeSizeColor;
+
+
 
     @NoArgsConstructor
     @Data