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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2024-12-13 16:56:16 +08:00
parent c53fbac707 84a8e68f5d
commit e0621513ac
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java
+4
View File
@@ -20,6 +20,10 @@ public class ModelDetail {
@Schema(description = "造型ID") @Schema(description = "造型ID")
private Integer id; private Integer id;
@Schema(description = "刀路ID")
private Integer lineID;
@Schema(description = "内部孤岛ID集合") @Schema(description = "内部孤岛ID集合")
private String[] subIDs; private String[] subIDs;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+3 -1
View File
@@ -795,7 +795,7 @@ public class ApiTypeRealize {
.isSpecialShaped(plate.getBoolean(ProduceApiConstants.BD_IS_UN_REGULAR)) .isSpecialShaped(plate.getBoolean(ProduceApiConstants.BD_IS_UN_REGULAR))
.isCancel(false) .isCancel(false)
.filterType("") .filterType("")
.remark(remark) .remark(remark.replace("[", "").replace("]", ""))
.organId(organId) .organId(organId)
.roomName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getRoomName()) .roomName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getRoomName())
.bodyName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getName()) .bodyName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getName())
@@ -1187,6 +1187,8 @@ public class ApiTypeRealize {
} }
modelDetails.add(ModelDetail.builder() modelDetails.add(ModelDetail.builder()
.id(Integer.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_ID)))
.lineID(Integer.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_LINE_ID)))
.depth(Double.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_DEPTH))) .depth(Double.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_DEPTH)))
.faceType(Integer.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_FACE))) .faceType(Integer.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_FACE)))
.knifeName(model.getString(ProduceApiConstants.BPD_MODEL_TOOL_NO)) .knifeName(model.getString(ProduceApiConstants.BPD_MODEL_TOOL_NO))
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java
+2
View File
@@ -261,6 +261,8 @@ public class ProduceApiConstants {
public static final String BPD_MODEL_DIAMETER = "Diameter"; public static final String BPD_MODEL_DIAMETER = "Diameter";
public static final String BPD_MODEL_FACE = "Face"; public static final String BPD_MODEL_FACE = "Face";
public static final String BPD_MODEL_TOOL_NO = "ToolNo"; public static final String BPD_MODEL_TOOL_NO = "ToolNo";
public static final String BPD_MODEL_ID = "ModelID"; // 造型id
public static final String BPD_MODEL_LINE_ID = "LineID"; // 刀路id
public static final String BPD_MODEL_ORIGIN_MODELING = "OriginModeling"; // 造型 原始轮廓 public static final String BPD_MODEL_ORIGIN_MODELING = "OriginModeling"; // 造型 原始轮廓
public static final String BPD_MODEL_ORIGIN_MODELING_ADD_DEPTH = "AddDepth"; public static final String BPD_MODEL_ORIGIN_MODELING_ADD_DEPTH = "AddDepth";
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java
+1 -1
View File
@@ -376,7 +376,7 @@ public class ExcelTypeRealize {
nonNullValues.add(value); nonNullValues.add(value);
} }
return nonNullValues.toString(); return nonNullValues.size() == 0 ? "" : nonNullValues.toString().replace("[", "").replace("]", "");
} }