1. 调拔单功能优化 2. 7.30问题及bug修复

skyouc

3 天以前 becc33ce9681fcc75d26eb2b8fbe650d53cb1f89

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java

@@ -1,17 +1,13 @@
package com.vincent.rsf.server.manager.schedules;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderLogService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.enums.POExceStatus;
import com.vincent.rsf.server.manager.service.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -20,6 +16,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

@@ -34,24 +31,26 @@
public class AsnOrderLogSchedule {

    @Autowired
    private PurchaseService purchaseService;
    @Autowired
    private DeliveryService deliveryService;
    @Autowired
    private AsnOrderService asnOrderService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;

    @Autowired
    private AsnOrderLogService asnOrderLogService;

    @Autowired
    private AsnOrderItemLogService asnOrderItemLogService;

    /**
     * @author Ryan
     * @description 删除已完成订单加入Log表
     * @param
     * @return
     * @author Ryan
     * @description 删除已完成订单加入Log表
     * @time 2025/3/19 19:09
     */
    @Scheduled(cron = "0 0/05 * * * ?  ")
    @Scheduled(cron = "0/35 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void moveOrderToLog() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
@@ -60,18 +59,22 @@
        if (wkOrders.isEmpty()) {
            return;
        }
        try {
        moveOrderToLog(wkOrders, OrderType.ORDER_IN.type);
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
    }


    /**
    * @author Ryan
    * @description 出库单完成后，状态修改
    * @param
    * @return
     * @author Ryan
     * @description 出库单完成后，状态修改
    * @time 2025/6/16 08:35
    */
//    @Scheduled(cron = "0/30 * * * * ?  ")
    @Scheduled(cron = "0/30 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void outStockComplete() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
@@ -82,21 +85,12 @@
        if (wkOrders.isEmpty()) {
            return;
        }
        try {
        moveOrderToLog(wkOrders, OrderType.ORDER_OUT.type);
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
    }

//    /**
//     * @author Ryan
//     * @date 2025/7/30
//     * @description: 更新调拔单状态
//     * @version 1.0
//     */
//    @Scheduled(cron = "0/30 * * * * ?  ")
//    @Transactional(rollbackFor = Exception.class)
//    public void updateTransferExc() {
//
//    }

    }


    /**
@@ -107,7 +101,8 @@
     * @description 添加历史单据
     * @time 2025/6/16 08:56
     */
    private void moveOrderToLog(List<WkOrder> wkOrders, String type) {
    @Transactional(rollbackFor = Exception.class)
    public void moveOrderToLog(List<WkOrder> wkOrders, String type) throws Exception{
        Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                .in(WkOrderItem::getOrderId, longSet));
@@ -145,15 +140,34 @@
            if (!asnOrderItemLogService.saveBatch(logs)) {
                throw new CoolException("单据明细历史档保存失败！！");
            }

            //更新PO/DO单执行状态
            if (type.equals(OrderType.ORDER_IN.type)) {
                if (!Objects.isNull(order.getPoId())) {
                    if (!purchaseService.update(new LambdaUpdateWrapper<Purchase>()
                            .set(Purchase::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val)
                            .eq(Purchase::getId, order.getPoId()))) {
                        throw new CoolException("PO单更新状态更新失败！！");
                    }
                }
            } else {
                if (!Objects.isNull(order.getPoId())) {
                    if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
                            .eq(Delivery::getId, order.getPoId())
                            .set(Delivery::getExceStatus, POExceStatus.PO_EXCE_STATUS_ALL_DONE.val))) {
                        throw new CoolException("DO单更新状态更新失败");
                    }
                }
            }
        }

        if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                .in(WkOrderItem::getOrderId, longSet))) {
            throw new CoolException("原单据明细删除失败！！");
        }
        if (!this.asnOrderService.removeByIds(longSet)) {
            throw new CoolException("原单据删除失败！！");
        }
//        if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
//                .in(WkOrderItem::getOrderId, longSet))) {
//            throw new CoolException("原单据明细删除失败！！");
//        }
//        if (!this.asnOrderService.removeByIds(longSet)) {
//            throw new CoolException("原单据删除失败！！");
//        }
    }