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

zss

15 小时以前 2be29256f04c9822dc793c75dfae16c3262d2faf

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

@@ -65,7 +65,7 @@
            BigDecimal stockQuantity = stockUtils.getStockQuantity(item.getProductModelId()).get("stockQuantity");
            if(stockQuantity != null) {
//                ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
                if (item.getQuantity().compareTo(stockQuantity) >= 0 && item.getApproveStatus() == 0) {
                if (item.getQuantity().compareTo(stockQuantity) <= 0 && item.getApproveStatus() == 0) {
                    item.setApproveStatus(1);
                    salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
                }