新增供应商银行

wujianwei

2025-12-24 d537057a0bac012bb6909b89586089a01b8d8a9e

 service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java

@@ -151,7 +151,7 @@
            String receivableAmountStr = calculateReceivableAmountStr(receivableFeeManagement.getReceivableFeeDetailList());
            receivableFeeManagement.setReceivableAmountStr(receivableAmountStr);
        }

        receivableFeeManagement.setCreateBy(SecurityUtils.getUsername());
        // 保存主表信息
        int result = receivableFeeManagementMapper.insertReceivableFeeManagement(receivableFeeManagement);
        
@@ -215,7 +215,7 @@
            // 设置每个明细的应收费用管理ID
            receivableFeeManagement.getReceivableFeeDetailList().forEach(detail -> {
                detail.setReceivableFeeId(receivableFeeId);
                detail.setUpdateTime(DateUtils.getNowDate()); // 设置更新时间
                detail.setCreateTime(DateUtils.getNowDate()); // 设置更新时间
            });
            
            // 调用批量插入方法
@@ -451,12 +451,13 @@
        billManagement.setCreateTime(DateUtils.getNowDate());
        billManagement.setBillName(billCreateVo.getBillName());
        billManagement.setCustomerName(billCreateVo.getCustomerName());
        billManagement.setCreateBy(SecurityUtils.getUsername());
        billManagement.setIsInternalSettlement(billCreateVo.getIsInternalSettlement());
        billManagement.setInternalSettlementUnit(billCreateVo.getInternalSettlementUnit());
        // 3. 根据账单类型设置币种和总金额
        if (billType == 0) {
            // 人民币账单
            billManagement.setCurrency("CNY");
            billManagement.setCurrency("RMB");
            billManagement.setTotalAmount(statisticsVo.getTotalAmountRmb());
        } else if (billType == 1) {
            // 港币账单
@@ -465,6 +466,7 @@
        } else {
            throw new IllegalArgumentException("无效的账单类型：" + billType);
        }
        billManagement.setPendingAmount(billManagement.getTotalAmount());
        String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YSZD);
        billManagement.setSystemNo(noByKey);
        // 4. 保存主账单记录
@@ -530,7 +532,7 @@
        Map<String, BigDecimal> currencyAmountMap = new HashMap<>();
        for (ReceivableFeeDetail detail : detailList) {
            String currency = detail.getCurrency();
            BigDecimal billingAmount = detail.getBillingAmount();
            BigDecimal billingAmount = detail.getActualAmount();
            
            if (currency != null && billingAmount != null) {
                currencyAmountMap.merge(currency, billingAmount, BigDecimal::add);
@@ -560,4 +562,79 @@
        
        return sb.toString();
    }

    /**
     * 导入应收费用管理数据（包含明细数据）
     * 
     * @param receivableFeeList 应收费用管理数据列表（包含明细数据）
     * @param operName 操作用户
     * @return 结果
     */
    @Override
    public String importReceivableFee(List<ReceivableFeeManagement> receivableFeeList, String operName) {
        if (receivableFeeList == null || receivableFeeList.isEmpty()) {
            return "导入数据不能为空！";
        }
        int successNum = 0;
        int failureNum = 0;
        StringBuilder successMsg = new StringBuilder();
        StringBuilder failureMsg = new StringBuilder();
        
        for (ReceivableFeeManagement receivableFee : receivableFeeList) {
            try {
                // 自动生成系统编号（和新增功能一样）
                String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YS);
                receivableFee.setSystemNo(noByKey);
                
                // 设置创建时间和创建人
                receivableFee.setCreateTime(DateUtils.getNowDate());
                receivableFee.setCreateBy(operName);
                
                // 计算应收金额字符串描述
                if (receivableFee.getReceivableFeeDetailList() != null && !receivableFee.getReceivableFeeDetailList().isEmpty()) {
                    String receivableAmountStr = calculateReceivableAmountStr(receivableFee.getReceivableFeeDetailList());
                    receivableFee.setReceivableAmountStr(receivableAmountStr);
                }
                
                // 新增记录（不做存在性判断）
                int result = insertReceivableFeeManagement(receivableFee);
                
                if (result > 0) {
                    successNum++;
                    successMsg.append("<br/>" + successNum + ". 系统编号 " + receivableFee.getSystemNo() + " 导入成功");
                } else {
                    failureNum++;
                    failureMsg.append("<br/>" + failureNum + ". 系统编号 " + receivableFee.getSystemNo() + " 导入失败");
                }
            } catch (Exception e) {
                failureNum++;
                String msg = "<br/>" + failureNum + ". 系统编号 " + (receivableFee.getSystemNo() != null ? receivableFee.getSystemNo() : "未知") + " 导入失败：";
                failureMsg.append(msg + e.getMessage());
                logger.error(msg, e);
            }
        }
        
        if (failureNum > 0) {
            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
            throw new ServiceException(failureMsg.toString());
        } else {
            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
        }
        return successMsg.toString();
    }

    /**
     * 下载导入模板
     * 
     * @param exportKey 导出功能的唯一标识
     */
    @DataSource(DataSourceType.SLAVE)
    @Async
    @Override
    public void importTemplate(String exportKey) {
        super.export(ReceivableFeeManagement.class, exportKey, "receivableFeeManagementTemplate", (pageNum) -> {
            // 返回空列表，只导出模板结构
            return new ArrayList<ReceivableFeeManagement>();
        });
    }
}