Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 12:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

装配清单 详情配件列表数量错误和加工组不显示修复

Browse Source
This commit is contained in:
gaoqr
2026-06-26 16:27:32 +08:00
parent 24027b939d
commit a6484513c1
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java
+4 -7
View File
@@ -447,7 +447,6 @@ public class OrderComponentServiceImpl implements OrderComponentService {
if (!deleted) { if (!deleted) {
orderItemRelation = orderItemMapper.selectList(new LambdaQueryWrapperX<OrderItemDO>() orderItemRelation = orderItemMapper.selectList(new LambdaQueryWrapperX<OrderItemDO>()
.in(OrderItemDO::getOrderId, pageReqVO.getOrderIds()) .in(OrderItemDO::getOrderId, pageReqVO.getOrderIds())
.inIfPresent(OrderItemDO::getCompId, queryComponentIds)
.in(OrderItemDO::getPartsId, partsIds) .in(OrderItemDO::getPartsId, partsIds)
.and(wrapper -> .and(wrapper ->
wrapper.ne(OrderItemDO::getGroupId, 0L) wrapper.ne(OrderItemDO::getGroupId, 0L)
@@ -459,7 +458,6 @@ public class OrderComponentServiceImpl implements OrderComponentService {
} else { } else {
List<OrderItemTempDO> orderItemTempDOS = orderItemTempMapper.selectList(new LambdaQueryWrapperX<OrderItemTempDO>() List<OrderItemTempDO> orderItemTempDOS = orderItemTempMapper.selectList(new LambdaQueryWrapperX<OrderItemTempDO>()
.in(OrderItemTempDO::getOrderId, pageReqVO.getOrderIds()) .in(OrderItemTempDO::getOrderId, pageReqVO.getOrderIds())
.inIfPresent(OrderItemTempDO::getCompId, queryComponentIds)
.in(OrderItemTempDO::getPartsId, partsIds) .in(OrderItemTempDO::getPartsId, partsIds)
.and(wrapper -> .and(wrapper ->
wrapper.ne(OrderItemTempDO::getGroupId, 0L) wrapper.ne(OrderItemTempDO::getGroupId, 0L)
@@ -501,12 +499,11 @@ public class OrderComponentServiceImpl implements OrderComponentService {
.add(item.getCompId()); .add(item.getCompId());
} }
// num 汇总 // num 从部件组获取
if (item.getNum() != null) { if (item.getNum() != null && ObjectUtil.isNotNull(item.getCompId())) {
partsNumMap.merge( partsNumMap.put(
pair, pair,
item.getNum(), item.getNum()
Double::sum
); );
} }
} }