产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liyong
8 天以前 ca0565e53494417b3779759f8d3898e07bfd5929 
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java


@@ -26,6 +26,7 @@


import com.ruoyi.sales.pojo.SalesLedgerProduct;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.stereotype.Service;


import org.springframework.util.CollectionUtils;


import org.springframework.util.StringUtils;


@@ -775,6 +776,9 @@


                    .createTime(LocalDateTime.now())


                    .createUser(loginUser.getUserId())


                    .updateTime(LocalDateTime.now())


                    .boxNum(detail.getBoxNum())


                    .cartonSpecifications(detail.getCartonSpecifications())


                    .dollarPrice(detail.getDollarPrice())


                    .updateUser(loginUser.getUserId())


                    .createBy(procurementDto.getNickName())


                    .productModelId(detail.getProductModelId());


@@ -832,6 +836,15 @@


        return procurementPageDtoIPage;


    }




    public List<Long> listCopyIds(String ids) {


        List<Long> idsSet = new ArrayList<>();


        String[] split = ids.split(",");


        for (String s : split) {


            idsSet.add(Long.valueOf(s));


        }


        return idsSet;


    }




    @Override


    public IPage<ProcurementPageDtoCopy> listPageCopy(Page page, ProcurementPageDto procurementDto) {


        IPage<ProcurementPageDtoCopy> procurementPageDtoCopyIPage = procurementRecordMapper.listPageCopy(page, procurementDto);


@@ -861,9 +874,8 @@


                dto.setTotalInboundNum(BigDecimal.ZERO);


                continue;


            }




            // 计算已出库数量总和，并设置待出库数量


            BigDecimal totalInboundNum = collect1.stream()


            BigDecimal totalInboundNum = procurementRecords.stream()


                    .map(ProcurementRecordOut::getInboundNum)


                    .reduce(BigDecimal.ZERO, BigDecimal::add);


            // 出库数量 = 总数量 - 待出库数量