feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 ...

liding

2 天以前 7b6741f6ccf11d0043ad94914d41a9bd23452d00

feat(sales): 添加销售台账审核反审功能
1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审
核和查看反审核的历史数据。
2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修
改。
3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订
单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销
售订单数据进行编辑。

 src/main/java/com/ruoyi/common/enums/StockInQualifiedRecordTypeEnum.java

@@ -13,7 +13,8 @@
    SALE_STOCK_IN("15", "销售订单-合格入库"),
    SALE_SCAN_STOCK_IN("17", "销售订单扫码-合格入库"),
    PURCHASE_SCAN_STOCK_IN("18", "采购订单扫码-合格入库"),
    PURCHASE_SCAN_QUALITY_STOCK_IN("19", "扫码入库质检-合格入库");
    PURCHASE_SCAN_QUALITY_STOCK_IN("19", "扫码入库质检-合格入库"),
    SALE_COUNTER_REVIEW_STOCK_IN("21", "销售-反审入库");


    private final String code;

 src/main/java/com/ruoyi/common/enums/StockOutQualifiedRecordTypeEnum.java

@@ -11,7 +11,8 @@
    PURCHASE_RETURN_STOCK_OUT("9", "采购退货"),
    SALE_SHIP_STOCK_OUT("13", "销售-发货出库"),
    SALE_SCAN_STOCK_OUT("17", "销售订单扫码-合格出库"),
    PURCHASE_SCAN_STOCK_OUT("16", "采购订单扫码-合格出库");
    PURCHASE_SCAN_STOCK_OUT("16", "采购订单扫码-合格出库"),
    SALE_COUNTER_REVIEW_STOCK_OUT("20", "销售-反审出库");

    private final String code;
    private final String value;

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

@@ -9,6 +9,7 @@

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

@@ -72,4 +73,18 @@

    @ApiModelProperty(value = "产品高")
    private BigDecimal height;
    /**
     * 审核状态：0-未审核，1-已审核，2-反审
     */
    @ApiModelProperty("审核状态（单值查询）")
    private Integer reviewStatus;

    @ApiModelProperty("审核状态列表（多选查询：0-未审核，1-已审核，2-反审）")
    private List<Integer> reviewStatusList;

    @ApiModelProperty("反审时间")
    private LocalDateTime counterReviewTime;

    @ApiModelProperty("反审人")
    private String counterReviewPerson;
}

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

@@ -1,15 +1,16 @@
package com.ruoyi.sales.pojo;

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

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

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

/**
@@ -178,5 +179,19 @@
    @TableField(exist = false)
    @ApiModelProperty("命中的销售产品列表")
    private List<SalesLedgerProduct> matchedProducts;
}

    /**
     * 审核状态：0-未审核，1-已审核，2-反审
     */
    @ApiModelProperty("审核状态")
    private Integer reviewStatus;

    @ApiModelProperty("反审时间")
    private LocalDateTime counterReviewTime;

    @ApiModelProperty("反审人")
    private String counterReviewPerson;

    @ApiModelProperty("反审人Id")
    private Long counterReviewPersonId;
}

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

@@ -5,18 +5,16 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.common.enums.ApproveTypeEnum;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
@@ -25,32 +23,22 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.ICustomerRegionsService;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.SaleEnum;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutUnQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.*;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.EnumUtil;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProductionProductMainService;

import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
import com.ruoyi.quality.mapper.QualityInspectMapper;
@@ -70,6 +58,7 @@
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.mapper.StockInRecordMapper;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.mapper.StockOutRecordMapper;
import com.ruoyi.stock.pojo.StockInRecord;
import com.ruoyi.stock.pojo.StockOutRecord;
@@ -100,8 +89,8 @@
import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.YearMonth;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -165,6 +154,7 @@
    private final StockInventoryService stockInventoryService;
    private final StockInRecordMapper stockInRecordMapper;
    private final StockOutRecordMapper stockOutRecordMapper;
    private final StockInventoryMapper stockInventoryMapper;
    private final StockInRecordService stockInRecordService;
    private final StockOutRecordService stockOutRecordService;
    private final StockUtils stockUtils;
@@ -400,6 +390,7 @@

    @Override
    public IPage<SalesLedger> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto) {
        // 添加 reviewStatus 的筛选条件
        IPage<SalesLedger> iPage = salesLedgerMapper.selectSalesLedgerListPage(page, salesLedgerDto);

        if (CollectionUtils.isEmpty(iPage.getRecords())) {
@@ -484,6 +475,14 @@
            salesLedger.setIsFh(isFh);

            salesLedger.setIsEdit(!isFh);
            
            // 根据 reviewStatus 控制反审相关字段的显示
            if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() != 2) {
                // 当 reviewStatus 不为 2 时，隐藏反审时间、反审人和反审人ID
                salesLedger.setCounterReviewTime(null);
                salesLedger.setCounterReviewPerson(null);
                salesLedger.setCounterReviewPersonId(null);
            }
        }

        if (salesLedgerDto.getStatus() != null && salesLedgerDto.getStatus()) {
@@ -902,6 +901,13 @@
            } else {
                if (salesLedger.getDeliveryStatus() == 5) {
                    throw new ServiceException("订单已发货,禁止编辑");
                }
                if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() == 1) {
                    salesLedger.setReviewStatus(salesLedgerDto.getReviewStatus());
                } else if (salesLedger.getReviewStatus() != null && salesLedger.getReviewStatus() == 2) {
                    handleCounterReview(salesLedger);
                } else {
                    salesLedger.setReviewStatus(0);
                }
                salesLedgerMapper.updateById(salesLedger);
            }
@@ -3318,4 +3324,139 @@
        }
        baseMapper.updateById(salesLedger);
    }

    
    /**
     * 处理销售台账反审逻辑
     * 1. 设置反审相关信息（时间、人员）
     * 2. 复制原销售台账及产品数据，生成新的台账
     * 3. 对原台账的库存数据进行反向操作
     */
    private void handleCounterReview(SalesLedger salesLedger) {
        // 1. 设置反审相关信息
        LoginUser loginUser = SecurityUtils.getLoginUser();
        salesLedger.setCounterReviewTime(LocalDateTime.now());
        salesLedger.setCounterReviewPerson(loginUser.getUser().getNickName());
        salesLedger.setCounterReviewPersonId(loginUser.getUserId());
        salesLedger.setReviewStatus(2);
        
        Long originalSalesLedgerId = salesLedger.getId();
        
        // 2. 查询原销售台账数据
        SalesLedger originalLedger = salesLedgerMapper.selectById(originalSalesLedgerId);
        if (originalLedger == null) {
            throw new ServiceException("原订单不存在，无法反审");
        }
        
        // 3. 创建新的销售台账，复制原台账数据
        SalesLedger newLedger = new SalesLedger();
        BeanUtils.copyProperties(originalLedger, newLedger);
        newLedger.setId(null); // 清空ID，准备插入新记录
        newLedger.setSalesContractNo(generateSalesContractNo()); // 生成新合同号
        newLedger.setDeliveryStatus(1); // 设置为未发货状态
        newLedger.setStockStatus(0); // 设置为未入库状态
        newLedger.setReviewStatus(0); // 设置为未审核状态
        newLedger.setCounterReviewTime(null); // 清空反审时间
        newLedger.setCounterReviewPerson(null); // 清空反审人
        newLedger.setCounterReviewPersonId(null); // 清空反审人ID
        
        // 4. 插入新的销售台账
        salesLedgerMapper.insert(newLedger);
        
        // 5. 查询并复制原台账的所有产品数据
        List<SalesLedgerProduct> originalProducts = salesLedgerProductMapper.selectList(
            Wrappers.<SalesLedgerProduct>lambdaQuery()
                .eq(SalesLedgerProduct::getSalesLedgerId, originalSalesLedgerId)
        );
        
        for (SalesLedgerProduct originalProduct : originalProducts) {
            // 5.1 创建新产品记录，复制原产品数据
            SalesLedgerProduct newProduct = new SalesLedgerProduct();
            BeanUtils.copyProperties(originalProduct, newProduct);
            newProduct.setId(null); // 清空ID，准备插入新记录
            newProduct.setSalesLedgerId(newLedger.getId()); // 关联到新的台账ID
            newProduct.setStockedQuantity(BigDecimal.ZERO); // 已入库数量重置为0
            newProduct.setShippedQuantity(BigDecimal.ZERO); // 已出库数量重置为0
            newProduct.setUnqualifiedStockedQuantity(BigDecimal.ZERO); // 不合格入库数量重置为0
            newProduct.setUnqualifiedShippedQuantity(BigDecimal.ZERO); // 不合格出库数量重置为0
            newProduct.setReturnQuality(BigDecimal.ZERO); // 退货数量重置为0
            newProduct.setAvailableQuality(newProduct.getQuantity().subtract(newProduct.getReturnQuality())); // 重新计算可用数量
            newProduct.setProductStockStatus(0); // 产品库存状态重置为0
            newProduct.fillRemainingQuantity(); // 重新计算剩余数量
            
            // 5.2 插入新产品记录
            salesLedgerProductMapper.insert(newProduct);
        }
        
        // 6. 处理原订单的库存数据（生成反审出入库记录）
        processOriginalOrderStock(originalSalesLedgerId);
    }

    /**
     * 处理原订单的库存数据
     * 1. 对原订单的入库数据生成反审出库记录（销售-反审出库）
     * 2. 对原订单的出库数据生成反审入库记录（销售-反审入库）
     * 3. 更新库存表数据
     */
    private void processOriginalOrderStock(Long originalSalesLedgerId) {
        // 1. 查询原订单的所有入库记录
        List<StockInRecord> stockInRecords = stockInRecordMapper.selectList(
            Wrappers.<StockInRecord>lambdaQuery()
                .eq(StockInRecord::getSalesLedgerId, originalSalesLedgerId)
        );
        
        // 2. 对每条入库记录生成对应的反审出库记录
        for (StockInRecord stockInRecord : stockInRecords) {
            // 2.1 创建反审出库记录
            StockOutRecord stockOutRecord = new StockOutRecord();
            stockOutRecord.setOutboundBatches(OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK")); // 生成出库批次号
            stockOutRecord.setStockOutNum(stockInRecord.getStockInNum()); // 出库数量等于原入库数量
            stockOutRecord.setRecordId(stockInRecord.getId()); // 记录原入库记录ID
            stockOutRecord.setRecordType(StockOutQualifiedRecordTypeEnum.SALE_COUNTER_REVIEW_STOCK_OUT.getCode()); // 设置为销售反审出库类型
            stockOutRecord.setProductModelId(stockInRecord.getProductModelId()); // 产品规格ID
            stockOutRecord.setRemark("销售-反审出库"); // 备注
            stockOutRecord.setType(stockInRecord.getType()); // 类型（合格/不合格）
            stockOutRecord.setSalesLedgerId(stockInRecord.getSalesLedgerId()); // 销售订单ID
            stockOutRecord.setSalesLedgerProductId(stockInRecord.getSalesLedgerProductId()); // 销售订单产品ID
            
            // 2.2 插入反审出库记录
            stockOutRecordMapper.insert(stockOutRecord);
            
            // 2.3 从库存表中扣减相应数量
            StockInventoryDto stockInventoryDto = new StockInventoryDto();
            stockInventoryDto.setProductModelId(stockOutRecord.getProductModelId());
            stockInventoryDto.setQualitity(stockOutRecord.getStockOutNum());
            stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
        }
        
        // 3. 查询原订单的所有出库记录
        List<StockOutRecord> stockOutRecords = stockOutRecordMapper.selectList(
            Wrappers.<StockOutRecord>lambdaQuery()
                .eq(StockOutRecord::getSalesLedgerId, originalSalesLedgerId)
        );
        
        // 4. 对每条出库记录生成对应的反审入库记录
        for (StockOutRecord stockOutRecord : stockOutRecords) {
            // 4.1 创建反审入库记录
            StockInRecord stockInRecord = new StockInRecord();
            stockInRecord.setInboundBatches(OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK")); // 生成入库批次号
            stockInRecord.setStockInNum(stockOutRecord.getStockOutNum()); // 入库数量等于原出库数量
            stockInRecord.setRecordId(stockOutRecord.getId()); // 记录原出库记录ID
            stockInRecord.setRecordType(StockInQualifiedRecordTypeEnum.SALE_COUNTER_REVIEW_STOCK_IN.getCode()); // 设置为销售反审入库类型
            stockInRecord.setProductModelId(stockOutRecord.getProductModelId()); // 产品规格ID
            stockInRecord.setRemark("销售-反审入库"); // 备注
            stockInRecord.setType(stockOutRecord.getType()); // 类型（合格/不合格）
            stockInRecord.setSalesLedgerId(stockOutRecord.getSalesLedgerId()); // 销售订单ID
            stockInRecord.setSalesLedgerProductId(stockOutRecord.getSalesLedgerProductId()); // 销售订单产品ID
            
            // 4.2 插入反审入库记录
            stockInRecordMapper.insert(stockInRecord);
            
            // 4.3 向库存表中增加相应数量
            StockInventoryDto stockInventoryDto = new StockInventoryDto();
            stockInventoryDto.setProductModelId(stockInRecord.getProductModelId());
            stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
            stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
        }
    }
}

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

@@ -66,7 +66,11 @@
        T1.delivery_date,
        T1.stock_status,
        DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
        T1.delivery_status AS deliveryStatus
        T1.delivery_status AS deliveryStatus,
        T1.review_status AS reviewStatus,
        T1.counter_review_time AS counterReviewTime,
        T1.counter_review_person AS counterReviewPerson,
        T1.counter_review_person_id AS counterReviewPersonId
        FROM sales_ledger T1
        LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
        <where>
@@ -95,6 +99,18 @@
            <if test="salesLedgerDto.stockStatus != null">
                AND T1.stock_status = #{salesLedgerDto.stockStatus}
            </if>
            <if test="salesLedgerDto.reviewStatus != null">
                AND T1.review_status = #{salesLedgerDto.reviewStatus}
            </if>
            <if test="salesLedgerDto.reviewStatusList != null and salesLedgerDto.reviewStatusList.size() > 0">
                AND (
                    T1.review_status IN
                    <foreach collection="salesLedgerDto.reviewStatusList" item="status" open="(" separator="," close=")">
                        #{status}
                    </foreach>
                    OR T1.review_status IS NULL
                )
            </if>
            <if test="salesLedgerDto.width != null or salesLedgerDto.height != null">
                AND EXISTS (
                SELECT 1