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() ); } }