From 0f67ea72cbc660f3bfeeae8728adad785284a441 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Thu, 28 Mar 2024 11:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E9=83=A8=E5=88=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/machine/CuttingSettingDO.java   | 14 +++++++-------
 .../machinetemplate/CuttingTemplateMachineDO.java  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java
index 8fbfd5e13..e324352b0 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java
@@ -26,7 +26,7 @@ public class CuttingSettingDO extends ESDocument {
     @Schema(description = "默认0，工位1原点位置")
     private Integer originPoIntegerPosition;
     @Schema(description = "工作原点Z0基准面")
-    private String originZ0Position;
+    private Integer originZ0Position;
     @Schema(description = "排版基准点")
     private String layoutBenchmark;
     @Schema(description = "排版基准点跟随大板定位")
@@ -249,17 +249,17 @@ public class CuttingSettingDO extends ESDocument {
     @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
     private List<String> exportOrderPathName;
     @Schema(description = "大板NC正(A)面文件名")
-    private String largePlateNcPositiveFileName;
+    private List<String> largePlateNcPositiveFileName;
     @Schema(description = "大板NC反(B)面文件名")
-    private String largePlateNcNegativeFileName;
+    private List<String> largePlateNcNegativeFileName;
     @Schema(description = "小板NC正(A)面文件名")
-    private String smallPlateNcPositiveFileName;
+    private List<String> smallPlateNcPositiveFileName;
     @Schema(description = "小板NC反(B)面文件名")
-    private String smallPlateNcNegativeFileName;
+    private List<String> smallPlateNcNegativeFileName;
     @Schema(description = "大板DXF(排版图)文件名")
-    private String largePlateDxfLayoutFileName;
+    private List<String> largePlateDxfLayoutFileName;
     @Schema(description = "小板DXF(孔槽加工图)文件名")
-    private String smallPlateDxfProcessingFileName;
+    private List<String> smallPlateDxfProcessingFileName;
     @Schema(description = "导出大板NC反(B)面文件")
     private String exportLargePlateNcNegativeFile;
     @Schema(description = "合并大板NC正反(AB)面文件")
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java
index 39558335b..b16b85039 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java
@@ -30,7 +30,7 @@ public class CuttingTemplateMachineDO extends ESDocument {
     @Schema(description = "默认0，工位1原点位置")
     private Integer originPoIntegerPosition;
     @Schema(description = "工作原点Z0基准面")
-    private String originZ0Position;
+    private Integer originZ0Position;
     @Schema(description = "排版基准点")
     private String layoutBenchmark;
     @Schema(description = "排版基准点跟随大板定位")
@@ -253,17 +253,17 @@ public class CuttingTemplateMachineDO extends ESDocument {
     @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
     private List<String> exportOrderPathName;
     @Schema(description = "大板NC正(A)面文件名")
-    private String largePlateNcPositiveFileName;
+    private List<String> largePlateNcPositiveFileName;
     @Schema(description = "大板NC反(B)面文件名")
-    private String largePlateNcNegativeFileName;
+    private List<String> largePlateNcNegativeFileName;
     @Schema(description = "小板NC正(A)面文件名")
-    private String smallPlateNcPositiveFileName;
+    private List<String> smallPlateNcPositiveFileName;
     @Schema(description = "小板NC反(B)面文件名")
-    private String smallPlateNcNegativeFileName;
+    private List<String> smallPlateNcNegativeFileName;
     @Schema(description = "大板DXF(排版图)文件名")
-    private String largePlateDxfLayoutFileName;
+    private List<String> largePlateDxfLayoutFileName;
     @Schema(description = "小板DXF(孔槽加工图)文件名")
-    private String smallPlateDxfProcessingFileName;
+    private List<String> smallPlateDxfProcessingFileName;
     @Schema(description = "导出大板NC反(B)面文件")
     private String exportLargePlateNcNegativeFile;
     @Schema(description = "合并大板NC正反(AB)面文件")