From addbf16eedc9fcba9e2e6e8e3eb86a6a9f8d4c6b Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Fri, 17 Jan 2025 16:39:05 +0800 Subject: [PATCH] =?UTF-8?q?excel=E8=AF=BB=E5=8F=96=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8Capi=E5=AF=BC=E5=85=A5=E6=88=BF=E9=97=B4=E5=90=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fileConversion/admin/api/webcad/ApiTypeRealize.java | 4 ++-- .../admin/files/excel/ExcelCheckListUtil.java | 4 ++-- .../fileConversion/admin/files/excel/LargeFilesUtils.java | 6 +++--- .../admin/files/excel/OrderPlateImportExcelVO.java | 6 +++--- 4 files changed, 10 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 698560860..a2e360877 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 @@ -975,8 +975,8 @@ public class ApiTypeRealize { .filterType("") .remark(remark) .organId(organId) -// .roomName(bodyInfos.get(plate.getLong(ProduceApiConstants.BD_BOX_ID)).getRoomName()) - .bodyName(plate.getString(ProduceApiConstants.BD_BOX_ID)) // 之后再改成名称 + .roomName(plate.getString(ProduceApiConstants.BD_ROOM_NAME)) + .bodyName(plate.getString(ProduceApiConstants.BD_BOX_NAME)) // 之后再改成名称 .customPlateNoBuilder(new StringBuilder()) .build(); partsInfos.put(plate.getString(ProduceApiConstants.BD_BLOCK_NO), plateInfo); 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/ExcelCheckListUtil.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java index a15c13cef..5d7ce678d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/ExcelCheckListUtil.java @@ -337,8 +337,8 @@ public class ExcelCheckListUtil { isNotEmptyAndBack(vo.getGoodsThickness(), errList, "板材厚度", flag); isEmptyAndPositiveNumberSize(vo.getGoodsThickness(), Double.class, 5, 3, errList, "板材厚度", flag); // 房间、柜体、板名称 不可以为空 - isEmpty(vo.getRoomsName(), errList, "房间名称", 64, flag); - isEmpty(vo.getCabinetsName(), errList, "柜体名称", 64, flag); + isEmptyAndSize(vo.getRoomsName(), 64, errList, "房间名称" , flag); + isEmptyAndSize(vo.getCabinetsName(), 64, errList, "柜体名称", flag); isEmpty(vo.getName(), errList, "板材名称", 64, flag); //成品长、成品宽、拆单长、拆单宽、厚、左封边、右封边、上封边、下封边 不能为空 isNotEmptyAndBack(vo.getHeight(), errList, "成品长度", flag); 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/LargeFilesUtils.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/LargeFilesUtils.java index bbee239f4..d89ad2dae 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/LargeFilesUtils.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/LargeFilesUtils.java @@ -101,17 +101,17 @@ public class LargeFilesUtils { private OrderPlateImportExcelVO createOrderPlateFromRow(Row row) { OrderPlateImportExcelVO vo = new OrderPlateImportExcelVO(); - int columnIndex = 0; for (Cell cell : row) { - setOrderPlateProperty(vo, cell, columnIndex++); + setOrderPlateProperty(vo, cell); } return vo; } - private void setOrderPlateProperty(OrderPlateImportExcelVO vo, Cell cell, int index) { + private void setOrderPlateProperty(OrderPlateImportExcelVO vo, Cell cell) { String value = cell.getStringCellValue(); + int index = cell.getColumnIndex(); switch (index) { case 0: 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/OrderPlateImportExcelVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java index 64fc3355e..2d534d6bf 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/OrderPlateImportExcelVO.java @@ -117,9 +117,9 @@ public class OrderPlateImportExcelVO { @JsonIgnore private String cabinetsName; - @ExcelIgnore - @JsonIgnore - private String synthesis; +// @ExcelIgnore +// @JsonIgnore +// private String synthesis; @JsonIgnore @ExcelProperty(value = "加工组类型")