diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index b2288a05..522bdb85 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -222,6 +222,9 @@ public class LeaseApplyInfo extends BaseEntity{ @ApiModelProperty(value = "已出库数量") private BigDecimal alNum; + @ApiModelProperty(value = "待领数量") + private BigDecimal waitCountNum; + @ApiModelProperty(value = "开始时间") private String startTime; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java index dd797bab..5f105ad6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/mapper/LeaseApplyInfoMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.lease.mapper; +import java.math.BigDecimal; import java.util.List; import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.material.lease.domain.vo.LeaseTotalInfo; @@ -104,4 +105,11 @@ public interface LeaseApplyInfoMapper { List getLeaseInfoDetails(LeaseTotalInfo info); LeaseTotalInfo getTotalInfo(LeaseTotalInfo leaseTotalInfo); + + /** + * 获取站点领料数量 + * @param applyInfo + * @return + */ + BigDecimal getNumList(LeaseApplyInfo applyInfo); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index fba3346d..ff627532 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -165,6 +165,15 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { .sorted(Comparator.comparing(LeaseApplyInfo::getCreateTime).reversed()) .collect(Collectors.toList()); if (!CollectionUtils.isEmpty(sortedList)) { + for (LeaseApplyInfo applyInfo : sortedList) { + // 根据id查询已领料出库数据 + BigDecimal num = leaseApplyInfoMapper.getNumList(applyInfo); + if (num == null) { + num = BigDecimal.ZERO; + } + applyInfo.setAlNum(num); + applyInfo.setWaitCountNum(applyInfo.getPreCountNum().subtract(num).compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO : applyInfo.getPreCountNum().subtract(num)); + } String keyWord = leaseApplyInfo.getKeyWord(); // 如果关键字不为空,进行过滤 if (!StringUtils.isBlank(keyWord)) { @@ -780,7 +789,12 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { */ @Override public int deleteLeaseApplyInfoByIds(Long[] ids) { - return leaseApplyInfoMapper.deleteLeaseApplyInfoByIds(ids); + int result = leaseApplyInfoMapper.deleteLeaseApplyInfoByIds(ids); + if (result > 0) { + // 删除lease_apply_details表数据 + result = leaseApplyDetailsMapper.deleteLeaseApplyDetailsByParentIds(ids); + } + return result; } /** diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index e02d7e09..566108f4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -405,4 +405,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" type_id = #{typeId} AND parent_id = #{parentId} + + + \ No newline at end of file