From 98c42b69bd7c57b9a038e620df88344ea014d933 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 16 Jun 2026 18:02:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1705=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9Aexcel=E5=AF=BC=E5=85=A5=E6=8B=86=E5=8D=95=E5=91=98?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E3=80=81excel/xml=E6=8E=92=E7=89=88?= =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/files/excel/DefaultOrderImportExcelListener.java | 2 +- .../orderImport/factory/DefaultExcelOrderImportFactory.java | 3 +-- .../orderImport/factory/DefaultXmlOrderImportFactory.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) 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/DefaultOrderImportExcelListener.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java index 372a685f5..ba8295f50 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/excel/DefaultOrderImportExcelListener.java @@ -267,7 +267,7 @@ public final class DefaultOrderImportExcelListener extends AnalysisEventListener if (4 == rowIndex) { validOrderInfoLength(leftKey, leftVal, 64); validOrderInfoLength(rightKey, rightVal, 255); - orderDO.setSplitter(StringUtils.isNotEmpty(leftVal) ? leftKey : EMPTY_STRING); + orderDO.setSplitter(StringUtils.isNotEmpty(leftVal) ? leftVal : EMPTY_STRING); orderDO.setRemark(rightVal); } orderDO.setDataType(DataTypeEnum.FILE_IMPORT.getStatus()); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java index 84efef8e6..be740b007 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java @@ -704,7 +704,7 @@ public class DefaultExcelOrderImportFactory { .reservedEdgeRight(BigDecimal.ZERO) .reservedEdgeUp(BigDecimal.ZERO) .reservedEdgeDown(BigDecimal.ZERO) - .holeFace(Integer.valueOf(typographyDTO.getValue())) + .holeArrange(Integer.valueOf(typographyDTO.getValue())) .texture(Integer.valueOf(grainDTO.getValue())) .area(tempDataDO.getArea()) .openDoorType(Integer.valueOf(doorDTO.getValue())) @@ -717,7 +717,6 @@ public class DefaultExcelOrderImportFactory { .bodyName(bodyName) .customPlateNoBuilder(new StringBuilder()) .organId(organId) - .holeArrange(0) .holeFace(0) .unregularPointCount(0) .frontHoleCount(0) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java index a5510ed0a..2603f5b6e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java @@ -530,7 +530,7 @@ public class DefaultXmlOrderImportFactory { .reservedEdgeDown(BigDecimal.ZERO) .area(area) .texture(Integer.valueOf(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.GRAIN_TYPE, blockXmlVO.getTexture()))) - .holeFace(Integer.valueOf(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.TYPOGRAPHY_TYPE, blockXmlVO.getLayoutFace()))) + .holeArrange(Integer.valueOf(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.TYPOGRAPHY_TYPE, blockXmlVO.getLayoutFace()))) .isDoor(doorType != 0) .openDoorType(doorType) .isSculpt(false) @@ -539,7 +539,6 @@ public class DefaultXmlOrderImportFactory { .isSide2v(false) .customPlateNoBuilder(new StringBuilder()) .organId(organId) - .holeArrange(0) .holeFace(0) .unregularPointCount(0) .frontHoleCount(0)