feat(sales): 实现发货模块部分发货与批量发货功能

云

22 小时以前 0beb4e197c13ccce94a943e158993c503700f4da

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

@@ -2,20 +2,18 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.utils.OrderUtils;
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.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.sales.service.ShippingInfoService;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import io.swagger.annotations.Api;
@@ -26,8 +24,9 @@

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * @author :yys
@@ -45,9 +44,10 @@
    private CommonFileServiceImpl commonFileService;

    @Autowired
    private ApproveProcessServiceImpl approveProcessService;
    private ISalesLedgerService salesLedgerService;

    @Autowired
    private StockUtils stockUtils;
    private ISalesLedgerProductService salesLedgerProductService;


    @GetMapping("/listPage")
@@ -62,22 +62,44 @@
    @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");
        // 发货审批
        ApproveProcessVO approveProcessVO = new ApproveProcessVO();
        approveProcessVO.setApproveType(7);
        approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
        approveProcessVO.setApproveReason(req.getType() + ":" +sh);
        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();
        return shippingInfoService.addShipping(req) ? AjaxResult.success() : AjaxResult.error();
    }

    @PostMapping("/batchAdd")
    @ApiOperation("批量发货：同一客户多条订单，逐条创建发货单并发起审批")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "发货信息管理", businessType = BusinessType.INSERT)
    public AjaxResult batchAdd(@RequestBody List<ShippingInfoDto> reqs) throws Exception {
        if (reqs == null || reqs.isEmpty()) {
            return AjaxResult.error("请选择要发货的产品");
        }
        // 校验所有产品行所属销售台账为同一客户
        List<Long> productIds = reqs.stream()
                .map(ShippingInfoDto::getSalesLedgerProductId)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());
        List<SalesLedgerProduct> products = salesLedgerProductService.listByIds(productIds);
        List<Long> ledgerIds = products.stream()
                .map(SalesLedgerProduct::getSalesLedgerId)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());
        List<SalesLedger> ledgers = salesLedgerService.listByIds(ledgerIds);
        long customerCount = ledgers.stream()
                .map(SalesLedger::getCustomerName)
                .filter(cn -> cn != null && !cn.trim().isEmpty())
                .distinct()
                .count();
        if (customerCount > 1) {
            return AjaxResult.error("批量发货仅支持同一客户的多条订单");
        }
        for (ShippingInfoDto req : reqs) {
            if (!shippingInfoService.addShipping(req)) {
                throw new RuntimeException("批量发货失败");
            }
        }
        return AjaxResult.success();
    }

    @ApiOperation("发货扣库存")