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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.新增余料板关联相关增删改查接口，2.修复机台部分字段类型

Browse Source
This commit is contained in:
yangsb
2024-03-22 16:16:33 +08:00
parent 1d1982e6a9
commit bb178dcfab
9 changed files with 494 additions and 4 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
+3 -3
View File
@@ -63,7 +63,7 @@ public class CuttingSettingDO extends ESDocument {
@Schema(description = "钻孔延时条件-孔直径上限")
private Double drillingDelayConditionMaxDiameter;
@Schema(description = "钻孔延时指令")
private Double drillingDelayInstruction;
private String drillingDelayInstruction;
@Schema(description = "默认40，安全高度")
private Integer freeHeight;
@@ -164,7 +164,7 @@ public class CuttingSettingDO extends ESDocument {
@Schema(description = "KnifeList")
private List<KnifeListBean> knifeList;
@Schema(description = "默认{0}_{1}_{2}，导出zip文件名")
private String exportOrderPathName;
private List<String> exportOrderPathName;
@Schema(description = "大板NC正(A)面文件名")
private String largePlateNcPositiveFileName;
@Schema(description = "大板NC反(B)面文件名")
@@ -198,7 +198,7 @@ public class CuttingSettingDO extends ESDocument {
@Schema(description = "上料代码插入到NC文件头前")
private Boolean insertLoadingCodeAtFileHeader;
@Schema(description = "上料代码")
private Boolean loadingCode;
private String loadingCode;
@Schema(description = "大板NC正(A)面文件头")
private String largePlateNcPositiveFileHeader;
@Schema(description = "大板NC正(A)面文件尾")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class CuttingTemplateMachineDO extends ESDocument {
@Schema(description = "钻孔延时条件-孔直径上限")
private Double drillingDelayConditionMaxDiameter;
@Schema(description = "钻孔延时指令")
private Double drillingDelayInstruction;
private String drillingDelayInstruction;
@Schema(description = "默认40，安全高度")
private Integer freeHeight;