Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

机台部分字段类型修改

Browse Source
This commit is contained in:
yangsb
2024-03-28 11:45:44 +08:00
parent f25652e88a
commit 0f67ea72cb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java
+7 -7
View File
@@ -26,7 +26,7 @@ public class CuttingSettingDO extends ESDocument {
@Schema(description = "默认0，工位1原点位置") @Schema(description = "默认0，工位1原点位置")
private Integer originPoIntegerPosition; private Integer originPoIntegerPosition;
@Schema(description = "工作原点Z0基准面") @Schema(description = "工作原点Z0基准面")
private String originZ0Position; private Integer originZ0Position;
@Schema(description = "排版基准点") @Schema(description = "排版基准点")
private String layoutBenchmark; private String layoutBenchmark;
@Schema(description = "排版基准点跟随大板定位") @Schema(description = "排版基准点跟随大板定位")
@@ -249,17 +249,17 @@ public class CuttingSettingDO extends ESDocument {
@Schema(description = "默认{0}_{1}_{2}，导出zip文件名") @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
private List<String> exportOrderPathName; private List<String> exportOrderPathName;
@Schema(description = "大板NC正(A)面文件名") @Schema(description = "大板NC正(A)面文件名")
private String largePlateNcPositiveFileName; private List<String> largePlateNcPositiveFileName;
@Schema(description = "大板NC反(B)面文件名") @Schema(description = "大板NC反(B)面文件名")
private String largePlateNcNegativeFileName; private List<String> largePlateNcNegativeFileName;
@Schema(description = "小板NC正(A)面文件名") @Schema(description = "小板NC正(A)面文件名")
private String smallPlateNcPositiveFileName; private List<String> smallPlateNcPositiveFileName;
@Schema(description = "小板NC反(B)面文件名") @Schema(description = "小板NC反(B)面文件名")
private String smallPlateNcNegativeFileName; private List<String> smallPlateNcNegativeFileName;
@Schema(description = "大板DXF(排版图)文件名") @Schema(description = "大板DXF(排版图)文件名")
private String largePlateDxfLayoutFileName; private List<String> largePlateDxfLayoutFileName;
@Schema(description = "小板DXF(孔槽加工图)文件名") @Schema(description = "小板DXF(孔槽加工图)文件名")
private String smallPlateDxfProcessingFileName; private List<String> smallPlateDxfProcessingFileName;
@Schema(description = "导出大板NC反(B)面文件") @Schema(description = "导出大板NC反(B)面文件")
private String exportLargePlateNcNegativeFile; private String exportLargePlateNcNegativeFile;
@Schema(description = "合并大板NC正反(AB)面文件") @Schema(description = "合并大板NC正反(AB)面文件")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java
+7 -7
View File
@@ -30,7 +30,7 @@ public class CuttingTemplateMachineDO extends ESDocument {
@Schema(description = "默认0，工位1原点位置") @Schema(description = "默认0，工位1原点位置")
private Integer originPoIntegerPosition; private Integer originPoIntegerPosition;
@Schema(description = "工作原点Z0基准面") @Schema(description = "工作原点Z0基准面")
private String originZ0Position; private Integer originZ0Position;
@Schema(description = "排版基准点") @Schema(description = "排版基准点")
private String layoutBenchmark; private String layoutBenchmark;
@Schema(description = "排版基准点跟随大板定位") @Schema(description = "排版基准点跟随大板定位")
@@ -253,17 +253,17 @@ public class CuttingTemplateMachineDO extends ESDocument {
@Schema(description = "默认{0}_{1}_{2}，导出zip文件名") @Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
private List<String> exportOrderPathName; private List<String> exportOrderPathName;
@Schema(description = "大板NC正(A)面文件名") @Schema(description = "大板NC正(A)面文件名")
private String largePlateNcPositiveFileName; private List<String> largePlateNcPositiveFileName;
@Schema(description = "大板NC反(B)面文件名") @Schema(description = "大板NC反(B)面文件名")
private String largePlateNcNegativeFileName; private List<String> largePlateNcNegativeFileName;
@Schema(description = "小板NC正(A)面文件名") @Schema(description = "小板NC正(A)面文件名")
private String smallPlateNcPositiveFileName; private List<String> smallPlateNcPositiveFileName;
@Schema(description = "小板NC反(B)面文件名") @Schema(description = "小板NC反(B)面文件名")
private String smallPlateNcNegativeFileName; private List<String> smallPlateNcNegativeFileName;
@Schema(description = "大板DXF(排版图)文件名") @Schema(description = "大板DXF(排版图)文件名")
private String largePlateDxfLayoutFileName; private List<String> largePlateDxfLayoutFileName;
@Schema(description = "小板DXF(孔槽加工图)文件名") @Schema(description = "小板DXF(孔槽加工图)文件名")
private String smallPlateDxfProcessingFileName; private List<String> smallPlateDxfProcessingFileName;
@Schema(description = "导出大板NC反(B)面文件") @Schema(description = "导出大板NC反(B)面文件")
private String exportLargePlateNcNegativeFile; private String exportLargePlateNcNegativeFile;
@Schema(description = "合并大板NC正反(AB)面文件") @Schema(description = "合并大板NC正反(AB)面文件")