修改客户新增

wujianwei

11 小时以前 2a658f5db16ec4ea269a9c27c06879b0c4252ead

修改客户新增

 tms/src/main/java/com/ruoyi/tms/controller/TmsContainerController.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/controller/TmsDispatchOrderController.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/controller/TmsShelfController.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/controller/TmsVehicleController.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/controller/TmsVehicleDocumentController.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/domain/TmsContainer.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java

@@ -9,7 +9,10 @@
import com.baomidou.mybatisplus.annotation.TableField;

import java.util.Date;
import java.util.List;

import com.ruoyi.cwgl.domain.BankAccountConfig;
import com.ruoyi.cwgl.domain.InvoiceInfo;
import lombok.Data;

/**
@@ -198,5 +201,17 @@
    @TableField("remark")
    private String remark;

    /**
     * 发票信息列表
     */
    @TableField(exist = false)
    private List<InvoiceInfo> invoiceInfoList;

    /**
     * 银行账号配置列表
     */
    @TableField(exist = false)
    private List<BankAccountConfig> bankAccountConfigList;


}

 tms/src/main/java/com/ruoyi/tms/domain/TmsDispatchOrder.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/domain/TmsShelf.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/domain/TmsVehicle.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/domain/TmsVehicleDocument.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/mapper/TmsContainerMapper.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/mapper/TmsDispatchOrderMapper.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/mapper/TmsShelfMapper.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/mapper/TmsVehicleDocumentMapper.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/mapper/TmsVehicleMapper.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/ITmsContainerService.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/ITmsDispatchOrderService.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/ITmsShelfService.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/ITmsVehicleDocumentService.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/ITmsVehicleService.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsContainerServiceImpl.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsCustomerInfoServiceImpl.java

@@ -19,6 +19,8 @@
import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.common.core.service.BaseService;

import com.ruoyi.cwgl.service.IBankAccountConfigService;
import com.ruoyi.cwgl.service.IInvoiceInfoService;
import com.ruoyi.tms.mapper.TmsCustomerInfoMapper;
import com.ruoyi.tms.domain.TmsCustomerInfo;
import com.ruoyi.tms.service.ITmsCustomerInfoService;
@@ -39,6 +41,12 @@
    private TmsCustomerInfoMapper tmsCustomerInfoMapper;
    @Autowired
    ISystemDataNoService systemDataNoService;
    
    @Autowired
    IInvoiceInfoService invoiceInfoService;
    
    @Autowired
    IBankAccountConfigService bankAccountConfigService;

    /**
     * 查询客户信息
@@ -109,7 +117,33 @@
    {
        tmsCustomerInfo.setCustomerCode(systemDataNoService.getNoByKey(SystemDataNoEnum.CUST));
        tmsCustomerInfo.setCreateTime(DateUtils.getNowDate());
        return tmsCustomerInfoMapper.insertTmsCustomerInfo(tmsCustomerInfo);
        
        // 保存客户信息
        int result = tmsCustomerInfoMapper.insertTmsCustomerInfo(tmsCustomerInfo);
        
        // 获取客户ID和客户名称
        Integer customerId = tmsCustomerInfo.getId();
        String customerName = tmsCustomerInfo.getCustomerFullName();
        
        // 保存发票信息列表
        if (tmsCustomerInfo.getInvoiceInfoList() != null && !tmsCustomerInfo.getInvoiceInfoList().isEmpty()) {
            tmsCustomerInfo.getInvoiceInfoList().forEach(invoiceInfo -> {
                invoiceInfo.setCustomerId(customerId);
                invoiceInfo.setCustomerName(customerName);
            });
            invoiceInfoService.insertInvoiceInfoBatch(tmsCustomerInfo.getInvoiceInfoList());
        }
        
        // 保存银行账号配置列表
        if (tmsCustomerInfo.getBankAccountConfigList() != null && !tmsCustomerInfo.getBankAccountConfigList().isEmpty()) {
            tmsCustomerInfo.getBankAccountConfigList().forEach(bankAccountConfig -> {
                bankAccountConfig.setCustomerId(customerId);
                bankAccountConfig.setCustomerName(customerName);
            });
            bankAccountConfigService.insertBankAccountConfigBatch(tmsCustomerInfo.getBankAccountConfigList());
        }
        
        return result;
    }

    /**

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java

@@ -1,12 +1,10 @@
package com.ruoyi.tms.service.impl;

import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;

import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.SystemDataNoEnum;
import com.ruoyi.common.utils.DateUtils;
@@ -16,10 +14,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.ISystemDataNoService;
import com.ruoyi.tms.domain.TmsDispatchOrder;
import com.ruoyi.tms.domain.TmsFinance;
import com.ruoyi.tms.domain.vo.FinanceDetailItem;
import com.ruoyi.tms.mapper.TmsDispatchOrderMapper;
import com.ruoyi.tms.mapper.TmsFinanceMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -55,8 +51,7 @@
    @Resource
    private TmsFinanceMapper tmsFinanceMapper;

    @Resource
    private TmsDispatchOrderMapper tmsDispatchOrderMapper;

    @Autowired
    ISystemDataNoService systemDataNoService;
    @Autowired
@@ -113,17 +108,7 @@
        if (dispatchId !=null){
            eq.eq(TmsFinanceDetail::getDispatchOrderId, dispatchId);
        }
        List<TmsFinanceDetail> tmsFinanceDetails = tmsFinanceDetailMapper.selectList(eq);
        if (tmsFinanceDetails != null && !tmsFinanceDetails.isEmpty()){
            tmsFinanceDetails.forEach(tmsFinanceDetail -> {
                TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectById(tmsFinanceDetail.getDispatchOrderId());
                if (tmsDispatchOrder != null){
                    tmsFinanceDetail.setDispatchNo(tmsDispatchOrder.getDispatchNo());
                    tmsFinanceDetail.setCustomerName(tmsDispatchOrder.getCustomerName());
                }
            });
        }
        return tmsFinanceDetails;
        return tmsFinanceDetailMapper.selectList(eq);
    }

    /**
@@ -184,11 +169,8 @@
    public void addItem (TmsFinance tmsFinance, TmsFinanceDetail tmsFinanceDetail){
        if (tmsFinance == null){

            TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectTmsDispatchOrderById(tmsFinanceDetail.getDispatchOrderId());
            if (tmsDispatchOrder == null){
                throw new RuntimeException("未找到对应的调度单");
            }
            tmsFinance = BeanUtil.copyProperties(tmsDispatchOrder,TmsFinance.class);

            tmsFinance = new TmsFinance();
            SystemDataNoEnum systemDataNoEnum = tmsFinanceDetail.getFinanceType() == 0 ? SystemDataNoEnum.YFD :
                    tmsFinanceDetail.getFinanceType() == 1 ? SystemDataNoEnum.YSD : SystemDataNoEnum.OF;
            tmsFinance.setSystemCode(systemDataNoService.getNoByKey(systemDataNoEnum));

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceServiceImpl.java

@@ -8,10 +8,8 @@
import javax.annotation.Resource;

import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.tms.domain.TmsDispatchOrder;
import com.ruoyi.tms.domain.TmsFinanceDetail;
import com.ruoyi.tms.domain.TmsQuoteDetail;
import com.ruoyi.tms.mapper.TmsDispatchOrderMapper;
import com.ruoyi.tms.mapper.TmsFinanceDetailMapper;
import com.ruoyi.tms.mapper.TmsQuoteDetailMapper;
import org.springframework.transaction.annotation.Transactional;
@@ -49,8 +47,6 @@
    @Resource
    private TmsQuoteDetailMapper tmsQuoteDetailMapper;

    @Resource
    private TmsDispatchOrderMapper tmsDispatchOrderMapper;

    /**
     * 查询费用主表
@@ -236,20 +232,10 @@
        // 1、作废，头
        TmsFinance tmsFinance = selectTmsFinanceById(id);
        tmsFinance.setStatus(2);
        updateTmsFinance(tmsFinance);
        // 3、将原来的调度单变回为未结算
        LambdaUpdateWrapper<TmsDispatchOrder> eq = new LambdaUpdateWrapper<TmsDispatchOrder>()
                .eq(TmsDispatchOrder::getId, tmsFinance.getDispatchId());
        if (tmsFinance.getType() == 0){
            eq.set(TmsDispatchOrder::getAccountsReceivableStatus, 0)
                .set(TmsDispatchOrder::getCollectionPlanId, null);
        }else if (tmsFinance.getType() == 1){
            eq.set(TmsDispatchOrder::getAccountsPayableStatus, 0)
                .set(TmsDispatchOrder::getPaymentPlanId, null)
            ;
        }
        return updateTmsFinance(tmsFinance);

        return tmsDispatchOrderMapper.update(eq);


    }

    @Override

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsShelfServiceImpl.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsVehicleDocumentServiceImpl.java

File was deleted

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsVehicleServiceImpl.java

File was deleted

 tms/src/main/resources/mapper/tms/TmsContainerMapper.xml

File was deleted

 tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml

File was deleted

 tms/src/main/resources/mapper/tms/TmsShelfMapper.xml

File was deleted

 tms/src/main/resources/mapper/tms/TmsVehicleDocumentMapper.xml

File was deleted

 tms/src/main/resources/mapper/tms/TmsVehicleMapper.xml

File was deleted