From de1fc237845bb9d46e21bb10edced5e9d5480143 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 17 Jun 2026 11:52:48 +0800 Subject: [PATCH] =?UTF-8?q?excel=E6=96=87=E4=BB=B6=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=9D=BF=E7=BC=96=E5=8F=B7=E8=A1=A5=E5=85=85=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E3=80=81xml=E6=96=87=E4=BB=B6=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=9D=BF=E7=BC=96=E5=8F=B7=E8=A1=A5=E5=85=85=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=BC=96=E5=8F=B7/=E5=BC=80=E6=96=99=E9=95=BF?= =?UTF-8?q?=E5=AE=BD=E5=8E=9A=E5=8F=96=E5=80=BC=E4=BF=AE=E6=AD=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/DefaultExcelOrderImportFactory.java | 5 ++--- .../orderImport/factory/DefaultXmlOrderImportFactory.java | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) 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 be740b007..2a5d52342 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 @@ -686,12 +686,11 @@ public class DefaultExcelOrderImportFactory { .id(plateId) .orderId(orderId) .name(combination.getName()) - .plateNo(combination.getPlateNo()) .type(OrderPlateTypeEnum.LAYERBOARD.getType()) .goodsId(goodsId) - .width(BigDecimal.valueOf(Double.parseDouble(width))) - .plateNo(((obtainingTime) + Long.toString(plateNo).substring(2))) + .plateNo(String.format("%05d", organId) + ((obtainingTime) + Long.toString(plateNo).substring(2))) .height(BigDecimal.valueOf(Double.parseDouble(height))) + .width(BigDecimal.valueOf(Double.parseDouble(width))) .thickness(BigDecimal.valueOf(Double.parseDouble(combination.getThickness()))) .splitWidth(BigDecimal.valueOf(NumberUtil.parseDouble(combination.getSplitWidth()))) .splitHeight(BigDecimal.valueOf(NumberUtil.parseDouble(combination.getSplitHeight()))) 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 2603f5b6e..b4670e99f 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 @@ -515,15 +515,15 @@ public class DefaultXmlOrderImportFactory { .id(plateId) .orderId(orderId) .name(blockXmlVO.getName()) - .plateNo((obtainingTime) + Long.toString(plateNo).substring(2)) + .plateNo(String.format("%05d", organId) + (obtainingTime) + Long.toString(plateNo).substring(2)) .type(plateType) .goodsId(goodsId) .width(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getWidth()))) .height(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getLength()))) .thickness(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getThickness()))) - .splitHeight(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getLength()))) - .splitThickness(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getThickness()))) - .splitWidth(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getWidth()))) + .splitHeight(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getCuttingLength()))) + .splitThickness(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getCuttingThickness()))) + .splitWidth(BigDecimal.valueOf(Double.parseDouble(blockXmlVO.getCuttingWidth()))) .reservedEdgeLeft(BigDecimal.ZERO) .reservedEdgeRight(BigDecimal.ZERO) .reservedEdgeUp(BigDecimal.ZERO)