补充收货

cl

昨天 2fa1c824c63048b49e45d867191ab3645aeaf3a4

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

@@ -23,8 +23,8 @@
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.CusItemSyncViewQueryService;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.schedules.ScheduleJobs;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -123,7 +123,11 @@
    @Autowired
    private TaskService taskService;
    @Autowired
    private CusItemSyncViewQueryService cusItemSyncViewQueryService;
    private CusBarcodeSyncMatnrService cusBarcodeSyncMatnrService;
    @Autowired
    private ScheduleJobs scheduleJobs;
    @Autowired
    private OutStockService outStockService;

    /**
     * 云仓改单/取消前：任务明细已关联该单据且主任务未逻辑删除则不允许
@@ -169,156 +173,8 @@
        assertWkOrderExceStatusUnexecuted(order, "取消");
    }

    private CusItemSyncMode resolveCusItemSyncMode() {
        Config c = configService.getOne(new LambdaQueryWrapper<Config>()
                .eq(Config::getFlag, GlobalConfigCode.CUS_ITEM_SYNC_MODE)
                .eq(Config::getDeleted, 0), false);
        if (c == null) {
            return CusItemSyncMode.NONE;
        }
        return CusItemSyncMode.fromConfig(c.getVal());
    }

    private static Map<String, SyncOrdersItem> buildOrderItemByMatnrCode(List<SyncOrdersItem> orderItems) {
        Map<String, SyncOrdersItem> map = new LinkedHashMap<>();
        if (orderItems == null) {
            return map;
        }
        for (SyncOrdersItem item : orderItems) {
            if (StringUtils.isBlank(item.getMatnr())) {
                continue;
            }
            map.putIfAbsent(item.getMatnr().trim(), item);
        }
        return map;
    }

    /**
     * 按视图行更新/插入物料主数据（与通知档无关）。
     */
    private void applyCusItemViewRowsToMatnr(List<Map<String, Object>> viewItems, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
        if (viewItems == null || viewItems.isEmpty()) {
            return;
        }
        for (Map<String, Object> row : viewItems) {
            String itemNo = StringUtils.trimToNull(Objects.toString(row.get("item_no"), null));
            if (itemNo == null) {
                continue;
            }
            SyncOrdersItem syncItem = orderItemByCode.get(itemNo);
            String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
            String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
            String incomingName = syncItem == null ? null : StringUtils.trimToNull(syncItem.getMaktx());
            Matnr local = matnrService.getOneByCodeAndBatch(itemNo, "");
            if (local == null) {
                Matnr matnr = new Matnr();
                matnr.setCode(itemNo)
                        .setBatch("")
                        .setName(incomingName != null ? incomingName : itemNo)
                        .setSpec(viewSpec)
                        .setUnit(viewUnit)
                        .setStockUnit(viewUnit)
                        .setStatus(1)
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId)
                        .setCreateTime(new Date())
                        .setUpdateTime(new Date());
                matnrService.save(matnr);
                continue;
            }
            boolean nameDiff = incomingName != null
                    && !StringUtils.equals(StringUtils.trimToEmpty(local.getName()), incomingName);
            boolean specDiff = !StringUtils.equals(StringUtils.trimToEmpty(local.getSpec()), viewSpec);
            boolean unitDiff = viewUnit != null
                    && (!StringUtils.equals(StringUtils.trimToEmpty(local.getUnit()), viewUnit)
                    || !StringUtils.equals(StringUtils.trimToEmpty(local.getStockUnit()), viewUnit));
            if (!nameDiff && !specDiff && !unitDiff) {
                continue;
            }
            Matnr update = new Matnr();
            update.setId(local.getId());
            if (nameDiff) {
                update.setName(incomingName);
            }
            if (specDiff) {
                update.setSpec(viewSpec);
            }
            if (unitDiff) {
                update.setUnit(viewUnit).setStockUnit(viewUnit);
            }
            update.setUpdateBy(loginUserId).setUpdateTime(new Date());
            matnrService.updateById(update);
        }
    }

    /**
     * 按配置处理视图与物料表。
     */
    private void syncMatnrFromCusItemSyncViewByConfig(List<SyncOrdersItem> orderItems, Long loginUserId) {
        if (orderItems == null || orderItems.isEmpty()) {
            return;
        }
        List<String> matnrCodes = orderItems.stream()
                .map(SyncOrdersItem::getMatnr)
                .filter(StringUtils::isNotBlank)
                .map(String::trim)
                .distinct()
                .collect(Collectors.toList());
        if (matnrCodes.isEmpty()) {
            return;
        }
        CusItemSyncMode mode = resolveCusItemSyncMode();
        Map<String, SyncOrdersItem> orderItemByCode = buildOrderItemByMatnrCode(orderItems);

        if (mode == CusItemSyncMode.NONE) {
            syncMatnrNonForceFromView(matnrCodes, orderItemByCode, loginUserId);
            return;
        }

        List<Map<String, Object>> viewItems = cusItemSyncViewQueryService.listByItemNos(matnrCodes);
        Set<String> inView = viewItems == null ? Collections.emptySet() : viewItems.stream()
                .map(r -> StringUtils.trimToNull(Objects.toString(r.get("item_no"), null)))
                .filter(Objects::nonNull)
                .collect(Collectors.toSet());

        for (String code : matnrCodes) {
            if (!inView.contains(code)) {
                throw new CoolException("物料未在视图 cus_item_sync_view 中：" + code);
            }
        }
        applyCusItemViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
    }

    /**
     * 不强制：视图能查到则新增/更新物料表；查不到的编码再查物料表，存在则放行。
     */
    private void syncMatnrNonForceFromView(List<String> matnrCodes, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
        List<Map<String, Object>> viewItems = null;
        try {
            viewItems = cusItemSyncViewQueryService.listByItemNos(matnrCodes);
        } catch (Exception ex) {
            log.warn("查询 cus_item_sync_view 失败，将仅按物料表校验：{}", ex.getMessage());
        }
        Set<String> inView = viewItems == null ? Collections.emptySet() : viewItems.stream()
                .map(r -> StringUtils.trimToNull(Objects.toString(r.get("item_no"), null)))
                .filter(Objects::nonNull)
                .collect(Collectors.toSet());
        if (viewItems != null && !viewItems.isEmpty()) {
            try {
                applyCusItemViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
            } catch (Exception ex) {
                log.warn("按视图写入物料主数据失败：{}", ex.getMessage());
            }
        }
        for (String code : matnrCodes) {
            if (inView.contains(code)) {
                continue;
            }
            Matnr m = matnrService.getOneByCodeAndBatch(code, "");
            if (m == null) {
                throw new CoolException("物料不存在：" + code);
            }
        }
        cusBarcodeSyncMatnrService.syncFromOrderItems(orderItems, loginUserId);
    }

    /**
@@ -494,7 +350,9 @@
    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);
        BaseParam bp = pageParam.getWhere();
        Map<String, Object> conds = bp != null && bp.getMap() != null ? bp.getMap() : Collections.emptyMap();
        IPage<LocStockDto> locStocks = locService.getLocDetls(page, conds);
        return R.ok().add(locStocks);
    }

@@ -698,10 +556,11 @@
                .eq(WkOrder::getPoCode, syncOrder.getOrderInternalCode()));
        if (!Objects.isNull(order)) {
            assertWkOrderNoLinkedTask(order.getId());
            assertWkOrderExceStatusUnexecuted(order, "修改");
            long pakinCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
                    .eq(WaitPakinItem::getAsnId, order.getId()).eq(WaitPakinItem::getDeleted, 0));
            if (pakinCount > 0) {
                // 已组托时仍按原规则限制：仅未执行状态可改单
                assertWkOrderExceStatusUnexecuted(order, "修改");
                String changeSummary = computeWkOrderModifyChangeSummaryOrNull(order, syncOrder, resolvedOrderType, typeCode, true);
                if (changeSummary == null) {
                    return "修改无变化";
@@ -716,7 +575,9 @@
            if (changeSummary == null) {
                return "修改无变化";
            }
            updateOrderNoPakin(order, syncOrder, loginUserId);
            // 未组托时允许已收货改单；自动收货场景下同步让完成数量跟计划数量一致
            boolean alignQtyWithPlan = Objects.equals(order.getExceStatus(), AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val);
            updateOrderNoPakin(order, syncOrder, loginUserId, alignQtyWithPlan);
            if (isDirectWaitPakin()) {
                syncReceiptAreaByOrder(order.getId());
            }
@@ -774,7 +635,64 @@
        if (!asnOrderService.updateById(wkOrder)) {
            throw new CoolException("计划收货数量修改失败！！");
        }
        directReceiptInboundAfterCloudSync(wkOrder, loginUserId);
        return "Success";
    }

    /**
     * DirectWaitPakin 开启时，云仓新增入库通知单成功后立即写入收货区，并将完成数量与计划数对齐（与 {@link ScheduleJobs#IgnoreReceipt} 一致，避免仅依赖定时任务延迟）。
     */
    private void directReceiptInboundAfterCloudSync(WkOrder wkOrder, Long loginUserId) {
        if (!isDirectWaitPakin() || wkOrder == null || wkOrder.getId() == null) {
            return;
        }
        if (!OrderType.ORDER_IN.type.equals(wkOrder.getType())) {
            return;
        }
        if (OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type.equals(wkOrder.getWkType())) {
            WkOrder one = outStockService.getOne(new LambdaQueryWrapper<WkOrder>()
                    .eq(WkOrder::getPoId, wkOrder.getPoId())
                    .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type));
            if (one == null || !Objects.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val, one.getExceStatus())) {
                return;
            }
        }
        WarehouseAreas receiptArea = warehouseAreasService.getOne(
                new LambdaQueryWrapper<WarehouseAreas>()
                        .eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type), false);
        if (receiptArea == null) {
            log.warn("directReceiptInboundAfterCloudSync: 未配置收货区，跳过 orderId={}", wkOrder.getId());
            return;
        }
        List<WkOrderItem> orderItems = asnOrderItemService.list(
                new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
        if (orderItems.isEmpty()) {
            return;
        }
        for (WkOrderItem item : orderItems) {
            Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrId()));
            if (matnr == null) {
                throw new CoolException("物料不存在：" + item.getMatnrCode());
            }
            try {
                scheduleJobs.updateReceipt(receiptArea, item, wkOrder, matnr);
            } catch (Exception e) {
                throw new CoolException(e.getMessage());
            }
            if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
                    .set(WkOrderItem::getQty, item.getAnfme())
                    .eq(WkOrderItem::getId, item.getId()))) {
                throw new CoolException("收货单明细完成数量修改失败！！");
            }
        }
        if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
                .set(WkOrder::getQty, wkOrder.getAnfme())
                .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
                .set(WkOrder::getUpdateBy, loginUserId)
                .set(WkOrder::getUpdateTime, new Date())
                .eq(WkOrder::getId, wkOrder.getId()))) {
            throw new CoolException("收货单状态修改失败！！");
        }
    }

    /** 与 updateOrderNoPakin / mergeOrderWithPakin 写入规则一致；无有效变更时返回 null */
@@ -1030,7 +948,7 @@
    /**
     * 未组托单据的修改：在原单上更新主单+明细（按 lineId 匹配），保留 exceStatus、qty、workQty，避免删单重建导致定时任务再次执行。
     */
    private void updateOrderNoPakin(WkOrder order, SyncOrderParams syncOrder, Long loginUserId) {
    private void updateOrderNoPakin(WkOrder order, SyncOrderParams syncOrder, Long loginUserId, boolean alignQtyWithPlan) {
        if (syncOrder.getOrderItems() == null || syncOrder.getOrderItems().isEmpty()) {
            throw new CoolException("修改时明细不能为空！！");
        }
@@ -1070,7 +988,9 @@
            SyncOrdersItem inc = incomingByLineId.get(lineId);
            Double newAnfme = QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme());
            existing.setAnfme(newAnfme);
            if (inc.getQty() != null) {
            if (alignQtyWithPlan) {
                existing.setQty(newAnfme);
            } else if (inc.getQty() != null) {
                existing.setQty(QuantityUtils.roundToScale(inc.getQty()));
            } else {
                Double curQty = existing.getQty() != null ? existing.getQty() : 0.0;
@@ -1101,6 +1021,9 @@
            map.put("order_code", order.getCode());
            map.put("matnrCode", e.getValue().getMatnr());
            map.put("platItemId", e.getKey());
            if (alignQtyWithPlan) {
                map.put("qty", e.getValue().getAnfme());
            }
            if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
                throw new CoolException("明细保存失败！！");
            }
@@ -1109,9 +1032,13 @@
        Double sum = QuantityUtils.roundToScale(asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))
                .stream().mapToDouble(WkOrderItem::getAnfme).sum());
        order.setAnfme(sum);
        List<WkOrderItem> afterItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
        double qtySum = afterItems.stream().mapToDouble(oi -> oi.getQty() != null ? oi.getQty() : 0.0).sum();
        order.setQty(QuantityUtils.roundToScale(qtySum));
        if (alignQtyWithPlan) {
            order.setQty(sum);
        } else {
            List<WkOrderItem> afterItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
            double qtySum = afterItems.stream().mapToDouble(oi -> oi.getQty() != null ? oi.getQty() : 0.0).sum();
            order.setQty(QuantityUtils.roundToScale(qtySum));
        }
        asnOrderService.updateById(order);
    }

@@ -1553,18 +1480,32 @@
        if (!Cools.isEmpty(param.getPlanNo())) {
            wrapper.eq(LocItem::getPlatWorkCode, param.getPlanNo());
        }
        // 仓库、料箱码按库位 id 交集过滤
        List<Long> allowedLocIds = null;
        if (!Cools.isEmpty(param.getWareHouseId())) {
            Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId()));
            if (wh != null) {
                List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
                if (!locs.isEmpty()) {
                    wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList()));
                } else {
                    return R.ok().add(Collections.emptyList());
                }
            } else {
            if (wh == null) {
                return R.ok().add(Collections.emptyList());
            }
            List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
            if (locs.isEmpty()) {
                return R.ok().add(Collections.emptyList());
            }
            allowedLocIds = locs.stream().map(Loc::getId).collect(Collectors.toList());
        }
        if (!Cools.isEmpty(param.getBarcode())) {
            LambdaQueryWrapper<Loc> lw = new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, param.getBarcode());
            if (allowedLocIds != null) {
                lw.in(Loc::getId, allowedLocIds);
            }
            List<Loc> locs = locService.list(lw);
            if (locs.isEmpty()) {
                return R.ok().add(Collections.emptyList());
            }
            allowedLocIds = locs.stream().map(Loc::getId).collect(Collectors.toList());
        }
        if (allowedLocIds != null) {
            wrapper.in(LocItem::getLocId, allowedLocIds);
        }
        List<LocItem> list = locItemService.list(wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
@@ -1580,6 +1521,7 @@
                row.put("wareHouseId", null);
                row.put("wareHouseName", null);
            }
            row.put("barcode", loc != null ? loc.getBarcode() : null);
            row.put("palletId", item.getTrackCode());
            row.put("matNr", item.getMatnrCode());
            row.put("makTx", item.getMaktx());