diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 5c82f81d..568c6a73 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -232,7 +232,7 @@ public interface BackReceiveMapper { * @param backApplyInfo * @return */ - BackApplyInfo getProAndTypeNum(BackApplyInfo backApplyInfo); + List getProAndTypeNum(BackApplyInfo backApplyInfo); /** * 获取退料列表 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index d0594701..068203b6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -157,8 +157,15 @@ public class BackReceiveServiceImpl implements BackReceiveService { * @param applyInfo */ private void setUsageNumber(BackApplyInfo applyInfo) { - BackApplyInfo info = backReceiveMapper.getProAndTypeNum(applyInfo); - applyInfo.setUsNum(info != null ? info.getUsNum() : 0.0); + List infoList = backReceiveMapper.getProAndTypeNum(applyInfo); + double usNum = 0.0; + if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(infoList)) { + for (BackApplyInfo backApplyInfo : infoList) { + // 获取在用数量,进行累加 + usNum += backApplyInfo.getUsNum() == null ? 0.0 : backApplyInfo.getUsNum(); + } + } + applyInfo.setUsNum(usNum); } /**