库位编号规则和和CTU保持一致

cl

7 天以前 66d2950e1a594bcb50c34875d6a87a3ab367056a

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

@@ -213,6 +213,7 @@
                    throw new CoolException("组托明细修执行数量修改失败！！");
                }
            });
            syncAsnOrderItemBarcodeByPakin(waitPakinItems, pakin.getBarcode(), loginUserId);
        });

        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
@@ -303,6 +304,7 @@
                    throw new CoolException("组托明细修执行数量修改失败！！");
                }
            });
            syncAsnOrderItemBarcodeByPakin(waitPakinItems, pakin.getBarcode(), loginUserId);
        });

        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
@@ -455,6 +457,7 @@
                    throw new CoolException("组托明细修执行数量修改失败！！");
                }
            });
            syncAsnOrderItemBarcodeByPakin(waitPakinItems, pakin.getBarcode(), loginUserId);
        });

        if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
@@ -465,6 +468,27 @@
            throw new CoolException("组拖状态修改失败！！");
        }
        return R.ok("任务生成完毕！");
    }

    /** 组托后将通知单明细条码回写为料箱码 */
    private void syncAsnOrderItemBarcodeByPakin(List<WaitPakinItem> waitPakinItems, String pakinBarcode, Long loginUserId) {
        if (waitPakinItems == null || waitPakinItems.isEmpty() || StringUtils.isBlank(pakinBarcode)) {
            return;
        }
        Set<Long> asnItemIds = waitPakinItems.stream()
                .map(WaitPakinItem::getAsnItemId)
                .filter(Objects::nonNull)
                .collect(Collectors.toSet());
        if (asnItemIds.isEmpty()) {
            return;
        }
        if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
                .in(WkOrderItem::getId, asnItemIds)
                .set(WkOrderItem::getBarcode, pakinBarcode)
                .set(WkOrderItem::getUpdateBy, loginUserId)
                .set(WkOrderItem::getUpdateTime, new Date()))) {
            throw new CoolException("通知单明细条码回写失败！！");
        }
    }

    /**
@@ -2856,8 +2880,9 @@
                    }
                }
            }
            // 入/出库均仅云仓来源单据参与上报（明细需带 platOrderCode 或 platWorkCode）
            boolean hasCloudSource = taskItems.stream().anyMatch(this::hasCloudOrderRef);
            // 入库组托场景允许按 WaitPakinItem.asnCode 兜底识别云仓来源，避免 plat* 为空时误跳过
            boolean hasCloudSource = taskItems.stream().anyMatch(this::hasCloudOrderRef)
                    || (isInbound && !sourceToOrderNo.isEmpty());
            if (!hasCloudSource) {
                log.info("入/出库结果上报待办跳过：无云仓来源单据，taskId={}", task.getId());
                return;
@@ -2865,7 +2890,14 @@
            ObjectMapper om = new ObjectMapper();
            Date now = new Date();
            for (TaskItem item : taskItems) {
                if (!hasCloudOrderRef(item)) {
                if (item == null) {
                    continue;
                }
                boolean hasTaskItemCloudRef = hasCloudOrderRef(item);
                boolean hasInboundAsnFallbackRef = isInbound
                        && item.getSource() != null
                        && StringUtils.isNotBlank(sourceToOrderNo.get(item.getSource()));
                if (!hasTaskItemCloudRef && !hasInboundAsnFallbackRef) {
                    continue;
                }
                String orderNo = isInbound ? sourceToOrderNo.get(item.getSource()) : (item.getPlatOrderCode() != null ? item.getPlatOrderCode() : item.getPlatWorkCode());