From 31586b3e979b311773cea33cf9c1c132d951d226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Mon, 30 Dec 2024 08:39:51 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=20=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E8=8E=B7=E5=8F=96=E9=A2=86?= =?UTF-8?q?=E6=96=99=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8service=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AE=9E=E9=99=85=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysMakeorderPickDetailServiceImpl.java | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java index f2225b8b..a3226e44 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java @@ -1,13 +1,19 @@ package com.ruoyi.system.service.impl; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.system.domain.MakeReturnOrderDetail; +import com.ruoyi.system.domain.SysMakeorderPick; import com.ruoyi.system.mapper.MakeReturnOrderDetailMapper; +import com.ruoyi.system.mapper.SysMakeorderPickMapper; +import com.ruoyi.warehouse.domain.WarehouseOutOrder; +import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail; +import com.ruoyi.warehouse.mapper.WarehouseOutOrderDetailMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.SysMakeorderPickDetailMapper; @@ -30,6 +36,12 @@ public class SysMakeorderPickDetailServiceImpl implements ISysMakeorderPickDetai @Autowired private MakeReturnOrderDetailMapper returnDetailMapper; + @Autowired + private SysMakeorderPickMapper makeorderPickMapper; + + @Autowired + private WarehouseOutOrderDetailMapper outOrderDetailMapper; + /** * 查询生产订单领料明细 * @@ -160,6 +172,8 @@ public class SysMakeorderPickDetailServiceImpl implements ISysMakeorderPickDetai List list = selectSysMakeorderPickDetailList(sysMakeorderPickDetail); String pickNo = sysMakeorderPickDetail.getPickNo(); + SysMakeorderPick makeorderPick = makeorderPickMapper.selectSysMakeorderPickByPickNo(pickNo); + String outOrderCode = makeorderPick.getOutOrderCode(); //合并相同料号数据，合计该物料总领料数 List mergedDetails = list.stream() .collect(Collectors.groupingBy(SysMakeorderPickDetail::getMaterialNo)) @@ -167,11 +181,6 @@ public class SysMakeorderPickDetailServiceImpl implements ISysMakeorderPickDetai .map(group -> { // 取第一个对象 SysMakeorderPickDetail tempPickDetail = group.get(0); - // 计算领料数的总和 - Integer totalPickupQuantity = group.stream() - .mapToInt(SysMakeorderPickDetail::getPickNum) - .sum(); - tempPickDetail.setPickNum(totalPickupQuantity); return tempPickDetail; }) .collect(Collectors.toList()); @@ -190,6 +199,12 @@ public class SysMakeorderPickDetailServiceImpl implements ISysMakeorderPickDetai .sum(); pickDetail.setHasReturnNum(returnNum); } + WarehouseOutOrderDetail tempDetail = new WarehouseOutOrderDetail(); + tempDetail.setOutOrderCode(outOrderCode); + tempDetail.setMaterialNo(pickDetail.getMaterialNo()); + WarehouseOutOrderDetail outOrderDetail = outOrderDetailMapper.selectOutOrderDetailListByThreeCode(tempDetail); + int outNum = Optional.ofNullable(outOrderDetail.getHasOutOrderSum()).orElse(0); + pickDetail.setHasPickNum(outNum); } return mergedDetails; }