From 84a8e68f5dfe9a0fce236806514a7a4f82104aaf Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Fri, 13 Dec 2024 16:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=A0=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=96=B0?= =?UTF-8?q?=E5=A2=9Eid=E5=92=8C=E5=88=80=E8=B7=AFid=EF=BC=8C=E5=B0=8F?= =?UTF-8?q?=E6=9D=BF=E5=A4=87=E6=B3=A8=E5=8E=BB=E6=8E=89[]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/util/deviseData/structure/ModelDetail.java | 4 ++++ .../util/fileConversion/admin/api/webcad/ApiTypeRealize.java | 4 +++- .../fileConversion/admin/api/webcad/ProduceApiConstants.java | 2 ++ .../fileConversion/admin/files/excel/ExcelTypeRealize.java | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java index 70657007d..e08f1ce93 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java @@ -20,6 +20,10 @@ public class ModelDetail { @Schema(description = "造型ID") private Integer id; + + @Schema(description = "刀路ID") + private Integer lineID; + @Schema(description = "内部孤岛ID集合") private String[] subIDs; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java index 04addb31e..ee5d01c0e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java @@ -795,7 +795,7 @@ public class ApiTypeRealize { .isSpecialShaped(plate.getBoolean(ProduceApiConstants.BD_IS_UN_REGULAR)) .isCancel(false) .filterType("") - .remark(remark) + .remark(remark.replace("[", "").replace("]", "")) .organId(organId) .roomName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getRoomName()) .bodyName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getName()) @@ -1187,6 +1187,8 @@ public class ApiTypeRealize { } 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))) .faceType(Integer.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_FACE))) .knifeName(model.getString(ProduceApiConstants.BPD_MODEL_TOOL_NO)) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java index 74f389e74..a998aec16 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ProduceApiConstants.java @@ -261,6 +261,8 @@ public class ProduceApiConstants { public static final String BPD_MODEL_DIAMETER = "Diameter"; public static final String BPD_MODEL_FACE = "Face"; 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_ADD_DEPTH = "AddDepth"; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java index 34c8aa334..583597b5a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelTypeRealize.java @@ -376,7 +376,7 @@ public class ExcelTypeRealize { nonNullValues.add(value); } - return nonNullValues.toString(); + return nonNullValues.size() == 0 ? "" : nonNullValues.toString().replace("[", "").replace("]", ""); }