From d800ea36ea9d421295b78e55f5359cb4d2d0f509 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 15 Jun 2026 16:28:38 +0800 Subject: [PATCH] =?UTF-8?q?excel/xml=E5=AF=BC=E5=85=A5=E9=A2=84=E7=95=99?= =?UTF-8?q?=E8=BE=B9=E7=BC=BA=E7=9C=81=E5=80=BC=E5=AF=BC=E8=87=B4=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderImport/factory/DefaultExcelOrderImportFactory.java | 4 ++++ .../orderImport/factory/DefaultXmlOrderImportFactory.java | 4 ++++ 2 files changed, 8 insertions(+) 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 974c7ff91..84efef8e6 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 @@ -700,6 +700,10 @@ public class DefaultExcelOrderImportFactory { .sealRight(BigDecimal.valueOf(Double.parseDouble(combination.getSealRight()))) .sealUp(BigDecimal.valueOf(Double.parseDouble(combination.getSealUp()))) .sealDown(BigDecimal.valueOf(Double.parseDouble(combination.getSealDown()))) + .reservedEdgeLeft(BigDecimal.ZERO) + .reservedEdgeRight(BigDecimal.ZERO) + .reservedEdgeUp(BigDecimal.ZERO) + .reservedEdgeDown(BigDecimal.ZERO) .holeFace(Integer.valueOf(typographyDTO.getValue())) .texture(Integer.valueOf(grainDTO.getValue())) .area(tempDataDO.getArea()) 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 942a25389..a5510ed0a 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 @@ -524,6 +524,10 @@ public class DefaultXmlOrderImportFactory { .splitHeight(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getLength()))) .splitThickness(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getThickness()))) .splitWidth(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getWidth()))) + .reservedEdgeLeft(BigDecimal.ZERO) + .reservedEdgeRight(BigDecimal.ZERO) + .reservedEdgeUp(BigDecimal.ZERO) + .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())))