From 965e293ef15839361d4cd7230357b42ae5849ae5 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 17 Jun 2026 16:16:50 +0800 Subject: [PATCH] =?UTF-8?q?elasticsearch=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DefaultExcelOrderImportFactory.java | 18 ------------------ .../factory/DefaultXmlOrderImportFactory.java | 3 --- 2 files changed, 21 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 2a5d52342..d88b51ef8 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 @@ -107,7 +107,6 @@ public class DefaultExcelOrderImportFactory { private List orderItemDOS = ListUtils.newArrayListWithExpectedSize(BATCH_THRESHOLD_NUMBER); private List plateGoodDOS = ListUtils.newArrayListWithExpectedSize(BATCH_THRESHOLD_NUMBER); private List orderModelDOS = ListUtils.newArrayListWithExpectedSize(BATCH_THRESHOLD_NUMBER); - private List orderPartsRemarks = ListUtils.newArrayListWithExpectedSize(BATCH_THRESHOLD_NUMBER); // private List partsDOS = ListUtils.newArrayListWithExpectedSize(BATCH_THRESHOLD_NUMBER); private static final String EMPTY_STRING = new String(); @@ -459,19 +458,6 @@ public class DefaultExcelOrderImportFactory { remark.append(extractedRemark); } } - - // 配件备注信息存储 - OrderPartsRemark orderPartsRemark = OrderPartsRemark.builder() - .partsId(partId) - .batchId(batchId) - .orderId(orderId) - .remark(remark.toString()) - .build(); - orderPartsRemark.setCreator(operatorName); - orderPartsRemark.setUpdater(operatorName); - orderPartsRemark.setOrganId(organId); - // 批量插入配件备注 - orderPartsRemarks.add(orderPartsRemark); } /** @@ -783,9 +769,6 @@ public class DefaultExcelOrderImportFactory { } orderModelDO.setGoodsId(goodsDO.getGoodsId()); orderModelDO.setPlateGoodsId(goodsId); - orderModelDO.setOrganId(organId); - orderModelDO.setCreator(operatorName); - orderModelDO.setUpdater(operatorName); orderModelDOS.add(orderModelDO); // 创建造型数据 plateDO.setModelData(JsonUtils.zipString(JsonUtils.toJsonString(orderModelDO))); @@ -1332,7 +1315,6 @@ public class DefaultExcelOrderImportFactory { orderItemDOS.clear(); plateGoodDOS.clear(); orderModelDOS.clear(); - orderPartsRemarks.clear(); // partsDOS.clear(); } 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 b4670e99f..33ad52b23 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 @@ -653,9 +653,6 @@ public class DefaultXmlOrderImportFactory { Optional.ofNullable(goodsDO).orElseThrow(() -> new ServiceException(ORDER_IMPORT_PLATE_GOODS_NOT_EXISTS, orderId, goodsId)); orderModelDO.setGoodsId(goodsDO.getGoodsId()); orderModelDO.setPlateGoodsId(goodsId); - orderModelDO.setOrganId(organId); - orderModelDO.setCreator(operatorName); - orderModelDO.setUpdater(operatorName); // 创建造型数据 plateDO.setModelData(JsonUtils.zipString(JsonUtils.toJsonString(orderModelDO)));