盘点功能优化，bug修复

skyouc

16 小时以前 5b976ae793a2a068427fdb9c7d80fdf4ea6a96a5

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java

@@ -3,18 +3,21 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
import com.vincent.rsf.server.api.controller.erp.params.dto.CheckDiffDto;
import com.vincent.rsf.server.api.controller.erp.params.dto.TransferInfoDto;
import com.vincent.rsf.server.api.controller.erp.params.dto.WkOrderDto;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.LocAreaServiceImpl;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Fields;
@@ -29,6 +32,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.stream.Collectors;

/**
 * @author Ryan
@@ -48,8 +52,6 @@
    @Autowired
    private FieldsService fieldsService;
    @Autowired
    private FieldsItemService fieldsItemService;
    @Autowired
    private MatnrGroupService matnrGroupService;
    @Autowired
    private MatnrServiceImpl matnrService;
@@ -64,11 +66,26 @@
    @Autowired
    private LocService locService;
    @Autowired
    private LocItemService locItemService;
    @Autowired
    private WarehouseAreasService warehouseAreasService;
    @Autowired
    private WarehouseService warehouseService;
    @Autowired
    private CompanysService companysService;
    @Autowired
    private TransferService transferService;
    @Autowired
    private TransferItemService transferItemService;
    @Autowired
    private LocReviseService locReviseService;
    @Autowired
    private ReviseLogService reviseLogService;
    @Autowired
    private ReviseLogItemService reviseLogItemService;
    @Autowired
    private CheckDiffService checkDiffService;
    @Autowired
    private CheckDiffItemService checkDiffItemService;


    /**
     * @author Ryan
@@ -77,7 +94,7 @@
     * @version 1.0
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public boolean syncPurchasee(List<OrderParams> orders) {
        if (orders.isEmpty()) {
            throw new CoolException("单据内容不能为空！！");
@@ -159,6 +176,7 @@
     * @param matnrs
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public void syncMatnrs(List<BaseMatParms> matnrs) {
        List<Matnr> syncMatnrs = new ArrayList<>();
        if (!matnrs.isEmpty()) {
@@ -193,7 +211,7 @@
    @Override
    public R queryOrderStatus(QueryOrderParam queryParams) {
        WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                .eq(WkOrder::getCode, queryParams.getOrderNo())
                .in(WkOrder::getCode, queryParams.getOrderNo())
                .eq(WkOrder::getType, queryParams.getType()));
        if (Objects.isNull(wkOrders)) {
            throw new CoolException("单据不存在！！");
@@ -216,7 +234,7 @@
    public R syncLocsDetl(PageParam<Loc, BaseParam> pageParam, QueryWrapper<Loc> wrapper) {
        Page<Object> page = new Page<>();
        page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
        IPage<LocStockDto> locStocks =  locService.getLocDetls(page);
        IPage<LocStockDto> locStocks = locService.getLocDetls(page);
        return R.ok().add(locStocks);
    }

@@ -286,7 +304,7 @@
            BeanUtils.copyProperties(param, locArea);
            WarehouseAreas warehouseAreas = warehouseAreasService
                    .getOne(new LambdaQueryWrapper<WarehouseAreas>()
                    .eq(WarehouseAreas::getName, param.getName()));
                            .eq(WarehouseAreas::getName, param.getName()));
            if (!Objects.isNull(warehouseAreas)) {
                locArea.setWarehouseId(warehouseAreas.getId());
            }
@@ -320,4 +338,328 @@
        return R.ok();
    }

    /**
     * @author Ryan
     * @date 2025/8/19
     * @description: 同步企业信息
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncCompanies(List<CompaniesParam> companyParams) {
        companyParams.forEach(param -> {
            Companys companys = new Companys();
            BeanUtils.copyProperties(param, companys);
            if (Objects.isNull(companys.getCode())) {
                throw new CoolException("企业编码不能为空！！");
            }
            Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName()));
            if (Objects.isNull(one)) {
                String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, null);
                companys.setCode(ruleCode);
            } else {
                throw new CoolException(one.getName() + "，企业名重复！！");
            }
            companys.setType(CompanysType.getCustomVal(param.getType()))
                    .setId(null);
            if (!companysService.save(companys)) {
                throw new CoolException("企业保存失败！！");
            }
        });
        return R.ok();
    }


    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncCheckOrder(SyncOrderParams syncOrders, Long loginUserId) {
        List<SyncOrdersItem> ordersItems = syncOrders.getItems();
        Map<String, List<SyncOrdersItem>> listMap = ordersItems.stream().collect(Collectors.groupingBy(SyncOrdersItem::getOrderCode));
        listMap.keySet().forEach(orderCode -> {
            WkOrder wkOrder = new WkOrder();
            String ruleCode = null;
            if (syncOrders.getType().equals(OrderType.ORDER_CHECK.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, null);
            } else if (syncOrders.getType().equals(OrderType.ORDER_IN.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, null);
            } else if (syncOrders.getType().equals(OrderType.ORDER_OUT.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, null);
            } else if (syncOrders.getType().equals(OrderType.ORDER_REVISE.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null);
            } else if (syncOrders.getType().equals(OrderType.ORDER_TRANSFER.type)) {
                ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null);
            }

            SyncOrdersItem ordersItem = listMap.get(orderCode).stream().findFirst().get();
            Double anfmes = listMap.get(orderCode).stream().mapToDouble(SyncOrdersItem::getAnfme).sum();
            wkOrder.setType(syncOrders.getType())
                    .setWkType(OrderWorkType.getWorkType(ordersItem.getWkType()))
                    .setAnfme(anfmes)
                    .setPoCode(orderCode)
                    .setPoId(ordersItem.getId())
                    .setCode(ruleCode)
                    .setId(null)
                    .setCreateTime(new Date())
                    .setUpdateTime(new Date())
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId);

            if (!asnOrderService.save(wkOrder)) {
                throw new CoolException("单据保存失败！！");
            }

            listMap.get(orderCode).forEach(order -> {
                WkOrderItem wkOrderItem = new WkOrderItem();
                BeanUtils.copyProperties(order, wkOrderItem);
                wkOrderItem.setOrderCode(wkOrder.getCode())
                        .setOrderId(wkOrder.getId())
                        .setId(null);

                if (!asnOrderItemService.save(wkOrderItem)) {
                    throw new CoolException("单据明细保存失败！！");
                }
            });
        });

        return R.ok();
    }

    /**
     * @author Ryan
     * @date 2025/8/19
     * @description: 调拔单据同步
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncTransfer(SyncTransferParams transferParams) {
        Transfer transfer = new Transfer();
        WarehouseAreas warehouseAreas = warehouseAreasService
                .getOne(new LambdaQueryWrapper<WarehouseAreas>()
                        .eq(WarehouseAreas::getName, transfer.getOrgAreaName()));
        if (Objects.isNull(warehouseAreas)) {
            throw new CoolException("原库区不存在！！");
        }

        WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
                .eq(WarehouseAreas::getName, transfer.getTarAreaName()));
        if (Objects.isNull(warehouseAreas1)) {
            throw new CoolException("目标库区不存在！！");
        }

        transfer.setOrgAreaName(warehouseAreas.getName())
                .setOrgAreaId(warehouseAreas.getId())
                .setOrgWareName(warehouseAreas.getWarehouseId$())
                .setOrgWareId(warehouseAreas.getWarehouseId())
                .setTarWareName(warehouseAreas1.getWarehouseId$())
                .setTarAreaName(warehouseAreas1.getName())
                .setTarAreaId(warehouseAreas1.getId())
                .setTarWareName(warehouseAreas1.getWarehouseId$())
                .setTarWareId(warehouseAreas1.getWarehouseId())
                .setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val);

        if (!transferService.save(transfer)) {
            throw new CoolException("调拔单据保存失败！！");
        }

        transferParams.getItems().forEach(item -> {
            TransferItem transferItem = new TransferItem();
            BeanUtils.copyProperties(item, transferItem);
            Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
            if (Objects.isNull(matnr)) {
                throw new CoolException("物料不存在！！");
            }
            transferItem.setMatnrId(matnr.getId())
                    .setTransferId(transfer.getId())
                    .setTransferCode(transfer.getCode());

            if (!transferItemService.save(transferItem)) {
                throw new CoolException("调拔单明细保存失败！！");
            }
        });

        return R.ok();
    }

    /**
     * @author Ryan
     * @date 2025/8/20
     * @description: 库存调整单同步
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncLocRevise(SyncLocReviseParams reviseParams) {
        LocRevise locRevise = new LocRevise();
        if (Objects.isNull(reviseParams.getAreaName())) {
            throw new CoolException("库区不能为空！！");
        }
        WarehouseAreas warehouseAreas = warehouseAreasService
                .getOne(new LambdaQueryWrapper<WarehouseAreas>()
                        .eq(WarehouseAreas::getName, reviseParams.getAreaName()));
        if (Objects.isNull(warehouseAreas)) {
            throw new CoolException("库区不存在！！");
        }
        locRevise.setAreaName(locRevise.getAreaName())
                .setAreaId(warehouseAreas.getId());
        locRevise.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null));

        if (!locReviseService.save(locRevise)) {
            throw new CoolException("库存调整单保存失败！！");
        }

        reviseParams.getItems().forEach(revise -> {
            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, revise.getLocCode()));
            ReviseLog reviseLog = new ReviseLog();
            BeanUtils.copyProperties(loc, reviseLog);
            reviseLog.setReviseId(locRevise.getId()).setReviseCode(locRevise.getCode());
            if (!reviseLogService.save(reviseLog)) {
                throw new CoolException("库存调整单不能为空！！");
            }
            revise.getItems().forEach(reviseItem -> {
                ReviseLogItem logItem = new ReviseLogItem();
                BeanUtils.copyProperties(reviseItem, logItem);
                logItem.setLocId(loc.getId())
                        .setLocCode(loc.getCode())
                        .setId(null)
                        .setReviseQty(reviseItem.getAnfme());

                if (!reviseLogItemService.save(logItem)) {
                    throw new CoolException("调整库存明细保存失败！！");
                }
            });
        });

        return R.ok();
    }

    /**
     * @author Ryan
     * @date 2025/8/20
     * @description: 单据修改--收货通知单/出库单/盘点单
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncOrderUpdate(SyncOrderParams orders) {
        //入库单修改
        if (orders.getType().equals(OrderType.ORDER_IN.type)) {
            orders.getItems().forEach(orderItem -> {
                WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(WkOrder::getType, OrderType.ORDER_IN.type)
                        .eq(WkOrder::getCode, orderItem.getOrderCode()));
                if (Objects.isNull(order)) {
                    throw new CoolException("单据不存在！！");
                }

                if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode())
                        .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
                        .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
                    throw new CoolException("单据修改失败！！");
                }

                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getOrderId, order.getId()));
                if (orderItems.isEmpty()) {
                    throw new CoolException("单据明细不存在！！");
                }

                Double summed = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                order.setAnfme(summed);

                if (!asnOrderService.updateById(order)) {
                    throw new CoolException("单据修改失败！！");
                }
            });
        } else {

        }
        return null;
    }

    /**
     * @author Ryan
     * @date 2025/8/21
     * @description: 删除单据
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncOrderDelete(List<SyncOrderParams> orders) {
        orders.forEach(order -> {
            order.getItems().forEach(orderItem -> {
                WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(WkOrder::getType, order.getType())
                        .in(WkOrder::getExceStatus, Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val))
                        .eq(WkOrder::getId, orderItem.getOrderId()));
                if (Objects.isNull(wkOrder)) {
                    throw new CoolException("订单：" + orderItem.getOrderCode() + "，当前状态，不可执行删除操作！！");
                }
                if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrId, orderItem.getMatnrId())
                        .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()))) {
                    throw new CoolException("单据明细删除失败！！");
                }
                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderItem.getOrderId()));
                if (orderItems.isEmpty()) {
                    if (!asnOrderService.removeById(orderItem.getOrderId())) {
                        throw new CoolException("单据删除失败！！");
                    }
                }
            });
        });
        return R.ok();
    }

    /**
     * @author Ryan
     * @date 2025/8/21
     * @description: 调拔单明细查询
     * @version 1.0
     */
    @Override
    public R queryTransfer(QueryOrderParam queryParams) {
        Transfer transfer = transferService.getOne(new LambdaQueryWrapper<Transfer>()
                .in(Transfer::getCode, queryParams.getOrderNo()));
        if (Objects.isNull(transfer)) {
            throw new CoolException("单据不存在！！");
        }
        List<TransferItem> orderItems = transferItemService.list(new LambdaQueryWrapper<TransferItem>()
                .eq(TransferItem::getTransferId, transfer.getId()));
        TransferInfoDto wkorderDto = new TransferInfoDto();
        wkorderDto.setTransfer(transfer).setItems(orderItems);
        return R.ok().add(wkorderDto);
    }

    /**
     * @author Ryan
     * @date 2025/8/22
     * @description: 盘点差异单同步
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncCheckDiffs(SyncCheckDiffParams syncParams) {
        List<CheckDiff> diffs = checkDiffService.list(new LambdaQueryWrapper<CheckDiff>()
                .eq(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)
                .in(CheckDiff::getOrderCode, syncParams.getDiffCode()));
        if (diffs.isEmpty()) {
            return R.ok();
        }
        List<CheckDiffDto> dtos = new ArrayList<>();
        diffs.forEach(check -> {
            CheckDiffDto checkDto = new CheckDiffDto();
            CheckDiff checkDiff = new CheckDiff();
            BeanUtils.copyProperties(check, checkDiff);
            List<CheckDiffItem> items = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getCheckId, check.getId()));
            checkDto.setItems(items)
                    .setCheckDiff(checkDiff);
            dtos.add(checkDto);
        });

        return R.ok().add(dtos);
    }
}