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

造型修改孤岛数据

Browse Source
This commit is contained in:
lym
2024-12-12 14:22:15 +08:00
parent 3d774dfa99
commit f944a37f55
1 changed files with 12 additions and 10 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/fileConversion/admin/api/webcad/ApiTypeRealize.java
+12 -10
View File
@@ -639,7 +639,9 @@ public class ApiTypeRealize {
// .material(String.valueOf(goodsDOMap.get(parts.getLong(ProduceApiConstants.PD_GOODS_ID)) != null // .material(String.valueOf(goodsDOMap.get(parts.getLong(ProduceApiConstants.PD_GOODS_ID)) != null
// ? goodsDOMap.get(parts.getLong(ProduceApiConstants.PD_GOODS_ID)).getMaterial() : "")) // ? goodsDOMap.get(parts.getLong(ProduceApiConstants.PD_GOODS_ID)).getMaterial() : ""))
.material((String) sizeMap.get(PART_MATERIAL)) .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(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)) .model(parts.getString(ProduceApiConstants.PD_MODEL))
.color((String) sizeMap.get(PART_COLOR)) .color((String) sizeMap.get(PART_COLOR))
.width((Double) sizeMap.get(PART_WIDTH)) .width((Double) sizeMap.get(PART_WIDTH))
@@ -656,15 +658,15 @@ public class ApiTypeRealize {
.build(); .build();
// 主分类赋值 // 主分类赋值
if (parts.getString(ProduceApiConstants.PD_OBJECT_TYPE).equals(PART_CATEGORY_ONE)) { // if (parts.getString(ProduceApiConstants.PD_OBJECT_TYPE).equals(PART_CATEGORY_ONE)) {
partsInfo.setCategory(PART_CATEGORY_ONE); // partsInfo.setCategory(PART_CATEGORY_ONE);
} else { // } else {
if (parts.getBoolean(ProduceApiConstants.PD_IS_COMPOSITE)) { // if (parts.getBoolean(ProduceApiConstants.PD_IS_COMPOSITE)) {
partsInfo.setCategory(PART_CATEGORY_THREE); // partsInfo.setCategory(PART_CATEGORY_THREE);
} else { // } else {
partsInfo.setCategory(PART_CATEGORY_TWO); // partsInfo.setCategory(PART_CATEGORY_TWO);
} // }
} // }
// item 明细 // item 明细
OrderItemDO item = OrderItemDO.builder() OrderItemDO item = OrderItemDO.builder()
@@ -1257,7 +1259,7 @@ public class ApiTypeRealize {
} }
List<IContourData> contourData = new ArrayList<>(); List<IContourData> contourData = new ArrayList<>();
for (int j = 0; j < element.size(); j++) { 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)); String[] points = splitAndTrim(point.getString(ProduceApiConstants.BPD_MODEL_ORIGIN_MODELING_HOLES_POS));
Point pointVO = Point.builder() Point pointVO = Point.builder()
.x(Double.valueOf(points[X])) .x(Double.valueOf(points[X]))