zss
2 天以前 8a63f3e06adf94d3afd3e81f15fe8a1976bbe384
发货库存校验
已修改3个文件
11 ■■■■ 文件已修改
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -34,6 +34,8 @@
    private String salesLedgerProductId;
    private Long productModelId;
    /**
     * 出入库数量
     */
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -288,18 +288,16 @@
        List<ProcurementPageDto> procurementPageDtoList = new ArrayList<>();
        list.forEach(item -> {
            ProcurementPageDto procurementDto = new ProcurementPageDto();
            procurementDto.setSalesLedgerProductId(String.valueOf(item.getId()));
            Page<ProcurementPageDto> page = new Page<>(1, 50);
            IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(page, procurementDto);
            IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordService.listPage(new Page<>(1, -1), procurementDto);
            procurementPageDtoList.addAll(procurementPageDtoIPage.getRecords());
        });
        if(!CollectionUtils.isEmpty(procurementPageDtoList)){
        if(CollectionUtils.isEmpty(procurementPageDtoList)){
            throw new RuntimeException("该产品库存不存在");
        }
        AtomicInteger num = new AtomicInteger();
        list.forEach(item -> {
            procurementPageDtoList.forEach(procurementPageDto -> {
                if(String.valueOf(item.getId().intValue()).equals(procurementPageDto.getSalesLedgerProductId())){
                if(item.getProductModelId().equals(procurementPageDto.getProductModelId())){
                    if (item.getQuantity().compareTo(procurementPageDto.getInboundNum0()) <= 0) {
                        num.getAndIncrement();
                    }
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -36,6 +36,7 @@
        t2.product_category,
        t1.id,
        t1.sales_ledger_product_id,
        t1.product_model_id,
        t1.create_user,
        t2.specification_model,
        t2.unit,