Merge branch 'jtwy' into dev_New

zss

16 小时以前 be09cd5461ee9e2589ed833510ac6a2a52ded6f3

 src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java

@@ -52,11 +52,13 @@
            procurementDto.setSalesLedgerProductId(item.getId());
            procurementDto.setProductCategory(item.getProductCategory());
            IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
            if(result.getRecords().size()>0) {
            ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
            if(item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0())>=0){
                item.setApproveStatus(1);
                salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
            }
            }
        });
        return AjaxResult.success(list);
    }