dj修改

cl

2026-04-20 48ebc3e1120c4d72ea490167b9705208edc79071

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

@@ -136,6 +136,8 @@
    private OutStockService outStockService;
    @Autowired
    private BasContainerService basContainerService;
    @Autowired
    private CusBarcodeSyncViewQueryService cusBarcodeSyncViewQueryService;

    /**
     * @return
@@ -600,10 +602,11 @@
            logger.info("=== 从物料信息表查询物料信息（不查询收货区） ===");
            logger.info("查询参数 - matnrCode: {}", matnrCode);
            
            Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                    .eq(Matnr::getCode, matnrCode)
                    .eq(Matnr::getDeleted, 0)
                    .last("LIMIT 1"));
            // Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
            //         .eq(Matnr::getCode, matnrCode)
            //         .eq(Matnr::getDeleted, 0)
            //         .last("LIMIT 1"));
            Matnr matnr = getMatnrByCodePreferView(matnrCode);
            
            if (matnr == null) {
                logger.warn("物料信息表中未找到物料编码: {}", matnrCode);
@@ -632,8 +635,18 @@
            return R.ok(resultList);
        }
        
        // 有ASN单号时：DirectWaitPakin 启用则从收货区查可组托物料，未启用则从订单明细查（可组盘数量 = 计划 - 已组托 - 已上架）
        // 有ASN单号时：仅在单据存在时按单据限制组托
        WkOrder asnOrder = null;
        if (!Cools.isEmpty(asnCode)) {
            asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
            if (asnOrder == null) {
                logger.info("未找到ASN单号: {}，按无单据组托模式返回物料信息", asnCode);
                asnCode = null;
            }
        }

        // 有ASN单号且单据存在时：DirectWaitPakin 启用则从收货区查可组托物料，未启用则从订单明细查
        if (!Cools.isEmpty(asnCode) && asnOrder != null) {
            Config directPakinConfig = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
            if (directPakinConfig != null && Boolean.parseBoolean(directPakinConfig.getVal())) {
                LambdaQueryWrapper<WarehouseAreasItem> receiptWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAsnCode, asnCode);
@@ -668,11 +681,7 @@
                logger.info("=== 从收货区查询可组托物料（DirectWaitPakin）asnCode: {} 返回 {} 条", asnCode, receiptList.size());
                return R.ok(receiptList);
            }
            WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
            if (order == null) {
                logger.info("未找到ASN单号: {}", asnCode);
                return R.ok(Collections.emptyList());
            }
            WkOrder order = asnOrder;
            List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, order.getId()).eq(WaitPakinItem::getDeleted, 0));
            Map<Long, Double> palletizedByItemId = pakinItems.stream()
                    .collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId, Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
@@ -825,10 +834,11 @@
            if (!matnrCodes.isEmpty()) {
                Map<String, Matnr> matnrMap = new HashMap<>();
                for (String matCode : matnrCodes) {
                    Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                            .eq(Matnr::getCode, matCode)
                            .eq(Matnr::getDeleted, 0)
                            .last("LIMIT 1"));
                    // Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                    //         .eq(Matnr::getCode, matCode)
                    //         .eq(Matnr::getDeleted, 0)
                    //         .last("LIMIT 1"));
                    Matnr matnr = getMatnrByCodePreferView(matCode);
                    if (matnr != null) {
                        matnrMap.put(matCode, matnr);
                    }
@@ -867,6 +877,87 @@
        return R.ok(list);
    }

    private Matnr findLocalMatnrByCode(String matnrCode) {
        String t = StringUtils.trimToNull(matnrCode);
        if (t == null) {
            return null;
        }
        return matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                .eq(Matnr::getCode, t)
                .eq(Matnr::getDeleted, 0)
                .last("LIMIT 1"));
    }

    /** 组托：先查视图 barcode（物料号），再 man_matnr.code 等值 */
    private Matnr getMatnrByCodePreferView(String matnrCode) {
        String code = StringUtils.trimToNull(matnrCode);
        if (code == null) {
            return null;
        }
        List<Map<String, Object>> viewItems = null;
        try {
            viewItems = cusBarcodeSyncViewQueryService.listByItemNos(Collections.singletonList(code));
        } catch (Exception ignore) {
        }
        Map<String, Object> row = null;
        if (viewItems != null) {
            row = viewItems.stream()
                    .filter(v -> CusBarcodeSyncViewQueryService.rowMatchesOrderMatnr(code, Objects.toString(v.get("barcode"), null)))
                    .findFirst()
                    .orElse(null);
        }
        if (row == null) {
            return findLocalMatnrByCode(code);
        }
        String fullCode = CusBarcodeSyncViewQueryService.matnrCodeFromBarcode(Objects.toString(row.get("barcode"), null));
        Matnr local = findLocalMatnrByCode(fullCode);
        String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
        String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
        String viewName = StringUtils.trimToNull(Objects.toString(row.get("item_name"), null));
        if (local == null) {
            Matnr matnr = new Matnr();
            matnr.setCode(fullCode)
                    .setBatch("")
                    .setName(viewName != null ? viewName : fullCode)
                    .setSpec(viewSpec)
                    .setUnit(viewUnit)
                    .setStockUnit(viewUnit)
                    .setStatus(1)
                    .setDeleted(0)
                    .setCreateBy(1L)
                    .setUpdateBy(1L)
                    .setCreateTime(new Date())
                    .setUpdateTime(new Date());
            if (matnrMapper.insert(matnr) <= 0) {
                throw new CoolException("物料信息保存失败");
            }
            return matnr;
        }
        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 (specDiff || unitDiff) {
            Matnr update = new Matnr();
            update.setId(local.getId());
            if (specDiff) {
                update.setSpec(viewSpec);
                local.setSpec(viewSpec);
            }
            if (unitDiff) {
                update.setUnit(viewUnit);
                update.setStockUnit(viewUnit);
                local.setUnit(viewUnit);
                local.setStockUnit(viewUnit);
            }
            update.setUpdateBy(1L).setUpdateTime(new Date());
            if (matnrMapper.updateById(update) <= 0) {
                throw new CoolException("物料信息更新失败");
            }
        }
        return local;
    }

    /**
     * @param
     * @param userId