yys 修改销售，采购编辑bug

maven

4 天以前 8d28496c655e2585ab76c1e949d2532b52bfdf4b

yys  修改销售，采购编辑bug

 src/main/java/com/ruoyi/account/service/AccountExpenseService.java

@@ -27,4 +27,6 @@
    Map<String,List<String>> analysis();

    AccountExpense getByInvoiceNumber(String purchaseContractNumber);

    List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber);
}

 src/main/java/com/ruoyi/account/service/AccountIncomeService.java

@@ -20,4 +20,6 @@
    List<AccountDto3> reportIncome();

    AccountIncome getByInvoiceNumber(String purchaseContractNumber);

    List<AccountIncome> getByInvoiceNumberList(String purchaseContractNumber);
}

 src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java

@@ -157,5 +157,11 @@
                .eq(AccountExpense::getInvoiceNumber, purchaseContractNumber));
    }

    @Override
    public List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber) {
        return accountExpenseMapper.selectList(Wrappers.<AccountExpense>lambdaQuery()
                .eq(AccountExpense::getInvoiceNumber, purchaseContractNumber));
    }


}

 src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java

@@ -82,4 +82,10 @@
                .eq(AccountIncome::getInvoiceNumber, purchaseContractNumber));
        return accountIncome;
    }

    @Override
    public List<AccountIncome> getByInvoiceNumberList(String purchaseContractNumber) {
        return accountIncomeMapper.selectList(new LambdaQueryWrapper<AccountIncome>()
                .eq(AccountIncome::getInvoiceNumber, purchaseContractNumber));
    }
}

 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java

@@ -153,18 +153,20 @@
        } else {
            purchaseLedgerMapper.updateById(purchaseLedger);
            PurchaseLedger purchaseLedgerDB = purchaseLedgerMapper.selectById(purchaseLedger.getId());
            AccountExpense accountExpenseDB = accountExpenseService.getByInvoiceNumber(purchaseLedger.getPurchaseContractNumber());
            if (ObjectUtils.isEmpty(accountExpenseDB)) {
                throw new BaseException("支出管理无该采购合同的支出记录");
            List<AccountExpense> accountExpenseDBs = accountExpenseService.getByInvoiceNumberList(purchaseLedger.getPurchaseContractNumber());
            if (!CollectionUtils.isEmpty(accountExpenseDBs)) {
                accountExpenseDBs.forEach(accountExpenseDB ->{
                    accountExpenseDB.setExpenseDate(purchaseLedgerDB.getEntryDate());
                    accountExpenseDB.setExpenseType("0");
                    accountExpenseDB.setSupplierName(purchaseLedgerDB.getSupplierName());
                    accountExpenseDB.setExpenseMoney(purchaseLedgerDB.getContractAmount());
                    accountExpenseDB.setExpenseDescribed("采购合同：" + purchaseLedgerDB.getPurchaseContractNumber());
                    accountExpenseDB.setExpenseMethod("0");
                    accountExpenseDB.setInvoiceNumber(purchaseLedgerDB.getPurchaseContractNumber());
                    accountExpenseService.updateById(accountExpenseDB);
                });
            }
            accountExpenseDB.setExpenseDate(purchaseLedgerDB.getEntryDate());
            accountExpenseDB.setExpenseType("0");
            accountExpenseDB.setSupplierName(purchaseLedgerDB.getSupplierName());
            accountExpenseDB.setExpenseMoney(purchaseLedgerDB.getContractAmount());
            accountExpenseDB.setExpenseDescribed("采购合同：" + purchaseLedgerDB.getPurchaseContractNumber());
            accountExpenseDB.setExpenseMethod("0");
            accountExpenseDB.setInvoiceNumber(purchaseLedgerDB.getPurchaseContractNumber());
            accountExpenseService.updateById(accountExpenseDB);

        }

        // 4. 处理子表数据

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -399,17 +399,19 @@
            } else {
                salesLedgerMapper.updateById(salesLedger);
                SalesLedger salesLedgerDB = salesLedgerMapper.selectById(salesLedger.getId());
                AccountIncome accountIncomeDB = accountIncomeService.getByInvoiceNumber(salesLedger.getSalesContractNo());
                if (ObjectUtils.isEmpty(accountIncomeDB)) {
                    throw new BaseException("收入管理无该销售合同的收入记录");
                List<AccountIncome> accountIncomeDBs = accountIncomeService.getByInvoiceNumberList(salesLedger.getSalesContractNo());
                if (!CollectionUtils.isEmpty(accountIncomeDBs)) {
                    accountIncomeDBs.forEach(accountIncomeDB ->{
                        accountIncomeDB.setCustomerName(salesLedgerDB.getCustomerName());
                        accountIncomeDB.setIncomeMoney(salesLedgerDB.getContractAmount());
                        accountIncomeDB.setIncomeDescribed("销售合同：" + salesLedgerDB.getSalesContractNo());
                        accountIncomeDB.setInvoiceNumber(salesLedgerDB.getSalesContractNo());
                        accountIncomeDB.setInputTime(new Date());
                        accountIncomeDB.setInputUser(salesLedgerDB.getEntryPerson());
                        accountIncomeService.updateById(accountIncomeDB);
                    });
                }
                accountIncomeDB.setCustomerName(salesLedgerDB.getCustomerName());
                accountIncomeDB.setIncomeMoney(salesLedgerDB.getContractAmount());
                accountIncomeDB.setIncomeDescribed("销售合同：" + salesLedgerDB.getSalesContractNo());
                accountIncomeDB.setInvoiceNumber(salesLedgerDB.getSalesContractNo());
                accountIncomeDB.setInputTime(new Date());
                accountIncomeDB.setInputUser(salesLedgerDB.getEntryPerson());
                accountIncomeService.updateById(accountIncomeDB);

            }

            // 4. 处理子表数据