From b0253bdc6e6269f598d5449bdf9f4d94e165ca5d Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 25 Mar 2025 17:49:13 +0800 Subject: [PATCH] =?UTF-8?q?excel=E3=80=81xml=E5=BC=82=E6=AD=A5=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=A7=BB=E9=99=A4=E8=A7=A3=E6=9E=90=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E5=85=A5=E9=85=8D=E4=BB=B6=E5=BA=93=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DefaultExcelOrderImportFactory.java | 28 ++++++++--------- .../factory/DefaultXmlOrderImportFactory.java | 30 +++++++++---------- 2 files changed, 29 insertions(+), 29 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 ba77d25b5..4d3ed226d 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 @@ -113,7 +113,7 @@ public class DefaultExcelOrderImportFactory { 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 List partsDOS = ListUtils.newArrayListWithExpectedSize(BATCH_THRESHOLD_NUMBER); private static final String EMPTY_STRING = new String(); private static final BigDecimal BIG_ZERO = new BigDecimal(0); @@ -389,7 +389,7 @@ public class DefaultExcelOrderImportFactory { } // 最后批量插入orderParts一次，避免最后一页小于BATCH_THRESHOLD_NUMBER漏插入 orderInfoBatchInsertWithinThreshold(orderPartsMapper, orderPartsDOS, true); - orderInfoBatchInsertWithinThreshold(partsMapper, partsDOS, true); +// orderInfoBatchInsertWithinThreshold(partsMapper, partsDOS, true); // 批量插入配件备注 orderPartsRemarksBatchInsertWithinThreshold(true); } @@ -414,7 +414,7 @@ public class DefaultExcelOrderImportFactory { orderParts.setGoodsId(EMPTY_STRING); } // 解析配件商品 - analyzePartsGoods(orderParts); +// analyzePartsGoods(orderParts); // 批量插入orderParts orderPartsDOS.add(orderParts); orderInfoBatchInsertWithinThreshold(orderPartsMapper, orderPartsDOS, false); @@ -1350,16 +1350,16 @@ public class DefaultExcelOrderImportFactory { * @param partsDO * @return */ - private void analyzePartsGoods(OrderPartsDO partsDO) { - if (partsDO.getGoodsId() != null && !partsDO.getGoodsId().isEmpty()) { // 有goodsId - PartsDO parts = partsMapper.selectByGoodID(partsDO.getGoodsId(), OrganContextHolder.getOrganId()); - if (ObjectUtil.isNull(parts)) { // 不存在记录，存入数据库 - // 批量插入parts - partsDOS.add(BeanUtils.toBean(partsDO, PartsDO.class).setOrganId(organId)); - orderInfoBatchInsertWithinThreshold(partsMapper, partsDOS, false); - } - } - } +// private void analyzePartsGoods(OrderPartsDO partsDO) { +// if (partsDO.getGoodsId() != null && !partsDO.getGoodsId().isEmpty()) { // 有goodsId +// PartsDO parts = partsMapper.selectByGoodID(partsDO.getGoodsId(), OrganContextHolder.getOrganId()); +// if (ObjectUtil.isNull(parts)) { // 不存在记录，存入数据库 +// // 批量插入parts +// partsDOS.add(BeanUtils.toBean(partsDO, PartsDO.class).setOrganId(organId)); +// orderInfoBatchInsertWithinThreshold(partsMapper, partsDOS, false); +// } +// } +// } /** * 清空所有列表 @@ -1375,7 +1375,7 @@ public class DefaultExcelOrderImportFactory { plateGoodDOS.clear(); orderModelDOS.clear(); orderPartsRemarks.clear(); - partsDOS.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 c1582a426..c2ca81406 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 @@ -150,7 +150,7 @@ public class DefaultXmlOrderImportFactory { 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 List partsDOS = ListUtils.newArrayListWithExpectedSize(BATCH_THRESHOLD_NUMBER); private static final String EMPTY_STRING = new String(); private static final BigDecimal BIG_ZERO = new BigDecimal(0); @@ -1365,7 +1365,7 @@ public class DefaultXmlOrderImportFactory { orderPartsDO.setRemark(partRemark); // 解析配件商品 - analyzePartsGoods(orderPartsDO); +// analyzePartsGoods(orderPartsDO); // 批量插入orderParts orderPartsDOS.add(orderPartsDO); // 缓存配件 @@ -1492,7 +1492,7 @@ public class DefaultXmlOrderImportFactory { orderPartsDO.setRemark(partRemark); // 解析配件商品 - analyzePartsGoods(orderPartsDO); +// analyzePartsGoods(orderPartsDO); // 批量插入orderParts orderPartsDOS.add(orderPartsDO); // 缓存配件 @@ -1617,7 +1617,7 @@ public class DefaultXmlOrderImportFactory { orderPartsDO.setRemark(partRemark); // 解析配件商品 - analyzePartsGoods(orderPartsDO); +// analyzePartsGoods(orderPartsDO); // 批量插入orderParts orderPartsDOS.add(orderPartsDO); // 缓存配件 @@ -1938,16 +1938,16 @@ public class DefaultXmlOrderImportFactory { * @param partsDO * @return */ - private void analyzePartsGoods(OrderPartsDO partsDO) { - if (partsDO.getGoodsId() != null && !partsDO.getGoodsId().isEmpty()) { // 有goodsId - PartsDO parts = partsMapper.selectByGoodID(partsDO.getGoodsId(), OrganContextHolder.getOrganId()); - if (ObjectUtil.isNull(parts)) { // 不存在记录，存入数据库 - // 批量插入parts - partsDOS.add(BeanUtils.toBean(partsDO, PartsDO.class).setOrganId(organId)); - orderInfoBatchInsertWithinThreshold(partsMapper, partsDOS, false); - } - } - } +// private void analyzePartsGoods(OrderPartsDO partsDO) { +// if (partsDO.getGoodsId() != null && !partsDO.getGoodsId().isEmpty()) { // 有goodsId +// PartsDO parts = partsMapper.selectByGoodID(partsDO.getGoodsId(), OrganContextHolder.getOrganId()); +// if (ObjectUtil.isNull(parts)) { // 不存在记录，存入数据库 +// // 批量插入parts +// partsDOS.add(BeanUtils.toBean(partsDO, PartsDO.class).setOrganId(organId)); +// orderInfoBatchInsertWithinThreshold(partsMapper, partsDOS, false); +// } +// } +// } /** * 清空所有列表 @@ -1963,7 +1963,7 @@ public class DefaultXmlOrderImportFactory { plateGoodDOS.clear(); orderModelDOS.clear(); orderPartsRemarks.clear(); - partsDOS.clear(); +// partsDOS.clear(); } /**