fix： 发货审批通过库存不扣减

gongchunyi

3 天以前 9571956561915d24ebfc0915117e7df24ea3058d

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

@@ -1,18 +1,22 @@
package com.ruoyi.sales.controller;

// import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.approve.mapper.ApproveProcessMapper;
// import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
// import com.ruoyi.approve.vo.ApproveProcessVO;
// import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.utils.OrderUtils;
// import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
// import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
// import com.ruoyi.other.service.impl.TempFileServiceImpl;
@@ -38,7 +42,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
// import java.time.LocalDate;
import java.util.ArrayList;
import java.time.LocalDate;
import java.util.List;

/**
@@ -56,8 +60,8 @@
    // @Autowired
    // private CommonFileServiceImpl commonFileService;

    // @Autowired
    // private ApproveProcessServiceImpl approveProcessService;
     @Autowired
     private IApproveProcessService approveProcessService;

    // @Autowired
    // private StockUtils stockUtils;
@@ -67,6 +71,9 @@

    @Autowired
    private ISalesLedgerService salesLedgerService;

    @Autowired
    private com.ruoyi.sales.mapper.SalesLedgerProductMapper salesLedgerProductMapper;


    @GetMapping("/listPage")
@@ -81,65 +88,56 @@
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "发货信息管理", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
        // LoginUser loginUser = SecurityUtils.getLoginUser();
        String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH");
        LoginUser loginUser = SecurityUtils.getLoginUser();
        
        if (req.getSalesLedgerId() == null) {
            return AjaxResult.error("关联订单 ID 不能为空");
        }

        /* // 原有的单产品发货及审批逻辑
        // 发货审批
        SalesLedger salesLedger = salesLedgerService.getById(req.getSalesLedgerId());
        if (salesLedger == null) {
            return AjaxResult.error("关联订单不存在");
        }

        // 检查是否已经在审批中或已发货
        if (salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() >= 2 && !salesLedger.getDeliveryStatus().equals(3)) {
             return AjaxResult.error("该订单已在审批中或已发货，无法重复发起");
        }

        String shNo = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH");

        //  发起订审批
        ApproveProcessVO approveProcessVO = new ApproveProcessVO();
        approveProcessVO.setApproveType(7);
        approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
        approveProcessVO.setApproveReason(req.getType() + ":" +sh);
        // 审批理由包含合同号，用于后续审批通过后找回订单
        approveProcessVO.setApproveReason("发货审批:" + salesLedger.getSalesContractNo());
        approveProcessVO.setApproveUserIds(req.getApproveUserIds());
        approveProcessVO.setApproveUser(loginUser.getUserId());
        approveProcessVO.setApproveTime(LocalDate.now().toString());
        approveProcessService.addApprove(approveProcessVO);
        // 添加发货消息
        req.setShippingNo(sh);
        req.setStatus("待审核");
        boolean save = shippingInfoService.save(req);
        return save ? AjaxResult.success() : AjaxResult.error();
        */

        //  按整个订单发货，不需审批
        if (req.getSalesLedgerId() == null) {
            return AjaxResult.error("请选择发货订单");
        //  更新销售台账状态为 2 (审批中)
        salesLedger.setDeliveryStatus(2);
        salesLedgerService.updateById(salesLedger);

        //  为订单下的每一个产品生成发货台账记录 (显示单个产品)
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId()));
        
        if (CollectionUtils.isNotEmpty(products)) {
            for (SalesLedgerProduct product : products) {
                ShippingInfo si = new ShippingInfo();
                si.setSalesLedgerId(salesLedger.getId());
                si.setSalesLedgerProductId(product.getId());
                si.setShippingNo(shNo);
                si.setStatus("待审核");
                si.setType(req.getType()); // 来源/类型
                shippingInfoService.save(si);
            }
        }

        // 获取该订单下的所有产品
        SalesLedgerProduct query = new SalesLedgerProduct();
        query.setSalesLedgerId(req.getSalesLedgerId());
        List<SalesLedgerProduct> productList = salesLedgerProductService.selectSalesLedgerProductList(query);

        if (CollectionUtils.isEmpty(productList)) {
            return AjaxResult.error("该订单下无待发货产品");
        }

        // 为每个产品创建发货信息
        List<ShippingInfo> shippingInfoList = new ArrayList<>();
        for (SalesLedgerProduct product : productList) {
            ShippingInfo shippingInfo = new ShippingInfo();
            shippingInfo.setSalesLedgerId(req.getSalesLedgerId());
            shippingInfo.setSalesLedgerProductId(product.getId());
            shippingInfo.setShippingNo(sh);
            shippingInfo.setStatus("审核通过"); // 直接设为审核通过，跳过审批
            shippingInfo.setType(req.getType());
            shippingInfo.setExpressCompany(req.getExpressCompany());
            shippingInfo.setExpressNumber(req.getExpressNumber());
            shippingInfo.setShippingDate(req.getShippingDate());
            shippingInfo.setShippingCarNumber(req.getShippingCarNumber());
            shippingInfoList.add(shippingInfo);
        }

        boolean save = shippingInfoService.saveBatch(shippingInfoList);
        if (save) {
            // 更新销售台账的发货状态为已发货
            SalesLedger salesLedger = new SalesLedger();
            salesLedger.setId(req.getSalesLedgerId());
            salesLedger.setDeliveryStatus(1);
            salesLedgerService.updateById(salesLedger);
        }
        return save ? AjaxResult.success() : AjaxResult.error();
        return AjaxResult.success("发货审批已发起");
    }

    @ApiOperation("发货扣库存")