From d9735d3e490a3be185be67e90892c83269b8e94b Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 9 May 2024 17:11:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81-PlateDetail=E6=9D=BFID=E5=8F=82=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/executor/util/deviseData/dataTwo/PlateDetail.java | 2 +- .../util/fileConversion/admin/api/webcad/ApiTypeRealize.java | 2 +- 2 files changed, 2 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/dataTwo/PlateDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PlateDetail.java index 36c864f97..5b97dde83 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PlateDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PlateDetail.java @@ -21,7 +21,7 @@ public class PlateDetail{ // 板名称 private String name; // 板id - private Long id; + private Long plateId; // 板编号 private String plateNo; // 自定义板号 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 da6c13c51..12aa8b80f 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 @@ -486,7 +486,7 @@ public class ApiTypeRealize { .build(); if (plateDetail.get(plate.getInteger("BlockNo")) != null) { - plateDetail.get(plate.getInteger("BlockNo")).setId(plateId); + plateDetail.get(plate.getInteger("BlockNo")).setPlateId(plateId); } platesInfos.put(plate.getInteger("ItemID"), plateInfo); platesItem.put(plate.getInteger("ItemID"), itemPlate);