feat: 调整

buhuazhen

2 天以前 99c61e2e4c5aabe594ff8a463a45f3a6b5cb9add

feat: 调整

 src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java

@@ -170,6 +170,13 @@
    private BigDecimal maintenancePrice;
    private static final long serialVersionUID = 1L;

    /**
     * 销售单号 (发货审批时从销售台账关联查询)
     */
    @TableField(exist = false)
    @ApiModelProperty(value = "销售单号")
    private String salesContractNo;


    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)

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

@@ -4,17 +4,27 @@
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.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShipmentApprovalMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShipmentApproval;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShippingInfoService;
import lombok.extern.slf4j.Slf4j;
@@ -24,8 +34,11 @@
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;

/**
@@ -50,6 +63,21 @@

    @Autowired
    private ApproveProcessServiceImpl approveProcessService;

    @Autowired
    private ApproveProcessMapper approveProcessMapper;

    @Autowired
    private ShipmentApprovalMapper shipmentApprovalMapper;

    @Autowired
    private SalesLedgerMapper salesLedgerMapper;

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private SysDeptMapper sysDeptMapper;

    @Override
    public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
@@ -124,16 +152,28 @@

    /**
     * 一键发货 - 自动审批通过并出库
     * 不创建审批流程，直接扣减库存
     * 创建审批记录，批准人为"月光"
     */
    @Override
    @Transactional
    public boolean oneClickShipping(ShippingInfoDto req) throws IOException {
        LoginUser loginUser = SecurityUtils.getLoginUser();

        // 获取销售台账产品信息
        SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(req.getSalesLedgerProductId());
        if (salesLedgerProduct == null) {
            throw new RuntimeException("销售产品不存在");
        }

        // 获取销售台账信息
        SalesLedger salesLedger = salesLedgerMapper.selectById(req.getSalesLedgerId());

        // 查询"月光"用户
        com.ruoyi.project.system.domain.SysUser moonlightUser = sysUserMapper.selectOne(
            new LambdaQueryWrapper<com.ruoyi.project.system.domain.SysUser>()
                .eq(com.ruoyi.project.system.domain.SysUser::getNickName, "月光")
                .last("limit 1")
        );

        // 生成发货单号
        String shippingNo = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no");
@@ -152,6 +192,44 @@
        boolean save = this.save(shippingInfo);

        if (save) {
            // 创建审批流程记录，状态为审核完成(2)，批准人为"月光"
            String salesContractNo = salesLedger != null ? salesLedger.getSalesContractNo() : "";
            StringBuilder approveReason = new StringBuilder();
            approveReason.append("发货单号:").append(shippingNo);
            if (salesContractNo != null && !salesContractNo.isEmpty()) {
                approveReason.append("\n销售单号:").append(salesContractNo);
            }
            approveReason.append("\n").append(req.getType());
            if ("货车".equals(req.getType()) && req.getShippingCarNumber() != null && !req.getShippingCarNumber().isEmpty()) {
                approveReason.append(":").append(req.getShippingCarNumber());
            } else if ("快递".equals(req.getType()) && req.getExpressCompany() != null && !req.getExpressCompany().isEmpty()) {
                approveReason.append(":").append(req.getExpressCompany());
            }

            ApproveProcess approveProcess = new ApproveProcess();
            String approveId = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(approveProcessMapper, "", "approve_id");
            approveProcess.setApproveId(approveId);
            approveProcess.setApproveUser(loginUser.getUserId());
            approveProcess.setApproveUserName(loginUser.getNickName());
            approveProcess.setApproveDeptId(loginUser.getCurrentDeptId());

            SysDept sysDept = sysDeptMapper.selectDeptById(loginUser.getCurrentDeptId());

            approveProcess.setApproveDeptName(sysDept.getDeptName());
            approveProcess.setApproveReason(approveReason.toString());
            approveProcess.setApproveUserIds(moonlightUser != null ? String.valueOf(moonlightUser.getUserId()) : "");
            approveProcess.setApproveUserNames(moonlightUser != null ? moonlightUser.getNickName() : "月光");
            approveProcess.setApproveUserCurrentId(moonlightUser != null ? moonlightUser.getUserId() : null);
            approveProcess.setApproveUserCurrentName(moonlightUser != null ? moonlightUser.getNickName() : "月光");
            approveProcess.setApproveStatus(2); // 审核完成
            approveProcess.setApproveType(7); // 发货审批
            approveProcess.setApproveDelete(0);
            approveProcess.setApproveTime(new Date()); // 申请时间
            approveProcess.setTenantId(loginUser.getCurrentDeptId());
            approveProcess.setCreateTime(LocalDateTime.now());
            approveProcess.setEndDate(new Date());
            approveProcessService.save(approveProcess);

            // 直接扣减库存
            stockUtils.substractStock(
                salesLedgerProduct.getProductModelId(),
@@ -171,10 +249,24 @@

    /**
     * 批量一键发货 - 将销售台账下所有未发货的产品全部发货
     * 创建审批记录，批准人为"月光"
     */
    @Override
    @Transactional
    public boolean batchOneClickShipping(Long salesLedgerId, ShippingInfoDto req) throws IOException {
        LoginUser loginUser = SecurityUtils.getLoginUser();

        // 查询"月光"用户
        com.ruoyi.project.system.domain.SysUser moonlightUser = sysUserMapper.selectOne(
            new LambdaQueryWrapper<com.ruoyi.project.system.domain.SysUser>()
                .eq(com.ruoyi.project.system.domain.SysUser::getNickName, "月光")
                .last("limit 1")
        );

        // 获取销售台账信息
        SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerId);
        String salesContractNo = salesLedger != null ? salesLedger.getSalesContractNo() : "";

        // 查询该销售台账下所有产品
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
            new LambdaQueryWrapper<SalesLedgerProduct>()
@@ -204,7 +296,8 @@
            throw new RuntimeException("该销售台账下所有产品已发货");
        }

        // 为每个未发货的产品创建发货记录
        // 收集所有发货单号用于合并审批
        StringBuilder allShippingNos = new StringBuilder();
        for (SalesLedgerProduct product : unshippedProducts) {
            // 生成发货单号
            String shippingNo = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no");
@@ -223,6 +316,12 @@

            boolean save = this.save(shippingInfo);
            if (save) {
                // 收集发货单号
                if (allShippingNos.length() > 0) {
                    allShippingNos.append("\n");
                }
                allShippingNos.append("发货单号:").append(shippingNo);

                // 扣减库存
                stockUtils.substractStock(
                    product.getProductModelId(),
@@ -233,6 +332,43 @@
            }
        }

        // 创建合并的审批流程记录
        if (allShippingNos.length() > 0) {
            StringBuilder approveReason = new StringBuilder();
            approveReason.append(allShippingNos.toString());
            if (salesContractNo != null && !salesContractNo.isEmpty()) {
                approveReason.append("\n销售单号:").append(salesContractNo);
            }
            approveReason.append("\n").append(req.getType());
            if ("货车".equals(req.getType()) && req.getShippingCarNumber() != null && !req.getShippingCarNumber().isEmpty()) {
                approveReason.append(":").append(req.getShippingCarNumber());
            } else if ("快递".equals(req.getType()) && req.getExpressCompany() != null && !req.getExpressCompany().isEmpty()) {
                approveReason.append(":").append(req.getExpressCompany());
            }

            ApproveProcess approveProcess = new ApproveProcess();
            String approveId = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(approveProcessMapper, "", "approve_id");
            approveProcess.setApproveId(approveId);
            approveProcess.setApproveUser(loginUser.getUserId());
            approveProcess.setApproveUserName(loginUser.getNickName());
            approveProcess.setApproveDeptId(loginUser.getCurrentDeptId());
            SysDept sysDept = sysDeptMapper.selectDeptById(loginUser.getCurrentDeptId());
            approveProcess.setApproveDeptName(sysDept.getDeptName());
            approveProcess.setApproveReason(approveReason.toString());
            approveProcess.setApproveUserIds(moonlightUser != null ? String.valueOf(moonlightUser.getUserId()) : "");
            approveProcess.setApproveUserNames(moonlightUser != null ? moonlightUser.getNickName() : "月光");
            approveProcess.setApproveUserCurrentId(moonlightUser != null ? moonlightUser.getUserId() : null);
            approveProcess.setApproveUserCurrentName(moonlightUser != null ? moonlightUser.getNickName() : "月光");
            approveProcess.setApproveStatus(2); // 审核完成
            approveProcess.setApproveType(7); // 发货审批
            approveProcess.setApproveDelete(0);
            approveProcess.setApproveTime(new Date()); // 申请时间
            approveProcess.setTenantId(loginUser.getCurrentDeptId());
            approveProcess.setCreateTime(LocalDateTime.now());
            approveProcess.setEndDate(new Date());
            approveProcessService.save(approveProcess);
        }

        return true;
    }
}

 src/main/resources/mapper/approve/ApproveProcessMapper.xml

@@ -28,15 +28,33 @@
        approve_delete,tenant_id,approve_type,approve_remark
    </sql>
    <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
        select * from approve_process where approve_delete = 0
        <if test="req.approveType != null and req.approveType == 7">
            select ap.*,
            SUBSTRING_INDEX(SUBSTRING_INDEX(ap.approve_reason, '销售单号:', -1), '\n', 1) as salesContractNo
            from approve_process ap
            where ap.approve_delete = 0
        <if test="req.approveId != null and req.approveId != ''">
            and approve_id like concat('%',#{req.approveId},'%')
                and ap.approve_id like concat('%',#{req.approveId},'%')
        </if>
        <if test="req.approveStatus != null or req.approveStatus == 0">
            and approve_status = #{req.approveStatus}
                and ap.approve_status = #{req.approveStatus}
            </if>
            and ap.approve_type = #{req.approveType}
            <if test="req.salesContractNo != null and req.salesContractNo != ''">
                and ap.approve_reason like concat('%销售单号:',#{req.salesContractNo},'%')
            </if>
        </if>
        <if test="req.approveType == null or req.approveType != 7">
            select * from approve_process ap where ap.approve_delete = 0
            <if test="req.approveId != null and req.approveId != ''">
                and ap.approve_id like concat('%',#{req.approveId},'%')
            </if>
            <if test="req.approveStatus != null or req.approveStatus == 0">
                and ap.approve_status = #{req.approveStatus}
        </if>
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
                and ap.approve_type = #{req.approveType}
            </if>
        </if>
    </select>
</mapper>

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

@@ -3,14 +3,22 @@
<mapper namespace="com.ruoyi.sales.mapper.ShipmentApprovalMapper">

    <select id="listPage" resultType="com.ruoyi.sales.pojo.ShipmentApproval">
        SELECT *,
        SELECT sa.*,
        si.shipping_car_number,
        sl.sales_contract_no,
        sl.customer_name,
        slp.product_category,
        slp.specification_model,
        slp.quantity,
        slp.unit,
        sd.dept_name as approveDeptName,
        T2.nick_name AS entry_person_name
        FROM shipment_approval sa
                 LEFT JOIN shipping_info si ON sa.shipping_info_id = si.id
                 LEFT JOIN sales_ledger sl ON sa.sales_ledger_id = sl.id
                 LEFT JOIN sales_ledger_product slp ON sa.sales_ledger_product_id = slp.id and slp.type = 1
                 LEFT JOIN sys_user T2 ON sl.entry_person = T2.user_id
                 LEFT JOIN sys_dept sd ON sa.approve_dept_id = sd.dept_id
        <where>
            1=1
            <if test="req.approveStatus != null and req.approveStatus != '' ">
@@ -20,5 +28,6 @@
                AND  sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
            </if>
        </where>
        ORDER BY sa.id DESC
    </select>
</mapper>

 src/main/resources/mapper/stock/StockOutRecordMapper.xml

@@ -28,7 +28,7 @@
            WHEN '3' THEN ppm.product_no
            WHEN '8' THEN sl.sales_contract_no
            WHEN '9' THEN pr.no
            WHEN '13' THEN si.shipping_no
            WHEN '13' THEN CONCAT(si.shipping_no, IF(sl2.sales_contract_no IS NOT NULL AND sl2.sales_contract_no != '', CONCAT(' / ', sl2.sales_contract_no), ''))
            WHEN '1' THEN sor.remark
            WHEN '10' THEN sor.remark
            ELSE NULL
@@ -41,6 +41,7 @@
        LEFT JOIN sales_ledger as sl on sor.record_type = '8' and sor.record_id = sl.id
        LEFT JOIN purchase_return_orders as pr on sor.record_type = '9' and sor.record_id = pr.id
        LEFT JOIN shipping_info as si on sor.record_type = '13' and sor.record_id = si.id
        LEFT JOIN sales_ledger as sl2 on sor.record_type = '13' and si.sales_ledger_id = sl2.id
        <where>
            <if test="params.timeStr != null and params.timeStr != ''">
                and sor.create_time like concat('%',#{params.timeStr},'%')
@@ -68,7 +69,7 @@
            WHEN '3' THEN ppm.product_no
            WHEN '8' THEN sl.sales_contract_no
            WHEN '9' THEN pr.no
            WHEN '13' THEN si.shipping_no
            WHEN '13' THEN CONCAT(si.shipping_no, IF(sl2.sales_contract_no IS NOT NULL AND sl2.sales_contract_no != '', CONCAT(' / ', sl2.sales_contract_no), ''))
            WHEN '1' THEN sor.remark
            WHEN '10' THEN sor.remark
            ELSE NULL
@@ -81,6 +82,7 @@
        LEFT JOIN sales_ledger as sl on sor.record_type = '8' and sor.record_id = sl.id
        LEFT JOIN purchase_return_orders as pr on sor.record_type = '9' and sor.record_id = pr.id
        LEFT JOIN shipping_info as si on sor.record_type = '13' and sor.record_id = si.id
        LEFT JOIN sales_ledger as sl2 on sor.record_type = '13' and si.sales_ledger_id = sl2.id
        <where>
            <if test="params.timeStr != null and params.timeStr != ''">
                and sor.create_time like concat('%',#{params.timeStr},'%')