chenhj
2026-04-08 79e6debd3079af53321225835aee191334c14c03
feat(sales): 添加销售台账产品管理功能

- 新增 SalesLedgerProduct 实体类,包含产品信息、库存预警、发票类型等字段
- 创建 SalesLedgerProductController 控制器,提供分页查询、列表展示、导出等功能
- 添加 ShippingInfo 实体类,用于管理发货信息和物流跟踪
- 实现发货状态管理功能,包括待发货、发货中、已发货状态更新
- 集成库存管理功能,实现库存充足性判断和预警机制
- 开发发货信息分页查询和统计功能
- 添加回款和付款登记功能模块
已修改4个文件
57 ■■■■■ 文件已修改
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/sales/ShippingInfoMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -1,32 +1,25 @@
package com.ruoyi.sales.controller;
import javax.servlet.http.HttpServletResponse;
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.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ShippingInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
@@ -46,6 +39,8 @@
    private ProcurementRecordService procurementRecordService;
    @Autowired
    private StockUtils stockUtils;
    @Autowired
    private ShippingInfoService shippingInfoService;
    /**
@@ -75,6 +70,20 @@
    public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
        List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
        list.forEach(item -> {
            List<ShippingInfo> shippings = shippingInfoService.list(new LambdaQueryWrapper<ShippingInfo>()
                    .eq(ShippingInfo::getSalesLedgerId, salesLedgerProduct.getSalesLedgerId())
                    .eq(ShippingInfo::getSalesLedgerProductId, item.getId()));
            BigDecimal total = shippings.stream().map(ShippingInfo::getShippedQty).reduce(BigDecimal.ZERO, BigDecimal::add);
            item.setShippedQty(total);
            if (total.compareTo(BigDecimal.ZERO) == 0) {
                item.setShippingStatus("待发货");
            }
            if (total.compareTo(item.getQuantity()) == 0) {
                item.setShippingStatus("已发货");
            }
            if (total.compareTo(item.getQuantity()) < 0) {
                item.setShippingStatus("发货中");
            }
            if (item.getFutureTickets().compareTo(BigDecimal.ZERO) == 0) {
                item.setFutureTickets(BigDecimal.ZERO);
            }
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -244,4 +244,8 @@
    @ApiModelProperty(value = "供应商")
    private String customer;
    @ApiModelProperty(value = "已发货数量")
    @TableField(exist = false)
    private BigDecimal shippedQty;
}
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -7,6 +7,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@@ -88,4 +89,7 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
    @ApiModelProperty(value = "已发货数量")
    private BigDecimal shippedQty;
}
src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -18,6 +18,7 @@
        s.create_user,
        s.update_user,
        s.tenant_id,
        s.shipped_qty,
        sl.sales_contract_no,
        slp.specification_model,
        p.product_name,
@@ -53,6 +54,7 @@
            s.create_user,
            s.update_user,
            s.tenant_id,
            s.shipped_qty,
            sl.sales_contract_no,
            sl.customer_name
        FROM shipping_info s