调拔单功能优化

skyouc

昨天 474103da0c9793ec9cd7559f109491ece282e269

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java

@@ -1,30 +1,43 @@
package com.vincent.rsf.server.manager.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.manager.controller.params.TransferItemParams;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.CheckExceStatus;
import com.vincent.rsf.server.manager.enums.OrderSourceType;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.TransferMapper;
import com.vincent.rsf.server.manager.entity.Transfer;
import com.vincent.rsf.server.manager.service.TransferService;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

@Service("transferService")
public class TransferServiceImpl extends ServiceImpl<TransferMapper, Transfer> implements TransferService {

    @Autowired
    private TransferItemService transferItemService;
    @Autowired
    private WarehouseAreasService warehouseAreasService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private OutStockItemService outStockItemService;

    /**
     * @author Ryan
@@ -47,9 +60,30 @@
        if (StringUtils.isBlank(ruleCode)) {
            throw new CoolException("编码规则错误：请检查「SYS_TRANSFER_ORDER_CODE」是否设置正确！！");
        }

        WarehouseAreas orgWarehosue = warehouseAreasService.getById(transfer.getOrgAreaId());
        if (Objects.isNull(orgWarehosue)) {
            throw new CoolException("所选原库区不存在！！");
        }

        WarehouseAreas tarWarehouse = warehouseAreasService.getById(transfer.getTarAreaId());
        if (Objects.isNull(tarWarehouse)) {
            throw new CoolException("所选目标库区不存在！！");
        }

        transfer.setCode(ruleCode)
                .setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val)
                .setSource(OrderSourceType.ORDER_SOURCE_TYPE_SYSTEM.val)
                .setOrgAreaId(orgWarehosue.getId())
                .setOrgAreaName(orgWarehosue.getName())
                .setOrgWareId(orgWarehosue.getWarehouseId())
                .setOrgWareName(orgWarehosue.getWarehouseId$())
                .setTarAreaId(tarWarehouse.getId())
                .setTarWareId(tarWarehouse.getWarehouseId())
                .setTarAreaName(tarWarehouse.getName())
                .setTarWareName(tarWarehouse.getWarehouseId$())
                .setUpdateTime(new Date())
                .setCreateTime(new Date())
                .setUpdateBy(loginUserId)
                .setCreateBy(loginUserId);
        if (!this.save(transfer)) {
@@ -68,25 +102,29 @@
    }


    /**
     * @author Ryan
     * @date 2025/7/28
     * @description: 调拔单据修改
     * @version 1.0
     */
    private void svaeOrUpdateOrderItem(TransferItemParams params, Long loginUserId) {
//        Transfer orders = params.getTransfer();
//        params.getItems().forEach(item -> {
//            item.put("orderId", orders.getId());
//            item.put("orderCode", orders.getCode());
//            item.put("poCode", orders.getPoCode());
//            item.put("createBy", loginUserId);
//            item.put("updateBy", loginUserId);
//            if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
//                throw new CoolException("明细保存失败！！");
//            }
//        });
//        List<WkOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
//                .eq(WkOrderItem::getOrderId, params.getOrders().getId()));
//        Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
//        orders.setAnfme(sum);
//        if (!this.updateById(orders)) {
//            throw new CoolException("计划收货数量修改失败！！");
//        }
        Transfer orders = params.getTransfer();
        params.getItems().forEach(item -> {
            item.put("transferId", orders.getId());
            item.put("transferCode", orders.getCode());
            item.put("createBy", loginUserId);
            item.put("updateBy", loginUserId);
            if (!transferItemService.fieldsSave(item, loginUserId)) {
                throw new CoolException("明细保存失败！！");
            }
        });
//        List<TransferItem> orderItems = transferItemService.list(new LambdaQueryWrapper<TransferItem>()
//                .eq(TransferItem::getTransferId, params.getTransfer().getId()));
//        Double sum = orderItems.stream().mapToDouble(TransferItem::getAnfme).sum();
        if (!this.updateById(orders)) {
            throw new CoolException("计划收货数量修改失败！！");
        }
    }


@@ -98,6 +136,101 @@
     */
    @Override
    public R updateTransfer(TransferItemParams params, Long loginUserId) {
        return null;
        Transfer orders = params.getTransfer();
        if (Objects.isNull(orders)) {
            throw new CoolException("主单信息不能为空！！");
        }
        if (Objects.isNull(orders.getId())) {
            throw new CoolException("数据错误：单据ID不能为空！！");
        }
        if (!this.updateById(orders)) {
            throw new CoolException("主单修改失败！！");
        }
        if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
            return R.ok("明细参数不能为空！！");
        }

        svaeOrUpdateOrderItem(params, loginUserId);

        return R.ok("修改完成！！");

    }

    /**
     * @author Ryan
     * @date 2025/7/28
     * @description: 获取调拔单关联订单
     * @version 1.0
     */
    @Override
    public IPage<WkOrder> transfersPage(PageParam<Transfer, BaseParam> pageParam, QueryWrapper<Transfer> transferQueryWrapper) {
        Transfer one = this.getOne(transferQueryWrapper);
        if (Objects.isNull(one)) {
            throw new CoolException("单据不存在！！");
        }
        return this.baseMapper.transfersPage(pageParam, one.getId());
    }

    /**
     * @author Ryan
     * @date 2025/7/28
     * @description: 调拔单生成出库单
     * @version 1.0
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Transfer genOutStock(Transfer param, Long loginUserId) {
        Transfer transfer = this.getById(param.getId());
        if (Objects.isNull(transfer)) {
            throw new CoolException("数据错误：单据不存在！！");
        }
        List<TransferItem> items = transferItemService.list(new LambdaQueryWrapper<TransferItem>().eq(TransferItem::getTransferId, transfer.getId()));
        if (items.isEmpty()) {
            throw new CoolException("数据错误：调拔单明细不存在！！");
        }
        WkOrder wkOrder = new WkOrder();
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, transfer);
        if (StringUtils.isBlank(ruleCode)) {
            throw new CoolException("调拔单号生成失败！！");
        }

        Double anfmes = items.stream().mapToDouble(TransferItem::getAnfme).sum();
        wkOrder.setCode(ruleCode)
                .setAnfme(anfmes)
                .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)
                .setType(OrderType.ORDER_TRANSFER.type)
                .setWkType(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)
                .setCreateBy(loginUserId)
                .setUpdateBy(loginUserId)
                .setCreateTime(new Date())
                .setUpdateTime(new Date())
                .setPoCode(transfer.getCode())
                .setPoId(transfer.getId());
        if (!outStockService.saveOrUpdate(wkOrder)) {
            throw new CoolException("出库单保存失败！！");
        }

        List<WkOrderItem> orderItems = new ArrayList<>();
        items.forEach(item -> {
            WkOrderItem orderItem = new WkOrderItem();
            BeanUtils.copyProperties(item, orderItem);
            orderItem.setOrderCode(wkOrder.getCode())
                    .setSplrBatch(item.getBatch())
                    .setSplrCode(item.getSplrCode())
                    .setSplrName(item.getSplrName())
                    .setOrderId(wkOrder.getId());
            orderItems.add(orderItem);
        });

        if (!outStockItemService.saveBatch(orderItems)) {
            throw new CoolException("出库单明细保存失败！！");
        }

        transfer.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);

        if (!this.updateById(transfer)) {
            throw new CoolException("调拔单更新失败！！");
        }
        return transfer;
    }
}