fix(purchase): 修复采购模块数据导入和查询问题

liyong

2026-04-24 28e1505fa90c969b916d5e605e7a72b1df11cf8e

fix(purchase): 修复采购模块数据导入和查询问题

- 修改ApproveProcessServiceImpl中订单编号生成规则，使用"CGSP"前缀
- 在MaterialInfoDto中添加productModelId字段并移除无用导入
- 修正PaymentRegistrationMapper.xml中GROUP BY子句，增加supplier_id分组
- 修复ProductionPrintOrderServiceImpl中类型转换问题
- 优化PurchaseLedgerController，清理无用导入并添加方法间隔
- 重构PurchaseLedgerServiceImpl，改进数据导入逻辑和错误处理
- 增强采购数据验证和导入反馈功能
- 修复SalesLedgerProductMapper.xml分组查询逻辑
- 修正SupplierManage实体中Excel注解映射关系

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -83,7 +83,7 @@
//        String approveID = today + formattedCount;
        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
        ApproveProcess approveProcess = new ApproveProcess();
        String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "approve_id");
        String no = OrderUtils.countTodayByCreateTime(approveProcessMapper, "CGSP");
        approveProcess.setApproveId(no);
        approveProcess.setApproveUser(sysUser.getUserId());
        approveProcess.setApproveUserName(sysUser.getNickName());

 src/main/java/com/ruoyi/basic/pojo/SupplierManage.java

@@ -22,7 +22,7 @@

    @ApiModelProperty(value = "供应商类型")
    @TableField(value = "supplier_type")
    @Excel(name = "供应商名称")
    @Excel(name = "供应商类型")
    private String supplierType;

    @ApiModelProperty(value = "纳税人识别号")

 src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java

@@ -1,12 +1,10 @@
package com.ruoyi.production.dto;

import com.ruoyi.dto.SimplePersonDto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.List;

/**
 * @author buhuazhen
@@ -27,4 +25,6 @@
    private String price;
    private String priceSuffix = "元/kg";
    private String totalAmount;

    private String productModelId;
}

 src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java

@@ -60,7 +60,7 @@
            pdto.setProcessRouteNum(it.getProcessPositive());
            pdto.setProcessRouteAddNum(it.getProcessPositive());
//            pdto.setProcessRouteRequire(); 工艺要求
            pdto.setProductModelId(materialInfoDtoFirst.getId());
            pdto.setProductModelId(Long.valueOf(materialInfoDtoFirst.getProductModelId()));
            pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserId).map(String::valueOf).collect(Collectors.joining(",")));
            pdto.setUserNames(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
            pdto.setDeviceId(it.getDeviceId());

 src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -17,7 +16,6 @@
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import io.swagger.annotations.Api;
@@ -33,11 +31,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
 * 采购台账Controller
@@ -73,6 +68,7 @@
        return purchaseLedgerService.importData(file);
    }


    @ApiOperation("导出采购台账模板")
    @PostMapping("/exportTemplate")
    public void exportTemplate(HttpServletResponse response) {

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

@@ -1,5 +1,6 @@
package com.ruoyi.purchase.service.impl;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,23 +8,19 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.basic.dto.ProductModelAnticlockwiseDto;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -39,19 +36,25 @@
import com.ruoyi.purchase.dto.PurchaseLedgerImportDto;
import com.ruoyi.purchase.dto.PurchaseLedgerProductImportDto;
import com.ruoyi.purchase.mapper.*;
import com.ruoyi.purchase.pojo.*;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.quality.mapper.*;
import com.ruoyi.quality.pojo.*;
import com.ruoyi.sales.dto.SalesLedgerImportDto;
import com.ruoyi.sales.dto.SalesLedgerProductImportDto;
import com.ruoyi.sales.mapper.*;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.BeanUtils;
@@ -167,6 +170,7 @@
    public int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception {
        PurchaseLedger purchaseLedger = new PurchaseLedger();
        SalesLedger salesLedger = salesLedgerMapper.selectById(purchaseLedgerDto.getSalesLedgerId());
        BeanUtils.copyProperties(purchaseLedgerDto, purchaseLedger);
        //录入人
        SysUser sysUser = userMapper.selectUserById(purchaseLedgerDto.getRecorderId());
        if (ObjectUtils.isNotEmpty(sysUser)) {
@@ -182,7 +186,7 @@

        // DTO转Entity

        BeanUtils.copyProperties(purchaseLedgerDto, purchaseLedger);

        LoginUser loginUser = SecurityUtils.getLoginUser();
        if (ObjectUtils.isNotEmpty(loginUser) && null != loginUser.getTenantId()) {
            purchaseLedger.setTenantId(loginUser.getTenantId());
@@ -660,114 +664,175 @@
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult importData(MultipartFile file) {
        LoginUser loginUser = SecurityUtils.getLoginUser();
        int successCount = 0;
        int skipCount = 0;
        List<String> errorMessages = new ArrayList<>();

        try {
            InputStream inputStream = file.getInputStream();
            ExcelUtil<PurchaseLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(PurchaseLedgerImportDto.class);
            Map<String, List<PurchaseLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("采购台账数据", "采购产品数据"), inputStream, 0);
            ExcelUtil<PurchaseLedgerImportDto> excelUtil = new ExcelUtil<>(PurchaseLedgerImportDto.class);
            Map<String, List<PurchaseLedgerImportDto>> stringListMap = excelUtil.importExcelMultiSheet(Arrays.asList("采购台账数据", "采购产品数据"), inputStream, 0);
            if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("采购表格为空！");
            // 业务层合并
            List<PurchaseLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("采购台账数据");
            if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("采购台账数据为空！");
            List<PurchaseLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("采购产品数据");
            if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("采购产品数据为空！");
            // 供应商数据
            List<SupplierManage> customers = supplierManageMapper.selectList(new LambdaQueryWrapper<SupplierManage>().in(SupplierManage::getSupplierName,
                    salesLedgerImportDtoList.stream().map(PurchaseLedgerImportDto::getSupplierName).collect(Collectors.toList())));
            List<Map<String,Object>> list = productModelMapper.getProductAndModelList();
            // 录入人数据

            List<PurchaseLedgerImportDto> ledgerList = stringListMap.get("采购台账数据");
            if (CollectionUtils.isEmpty(ledgerList)) return AjaxResult.error("采购台账数据为空！");
            List<PurchaseLedgerImportDto> productList = stringListMap.get("采购产品数据");
            if (CollectionUtils.isEmpty(productList)) return AjaxResult.error("采购产品数据为空！");

            List<SupplierManage> suppliers = supplierManageMapper.selectList(new LambdaQueryWrapper<SupplierManage>().in(SupplierManage::getSupplierName,
                    ledgerList.stream().map(PurchaseLedgerImportDto::getSupplierName).filter(StrUtil::isNotBlank).collect(Collectors.toList())));
            List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
                    salesLedgerImportDtoList.stream().map(PurchaseLedgerImportDto::getRecorderName).collect(Collectors.toList())));
            for (PurchaseLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
                PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
                        .eq(PurchaseLedger::getPurchaseContractNumber, salesLedgerImportDto.getPurchaseContractNumber())
                        .last("limit 1"));
                if(purchaseLedger != null){
                    ledgerList.stream().map(PurchaseLedgerImportDto::getRecorderName).filter(StrUtil::isNotBlank).collect(Collectors.toList())));

            for (int i = 0; i < ledgerList.size(); i++) {
                PurchaseLedgerImportDto importDto = ledgerList.get(i);
                int rowNum = i + 2;

                if (StrUtil.isBlank(importDto.getPurchaseContractNumber())) {
                    errorMessages.add(String.format("第%d行：采购单号为空", rowNum));
                    skipCount++;
                    continue;
                }
                PurchaseLedger salesLedger = new PurchaseLedger();
                BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
                // 通过供应商名称查询ID
                salesLedger.setSupplierId(customers.stream()
                        .filter(customer -> customer.getSupplierName().equals(salesLedger.getSupplierName()))
                        .findFirst()
                        .map(SupplierManage::getId)
                        .orElse(null));
                Long aLong = sysUsers.stream()
                        .filter(sysUser -> sysUser.getNickName().equals(salesLedger.getRecorderName()))
                        .findFirst()
                        .map(SysUser::getUserId)
                        .orElse(null);
                if (aLong == null)
                    throw new RuntimeException("录入人:" + salesLedger.getRecorderName() + ",无对应用户！");
                salesLedger.setRecorderId(aLong);
                // 采购产品数据绑定，通过采购单号获取对应采购产品数据
                List<PurchaseLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
                        .filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getPurchaseContractNumber().equals(salesLedger.getPurchaseContractNumber()))
                        .collect(Collectors.toList());
                if (CollectionUtils.isEmpty(salesLedgerProductImportDtos))
                    throw new RuntimeException("采购单号:" + salesLedgerImportDto.getPurchaseContractNumber() + ",无对应产品数据！");
                salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()
                        .map(PurchaseLedgerProductImportDto::getTaxInclusiveTotalPrice)
                        .reduce(BigDecimal.ZERO,BigDecimal::add));
                // 通过销售单号绑定销售
                SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
                        .eq(SalesLedger::getSalesContractNo, salesLedger.getSalesContractNo())
                        .last("LIMIT 1"));
                if(salesLedger1 != null){
                    salesLedger.setSalesLedgerId(salesLedger1.getId());
                }
                // 采购审核
                // 通过昵称获取用户ID
                String[] split = salesLedger.getApproveUserIds().split("，");
                List<Long> ids = new ArrayList<>();
                for (int i = 0; i < split.length; i++) {
                    SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getNickName, split[i])
                            .last("LIMIT 1"));
                    if (sysUser != null) {
                        ids.add(sysUser.getUserId());
                    }
                }
                // 将集合转为字符串，隔开
                String collect = ids.stream().map(Object::toString).collect(Collectors.joining(","));
                salesLedger.setApproveUserIds(collect);
                purchaseLedgerMapper.insert(salesLedger);

                for (PurchaseLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
                    SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
                    BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
                    salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
                    salesLedgerProduct.setType(2);
                    // 计算不含税总价
                    salesLedgerProduct.setTaxExclusiveTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice().divide(new BigDecimal(1).add(salesLedgerProduct.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP));
                    salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
                    salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxExclusiveTotalPrice());
                    list.stream()
                            .filter(map -> map.get("productName").equals(salesLedgerProduct.getProductCategory()) && map.get("model").equals(salesLedgerProduct.getSpecificationModel()))
                            .findFirst()
                            .ifPresent(map -> {
                                salesLedgerProduct.setProductModelId(Long.parseLong(map.get("modelId").toString()));
                                salesLedgerProduct.setProductId(Long.parseLong(map.get("id").toString()));
                            });
                    salesLedgerProduct.setRegister(loginUser.getNickName());
                    salesLedgerProduct.setRegisterDate(LocalDateTime.now());
                    salesLedgerProduct.setApproveStatus(0);
                    salesLedgerProduct.setPendingTicketsTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
                    // 是否质检判断
                    salesLedgerProduct.setIsChecked(salesLedgerProductImportDto.getIsChecked() == 1);
                    if(salesLedgerProductImportDto.getIsChecked() == 1){
                        addQualityInspect(salesLedger, salesLedgerProduct);
                try {
                    PurchaseLedger existLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
                            .eq(PurchaseLedger::getPurchaseContractNumber, importDto.getPurchaseContractNumber())
                            .last("limit 1"));
                    if (existLedger != null) {
                        errorMessages.add(String.format("第%d行：采购单号[%s]已存在", rowNum, importDto.getPurchaseContractNumber()));
                        skipCount++;
                        continue;
                    }
                    salesLedgerProductMapper.insert(salesLedgerProduct);

                    PurchaseLedger purchaseLedger = new PurchaseLedger();
                    BeanUtils.copyProperties(importDto, purchaseLedger);

                    purchaseLedger.setSupplierId(suppliers.stream()
                            .filter(s -> s.getSupplierName().equals(importDto.getSupplierName()))
                            .findFirst()
                            .map(SupplierManage::getId)
                            .orElse(null));

                    Long recorderId = sysUsers.stream()
                            .filter(u -> u.getNickName().equals(importDto.getRecorderName()))
                            .findFirst()
                            .map(SysUser::getUserId)
                            .orElse(null);
                    if (recorderId == null) {
                        throw new RuntimeException("录入人:" + importDto.getRecorderName() + "不存在");
                    }
                    purchaseLedger.setRecorderId(recorderId);

                    List<PurchaseLedgerProductImportDto> productDtos = productList.stream()
                            .filter(p -> p.getPurchaseContractNumber().equals(importDto.getPurchaseContractNumber()))
                            .collect(Collectors.toList());
                    if (CollectionUtils.isEmpty(productDtos)) {
                        throw new RuntimeException("无对应产品数据");
                    }

                    purchaseLedger.setContractAmount(productDtos.stream()
                            .map(PurchaseLedgerProductImportDto::getTaxInclusiveTotalPrice)
                            .reduce(BigDecimal.ZERO, BigDecimal::add));

                    SalesLedger salesLedger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
                            .eq(SalesLedger::getSalesContractNo, purchaseLedger.getSalesContractNo())
                            .last("LIMIT 1"));
                    if (salesLedger != null) {
                        purchaseLedger.setSalesLedgerId(salesLedger.getId());
                    }

                    purchaseLedgerMapper.insert(purchaseLedger);

                    for (PurchaseLedgerProductImportDto productDto : productDtos) {
                        SalesLedgerProduct product = new SalesLedgerProduct();
                        BeanUtils.copyProperties(productDto, product);
                        product.setSalesLedgerId(purchaseLedger.getId());
                        product.setType(2);
                        product.setTaxExclusiveTotalPrice(product.getTaxInclusiveTotalPrice()
                                .divide(new BigDecimal(1).add(product.getTaxRate().divide(new BigDecimal(100))), 2, RoundingMode.HALF_UP));
                        product.setFutureTickets(product.getQuantity());
                        product.setFutureTicketsAmount(product.getTaxExclusiveTotalPrice());

                        ProductModelAnticlockwiseDto modelDto = new ProductModelAnticlockwiseDto();
                        modelDto.setProductName(product.getProductCategory());
                        modelDto.setModel(product.getSpecificationModel());
                        modelDto.setUnit(product.getUnit());
                        modelDto.setSubUnit(product.getUnit());
                        product.setProductModelId(productModelAnticlockwise(modelDto));

                        product.setRegister(loginUser.getNickName());
                        product.setRegisterDate(LocalDateTime.now());
                        product.setApproveStatus(0);
                        product.setPendingTicketsTotal(productDto.getTaxInclusiveTotalPrice());
                        product.setIsChecked(productDto.getIsChecked() == 1);

                        if (productDto.getIsChecked() == 1) {
                            addQualityInspect(purchaseLedger, product);
                        }
                        salesLedgerProductMapper.insert(product);
                    }

                    addApproveByPurchase(loginUser, purchaseLedger);
                    successCount++;

                } catch (Exception e) {
                    log.error("第{}行采购单[{}]导入失败：{}", rowNum, importDto.getPurchaseContractNumber(), e.getMessage(), e);
                    errorMessages.add(String.format("第%d行采购单[%s]：失败-%s", rowNum, importDto.getPurchaseContractNumber(), e.getMessage()));
                    skipCount++;
                }
                // 采购审核
                addApproveByPurchase(loginUser,salesLedger);
            }

            return AjaxResult.success("导入成功");
            String message = String.format("导入完成！成功%d条，跳过%d条", successCount, skipCount);
            if (!errorMessages.isEmpty()) {
                message += "。错误详情：" + String.join("；", errorMessages);
            }
            return AjaxResult.success(message);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("采购导入异常", e);
            return AjaxResult.error("导入失败：" + e.getMessage());
        }
        return AjaxResult.success("导入失败");
    }

    public Long productModelAnticlockwise(ProductModelAnticlockwiseDto productModelDto) {
        ProductModel oldProductModel = productModelMapper.selectOldProductModel(productModelDto.getModel(), productModelDto.getProductName());
        //存在就更新
        if (oldProductModel != null) {
            oldProductModel.setModel(productModelDto.getModel());
            oldProductModel.setUnit(productModelDto.getUnit());
            oldProductModel.setSubUnit(productModelDto.getSubUnit());
            oldProductModel.setDeptId(SecurityUtils.getDeptId()[0]);
            productModelMapper.updateById(oldProductModel);
            Product product = productMapper.selectById(oldProductModel.getProductId());
            product.setProductName(productModelDto.getProductName());
            productMapper.updateById(product);
            return oldProductModel.getId();
        }else {
            //找到父节点
            Product productParent = productMapper.selectOne(new QueryWrapper<Product>().lambda().eq(Product::getProductName, "原料").last("limit 1"));
            if (ObjectUtils.isEmpty(productParent)) {
                Product product = new Product();
                product.setProductName("原料");
                product.setDeptId(SecurityUtils.getDeptId()[0]);
                productMapper.insert(product);
                productParent.setId(product.getId());
            }
            //新增产品大类
            Product product = new Product();
            product.setProductName(productModelDto.getProductName());
            product.setParentId(productParent.getId());
            product.setDeptId(SecurityUtils.getDeptId()[0]);
            productMapper.insert( product);
            //新增产品规格
            ProductModel productModel = new ProductModel();
            productModel.setProductId(product.getId());
            productModel.setModel(productModelDto.getModel());
            productModel.setUnit(productModelDto.getUnit());
            productModel.setSubUnit(productModelDto.getSubUnit());
            productModel.setDeptId(SecurityUtils.getDeptId()[0]);
            productModelMapper.insert(productModel);
            return productModel.getId();

        }
    }

    @Override

 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml

@@ -197,7 +197,7 @@
                T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
            </if>
        </where>
        GROUP BY T1.supplier_name
        GROUP BY T1.supplier_name,T1.supplier_id
    </select>

    <select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
@@ -217,7 +217,7 @@
                T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
            </if>
        </where>
        GROUP BY  T1.purchase_contract_number,T2.payment_date
        GROUP BY  T1.purchase_contract_number,T2.payment_date,T1.supplier_id,T1.supplier_name
    </select>

</mapper>

 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -128,7 +128,7 @@
            AND slp.product_category = #{req.productCategory}
        </if>
        <!-- 按产品大类分组聚合 -->
        GROUP BY slp.product_category
        GROUP BY slp.product_category,slp.specification_model,sl.supplier_name
        <!-- 按产品大类排序 -->
        ORDER BY slp.product_category
    </select>