From f944a37f555a8179aa8117abb07b2f2cfd43ec55 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Thu, 12 Dec 2024 14:22:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=A0=E5=9E=8B=E4=BF=AE=E6=94=B9=E5=AD=A4?= =?UTF-8?q?=E5=B2=9B=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/api/webcad/ApiTypeRealize.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 cff7c4ef5..04addb31e 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 @@ -639,7 +639,9 @@ public class ApiTypeRealize { // .material(String.valueOf(goodsDOMap.get(parts.getLong(ProduceApiConstants.PD_GOODS_ID)) != null // ? goodsDOMap.get(parts.getLong(ProduceApiConstants.PD_GOODS_ID)).getMaterial() : "")) .material((String) sizeMap.get(PART_MATERIAL)) + .category(changePartType(parts.getString(ProduceApiConstants.PD_OBJECT_TYPE), parts.getBoolean(ProduceApiConstants.PD_IS_COMPOSITE))) .type(changePartType(parts.getString(ProduceApiConstants.PD_OBJECT_TYPE), parts.getBoolean(ProduceApiConstants.PD_IS_COMPOSITE))) +// .type(parts.getString(ProduceApiConstants.PD_OBJECT_TYPE)) .model(parts.getString(ProduceApiConstants.PD_MODEL)) .color((String) sizeMap.get(PART_COLOR)) .width((Double) sizeMap.get(PART_WIDTH)) @@ -656,15 +658,15 @@ public class ApiTypeRealize { .build(); // 主分类赋值 - if (parts.getString(ProduceApiConstants.PD_OBJECT_TYPE).equals(PART_CATEGORY_ONE)) { - partsInfo.setCategory(PART_CATEGORY_ONE); - } else { - if (parts.getBoolean(ProduceApiConstants.PD_IS_COMPOSITE)) { - partsInfo.setCategory(PART_CATEGORY_THREE); - } else { - partsInfo.setCategory(PART_CATEGORY_TWO); - } - } +// if (parts.getString(ProduceApiConstants.PD_OBJECT_TYPE).equals(PART_CATEGORY_ONE)) { +// partsInfo.setCategory(PART_CATEGORY_ONE); +// } else { +// if (parts.getBoolean(ProduceApiConstants.PD_IS_COMPOSITE)) { +// partsInfo.setCategory(PART_CATEGORY_THREE); +// } else { +// partsInfo.setCategory(PART_CATEGORY_TWO); +// } +// } // item 明细 OrderItemDO item = OrderItemDO.builder() @@ -1257,7 +1259,7 @@ public class ApiTypeRealize { } List contourData = new ArrayList<>(); for (int j = 0; j < element.size(); j++) { - JSONObject point = element.getJSONObject(i); + JSONObject point = element.getJSONObject(j); String[] points = splitAndTrim(point.getString(ProduceApiConstants.BPD_MODEL_ORIGIN_MODELING_HOLES_POS)); Point pointVO = Point.builder() .x(Double.valueOf(points[X]))