feat:销售记录excel导入（查询，删除）

liding

12 小时以前 56424206be7af38a02be17f215654f3ca813ebcb

feat:销售记录excel导入（查询，删除）

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

@@ -9,13 +9,10 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.dto.ReceiptPaymentRecordDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ReceiptPaymentService;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
@@ -80,6 +77,17 @@
    }

    /**
     * å®¢æˆ·é”€å”®è®°å½•æŸ¥è¯¢
     * @param receiptPaymentDto
     * @return
     */
    @GetMapping("/customerSalesInteractions")
    public AjaxResult customerSalesInteractions (InvoiceLedgerDto receiptPaymentDto) {
        return AjaxResult.success(receiptPaymentService.customerSalesInteractions(receiptPaymentDto));
    }


    /**
     * å›žæ¬¾ç™»è®°è¯¦æƒ…
     * @param id
     * @return

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
package com.ruoyi.sales.controller;

import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.WeighingRecordExcelDto;
import com.ruoyi.sales.pojo.WeighingRecord;
import com.ruoyi.sales.service.IWeighingRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.util.ArrayList;
import java.util.List;

/**
 * è¿‡ç£…记录（磅单台账）Controller
 *
 * @author ruoyi
 * @date 2026-04-07
 */
@Api(tags = "磅单台账管理")
@RestController
@RequestMapping("/sales/weighbridgeLedger")
public class WeighingRecordController extends BaseController {

    @Autowired
    private IWeighingRecordService weighingRecordService;

    /**
     * åˆ†é¡µæŸ¥è¯¢ç£…单台账列表
     */
    @ApiOperation("分页查询磅单台账列表")
    @GetMapping("/listPage")
    public R<IPage<WeighingRecord>> listPage(Page<WeighingRecord> page, WeighingRecord weighingRecord) {
        IPage<WeighingRecord> list = weighingRecordService.listPage(page, weighingRecord);
        return R.ok(list);
    }

    /**
     * å¯¼å…¥ Excel（新磅单台账）
     */
    @ApiOperation("导入Excel")
    @Log(title = "磅单台账", businessType = BusinessType.IMPORT)
    @PostMapping("/import")
    public R importWeighbridgeLedgerExcel(@RequestParam("file") MultipartFile file) throws Exception {
        try {
            List<WeighingRecordExcelDto> excelDataList = EasyExcel.read(file.getInputStream())
                    .head(WeighingRecordExcelDto.class)
                    .sheet()
                    .doReadSync();

            if (CollectionUtils.isEmpty(excelDataList)) {
                return R.fail("模板错误或导入数据为空");
            }

            // è½¬æ¢ä¸ºå®žä½“对象
            List<WeighingRecord> weighingRecordList = new ArrayList<>();
            for (WeighingRecordExcelDto dto : excelDataList) {
                WeighingRecord record = new WeighingRecord();
                BeanUtils.copyProperties(dto, record);
                weighingRecordList.add(record);
            }

            // åŽ»é‡æ£€æŸ¥
            List<WeighingRecord> newRecordList = new ArrayList<>();
            int duplicateCount = 0;

            for (WeighingRecord record : weighingRecordList) {
                LambdaQueryWrapper<WeighingRecord> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(WeighingRecord::getSerialNo, record.getSerialNo());

                long count = weighingRecordService.count(wrapper);
                if (count == 0) {
                    newRecordList.add(record);
                } else {
                    duplicateCount++;
                }
            }

            if (newRecordList.isEmpty()) {
                return R.fail("所有数据都已存在，共" + duplicateCount + "条重复数据");
            }

            // æ‰¹é‡æ’入新数据
            weighingRecordService.saveBatch(newRecordList);

            String message = String.format("导入成功：%d条，跳过重复：%d条", newRecordList.size(), duplicateCount);
            return R.ok(message);

        } catch (Exception e) {
            return R.fail("导入失败：" + e.getMessage());
        }
    }

    /**
     * åˆ é™¤ï¼ˆæ–°ç£…单台账）
     */
    @ApiOperation("删除磅单台账")
    @Log(title = "磅单台账", businessType = BusinessType.DELETE)
    @DeleteMapping("/delete")
    public R delWeighbridgeLedger(@RequestBody List<Long> ids) {
        boolean success = weighingRecordService.removeByIds(ids);
        if (success) {
            return R.ok("删除成功");
        } else {
            return R.fail("删除失败");
        }
    }

}

 src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java

@@ -7,7 +7,6 @@
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;

@@ -54,4 +53,16 @@
    private Integer salesLedgerId;

    private String paymentMethod;

    @ApiModelProperty(value = "货名")
    private String goodsName;

    @ApiModelProperty(value = "规格")
    private String specificationModel;

    @ApiModelProperty(value = "已发货")
    private String shippedQuantity;

    @ApiModelProperty(value = "未发货")
    private String unshippedQuantity;
}

 src/main/java/com/ruoyi/sales/dto/WeighingRecordExcelDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
package com.ruoyi.sales.dto;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * è¿‡ç£…记录Excel导入导出DTO
 */
@Data
@ApiModel(value = "WeighingRecordExcelDto", description = "过磅记录Excel导入导出")
public class WeighingRecordExcelDto {

    @ExcelProperty(value = "流水号")
    private String serialNo;

    @ExcelProperty(value = "车号")
    private String carNo;

    @ExcelProperty(value = "发货单位")
    private String shipUnit;

    @ExcelProperty(value = "收货单位")
    private String receiveUnit;

    @ExcelProperty(value = "货名")
    private String goodsName;

    @ExcelProperty(value = "规格")
    private String specification;

    @ExcelProperty(value = "毛重")
    private BigDecimal grossWeight;

    @ExcelProperty(value = "皮重")
    private BigDecimal tareWeight;

    @ExcelProperty(value = "净重")
    private BigDecimal netWeight;

    @ExcelProperty(value = "一次过磅时间")
    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
    private LocalDateTime firstWeighTime;

    @ExcelProperty(value = "二次过磅时间")
    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
    private LocalDateTime secondWeighTime;

    @ExcelProperty(value = "原发")
    private String originalSender;

    @ExcelProperty(value = "更新人")
    private String updateBy;
}

 src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java

@@ -11,7 +11,6 @@
import org.apache.ibatis.annotations.Param;

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

public interface ReceiptPaymentMapper extends BaseMapper<ReceiptPayment> {
@@ -84,4 +83,5 @@
    List<ReceiptPaymentExeclDto> bindInvoiceNoRegListByIds(List<Long> ids,Long tenantId);


    List<InvoiceLedgerDto> customerSalesInteractions(InvoiceLedgerDto receiptPaymentDto);
}

 src/main/java/com/ruoyi/sales/mapper/WeighingRecordMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.ruoyi.sales.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.sales.pojo.WeighingRecord;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface WeighingRecordMapper extends BaseMapper<WeighingRecord> {
}

 src/main/java/com/ruoyi/sales/pojo/WeighingRecord.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
package com.ruoyi.sales.pojo;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * è¿‡ç£…记录实体类
 */
@Data
@TableName("weighing_record")
@ApiModel(value = "WeighingRecord", description = "过磅记录")
public class WeighingRecord implements Serializable {
    private static final long serialVersionUID = 1L;

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键ID")
    private Long id;

    @ApiModelProperty(value = "流水号")
    private String serialNo;

    @ApiModelProperty(value = "车号")
    private String carNo;

    @ApiModelProperty(value = "发货单位")
    private String shipUnit;

    @ApiModelProperty(value = "收货单位")
    private String receiveUnit;

    @ApiModelProperty(value = "货名")
    private String goodsName;

    @ApiModelProperty(value = "规格")
    private String specification;

    @ApiModelProperty(value = "毛重")
    private BigDecimal grossWeight;

    @ApiModelProperty(value = "皮重")
    private BigDecimal tareWeight;

    @ApiModelProperty(value = "净重")
    private BigDecimal netWeight;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "一次过磅时间")
    private LocalDateTime firstWeighTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "二次过磅时间")
    private LocalDateTime secondWeighTime;

    @ApiModelProperty(value = "原发")
    private String originalSender;

    @ApiModelProperty(value = "更新人")
    private String updateBy;

    @ApiModelProperty(value = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty(value = "修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Integer createUser;

    @ApiModelProperty(value = "修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
}

 src/main/java/com/ruoyi/sales/service/IWeighingRecordService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
package com.ruoyi.sales.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.sales.pojo.WeighingRecord;

public interface IWeighingRecordService extends IService<WeighingRecord> {
    IPage<WeighingRecord> listPage(Page<WeighingRecord> page, WeighingRecord weighingRecord);
}

 src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.sales.dto.CustomerInteractionDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
@@ -16,6 +15,7 @@

    /**
     * å›žæ¬¾ç™»è®°æ–°å¢ž
     *
     * @param receiptPayment
     * @return
     */
@@ -23,6 +23,7 @@

    /**
     * å›žæ¬¾ç™»è®°ä¿®æ”¹
     *
     * @param receiptPayment
     * @return
     */
@@ -30,6 +31,7 @@

    /**
     * å›žæ¬¾ç™»è®°åˆ é™¤
     *
     * @param ids
     * @return
     */
@@ -37,14 +39,16 @@

    /**
     * å›žæ¬¾ç™»è®°åˆ†é¡µæŸ¥è¯¢
     *
     * @param page
     * @param receiptPaymentDto
     * @return
     */
    IPage<ReceiptPaymentDto> receiptPaymentListPage (Page page, ReceiptPaymentDto receiptPaymentDto);
    IPage<ReceiptPaymentDto> receiptPaymentListPage(Page page, ReceiptPaymentDto receiptPaymentDto);

    /**
     * å›žæ¬¾ç™»è®°è¯¦æƒ…
     *
     * @param id
     * @return
     */
@@ -54,6 +58,7 @@

    /**
     * æŸ¥è¯¢å·²ç»ç»‘定发票的开票台账
     *
     * @param page
     * @param receiptPaymentDto
     * @return
@@ -62,12 +67,13 @@

    /**
     * å¼€ç¥¨å°è´¦è¯¦æƒ…
     *
     * @param id
     * @return
     */
    InvoiceLedgerDto invoiceInfo(Integer id);

    Map<String,BigDecimal> getAmountMouth();
    Map<String, BigDecimal> getAmountMouth();

    /**
     * æŸ¥è¯¢å›žæ¬¾è®°å½•
@@ -81,10 +87,11 @@

    /**
     * å®¢æˆ·å¾€æ¥è®°å½•æŸ¥è¯¢
     *
     * @param receiptPaymentDto
     * @return
     */
    List<InvoiceLedgerDto> customerInteractions (InvoiceLedgerDto receiptPaymentDto);
    List<InvoiceLedgerDto> customerInteractions(InvoiceLedgerDto receiptPaymentDto);

    /**
     * æŸ¥è¯¢å›žæ¬¾è®°å½•åˆ†é¡µ
@@ -100,4 +107,12 @@
     * éƒ¨åˆ†å¯¼å‡ºå›žæ¬¾åˆ—表
     */
    void exportPaymentList(HttpServletResponse response, List<Long> ids);

    /**
     * å®¢æˆ·é”€å”®è®°å½•æŸ¥è¯¢
     *
     * @param receiptPaymentDto
     * @return
     */
    List<InvoiceLedgerDto> customerSalesInteractions(InvoiceLedgerDto receiptPaymentDto);
}

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

@@ -8,7 +8,6 @@
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.CustomerInteractionDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.dto.ReceiptPaymentExeclDto;
@@ -16,7 +15,6 @@
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -32,7 +30,6 @@
import java.time.LocalDate;
import java.time.YearMonth;
import java.util.*;
import java.util.stream.Collectors;

@Service
public class ReceiptPaymentServiceImpl extends ServiceImpl<ReceiptPaymentMapper,ReceiptPayment> implements ReceiptPaymentService {
@@ -357,4 +354,10 @@
        }

    }

    @Override
    public List<InvoiceLedgerDto> customerSalesInteractions(InvoiceLedgerDto receiptPaymentDto) {
        receiptPaymentDto.getCustomerId();
        return receiptPaymentMapper.customerSalesInteractions(receiptPaymentDto);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.ruoyi.sales.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.sales.mapper.WeighingRecordMapper;
import com.ruoyi.sales.pojo.WeighingRecord;
import com.ruoyi.sales.service.IWeighingRecordService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

@Service
@Slf4j
@RequiredArgsConstructor
public class WeighingRecordServiceImpl extends ServiceImpl<WeighingRecordMapper, WeighingRecord> implements IWeighingRecordService {

    private final WeighingRecordMapper weighingRecordMapper;

    @Override
    public IPage<WeighingRecord> listPage(Page<WeighingRecord> page, WeighingRecord weighingRecord) {
        LambdaQueryWrapper<WeighingRecord> queryWrapper = new LambdaQueryWrapper<>();
        // æµæ°´å·ï¼ˆæ¨¡ç³ŠæŸ¥è¯¢ï¼‰
        queryWrapper.like(StringUtils.isNotBlank(weighingRecord.getSerialNo()),
                WeighingRecord::getSerialNo, weighingRecord.getSerialNo());

        // è½¦å·ï¼ˆæ¨¡ç³ŠæŸ¥è¯¢ï¼‰
        queryWrapper.like(StringUtils.isNotBlank(weighingRecord.getCarNo()),
                WeighingRecord::getCarNo, weighingRecord.getCarNo());

        // è´§åï¼ˆæ¨¡ç³ŠæŸ¥è¯¢ï¼‰
        queryWrapper.like(StringUtils.isNotBlank(weighingRecord.getGoodsName()),
                WeighingRecord::getGoodsName, weighingRecord.getGoodsName());

        // æ”¶è´§å•ä½ï¼ˆæ¨¡ç³ŠæŸ¥è¯¢ï¼‰
        queryWrapper.like(StringUtils.isNotBlank(weighingRecord.getReceiveUnit()),
                WeighingRecord::getReceiveUnit, weighingRecord.getReceiveUnit());

        // å‘货单位（精确查询，可选）
        queryWrapper.eq(StringUtils.isNotBlank(weighingRecord.getShipUnit()),
                WeighingRecord::getShipUnit, weighingRecord.getShipUnit());
        return weighingRecordMapper.selectPage(page, queryWrapper);
    }
}

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

@@ -111,11 +111,11 @@

    <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
        SELECT
            T1.customer_id as id,
            T1.customer_name,
            SUM(contract_amount) AS invoice_total,
            IFNULL( SUM(T2.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
            IFNULL((IFNULL(SUM(contract_amount),0)  - IFNULL(SUM(T2.receipt_payment_amount),0)),0) AS unReceipt_payment_amount
        T1.customer_id AS id,
        T1.customer_name,
        SUM(contract_amount) AS invoice_total,
        IFNULL(SUM(T2.receipt_payment_amount), 0) AS receipt_payment_amount,
        IFNULL(SUM(contract_amount), 0) - IFNULL(SUM(T2.receipt_payment_amount), 0) AS unReceipt_payment_amount
        FROM sales_ledger T1
        LEFT JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
        <where>
@@ -123,7 +123,7 @@
                T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
            </if>
        </where>
        GROUP BY T1.customer_name
        GROUP BY T1.customer_id, T1.customer_name
    </select>

    <select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">