Merge remote-tracking branch 'origin/sqd' into sqd

maven

8 天以前 259e978c64b36f57aa1959c6d760416b86b26c34

 src/main/java/com/ruoyi/production/controller/SalesLedgerWorkController.java

@@ -55,7 +55,7 @@
        SalesLedgerWorkDto salesLedgerSchedulingDto = new SalesLedgerWorkDto();
        IPage<SalesLedgerWorkDto> result = salesLedgerWorkService.listPage(page,salesLedgerSchedulingDto);
        result.getRecords().forEach(item -> {
            item.setDaiNum(item.getFinishedNum().subtract(item.getSchedulingNum()));
            item.setDaiNum(item.getSchedulingNum().subtract(item.getFinishedNum()));
            item.setStatusName(item.getStatus().toString());
        });
        ExcelUtil<SalesLedgerWorkDto> util = new ExcelUtil<>(SalesLedgerWorkDto.class);