站点优化

cl

2026-04-21 fc634e5b62b85396196e2dd8f51bfe5ba7337522

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

@@ -23,7 +23,6 @@
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.mapper.MatnrMapper;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
@@ -123,7 +122,7 @@
    @Autowired
    private TaskService taskService;
    @Autowired
    private MatnrMapper matnrMapper;
    private CusBarcodeSyncMatnrService cusBarcodeSyncMatnrService;

    /**
     * 云仓改单/取消前：任务明细已关联该单据且主任务未逻辑删除则不允许
@@ -169,156 +168,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 = matnrMapper.selectByCusItemSyncView(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 = matnrMapper.selectByCusItemSyncView(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 +345,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);
    }

@@ -1553,18 +1406,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 +1447,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());