From a6484513c1d35d32788e88c2697cab73a249d20c Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 26 Jun 2026 16:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=85=8D=E4=BB=B6=E5=88=97=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=94=99=E8=AF=AF=E5=92=8C=E5=8A=A0=E5=B7=A5=E7=BB=84?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ordercomponent/OrderComponentServiceImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java index 0bacb24f6..711850a1a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java @@ -447,7 +447,6 @@ public class OrderComponentServiceImpl implements OrderComponentService { if (!deleted) { orderItemRelation = orderItemMapper.selectList(new LambdaQueryWrapperX() .in(OrderItemDO::getOrderId, pageReqVO.getOrderIds()) - .inIfPresent(OrderItemDO::getCompId, queryComponentIds) .in(OrderItemDO::getPartsId, partsIds) .and(wrapper -> wrapper.ne(OrderItemDO::getGroupId, 0L) @@ -459,7 +458,6 @@ public class OrderComponentServiceImpl implements OrderComponentService { } else { List orderItemTempDOS = orderItemTempMapper.selectList(new LambdaQueryWrapperX() .in(OrderItemTempDO::getOrderId, pageReqVO.getOrderIds()) - .inIfPresent(OrderItemTempDO::getCompId, queryComponentIds) .in(OrderItemTempDO::getPartsId, partsIds) .and(wrapper -> wrapper.ne(OrderItemTempDO::getGroupId, 0L) @@ -501,12 +499,11 @@ public class OrderComponentServiceImpl implements OrderComponentService { .add(item.getCompId()); } - // num 汇总 - if (item.getNum() != null) { - partsNumMap.merge( + // num 从部件组获取 + if (item.getNum() != null && ObjectUtil.isNotNull(item.getCompId())) { + partsNumMap.put( pair, - item.getNum(), - Double::sum + item.getNum() ); } }