增加几种出入库单类型

cl

昨天 91831843f3b9fa4c9f29e518e10dae5d3f9aead8

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

@@ -137,7 +137,7 @@
    @Autowired
    private BasContainerService basContainerService;
    @Autowired
    private CusItemSyncViewQueryService cusItemSyncViewQueryService;
    private CusBarcodeSyncViewQueryService cusBarcodeSyncViewQueryService;

    /**
     * @return
@@ -387,6 +387,7 @@
        item.setTrackCode(dto.getBarcode())
                .setAreaName(areasItem.getName())
                .setAreaId(areasItem.getId())
                .setPlatItemId(orderItem.getPlatItemId())
                .setAsnItemId(orderItem.getId())
                .setAsnCode(wkOrder.getCode())
                .setAsnId(wkOrder.getId())
@@ -414,16 +415,8 @@
        //TODO 供应商标识未设置，标识由PO单供应商编码转换

        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
//                .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
                .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
                .eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
                .eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
                .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch());
        if (Objects.isNull(orderItem.getIsptResult())) {
            queryWrapper.isNull(WarehouseAreasItem::getIsptResult);
        } else {
            queryWrapper.eq(WarehouseAreasItem::getIsptResult, orderItem.getIsptResult());
        }
                .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
                .eq(WarehouseAreasItem::getAsnId, wkOrder.getId());

        WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);

@@ -558,6 +551,12 @@
        String code = params.get("code");
        String matnrCode = params.get("matnrCode");
        String asnCode = params.get("asnCode");
        if (asnCode != null) {
            asnCode = asnCode.trim();
            if (asnCode.isEmpty()) {
                asnCode = null;
            }
        }
        String crushNo = params.get("fieldsIndex");
        String batch = params.get("batch");
//        String barcode = params.get("barcode");
@@ -599,7 +598,7 @@
        // 如果扫描物料编码且ASN单号为空，直接从物料信息表获取，不查询收货区
        if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && Cools.isEmpty(code) 
                && Cools.isEmpty(batch) && Objects.isNull(fieldIndex)) {
            logger.info("=== 从物料信息表查询物料信息（不查询收货区） ===");
//            logger.info("=== 从物料信息表查询物料信息（不查询收货区） ===");
            logger.info("查询参数 - matnrCode: {}", matnrCode);
            
            // Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
@@ -635,14 +634,15 @@
            return R.ok(resultList);
        }
        
        // 有ASN单号时：仅在单据存在时按单据限制组托
        // 有 WMS 单号时：必须能精确命中单据，否则直接返回空（避免落入无单号分支后 queryWrapper 无条件查全表收货区）
        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;
                logger.info("未找到WMS单号: {}，返回空列表", asnCode);
                return R.ok(new ArrayList<>());
            }
            asnCode = asnOrder.getCode();
        }

        // 有ASN单号且单据存在时：DirectWaitPakin 启用则从收货区查可组托物料，未启用则从订单明细查
@@ -654,6 +654,7 @@
                if (!Cools.isEmpty(batch)) receiptWrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
                if (!Objects.isNull(fieldIndex)) receiptWrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
                if (!Cools.isEmpty(code)) receiptWrapper.eq(WarehouseAreasItem::getTrackCode, code);
                receiptWrapper.orderByAsc(WarehouseAreasItem::getPlatItemId).orderByAsc(WarehouseAreasItem::getAsnItemId);
                List<WarehouseAreasItem> receiptList = warehouseAreasItemService.list(receiptWrapper);
                // 组托通知档（WaitPakinItem）的已组托数量也要扣减：收货区 workQty 仅反映从收货区组托的部分，从订单直接组托的在此汇总
                Map<Long, Double> waitPakinSumByItemId = new java.util.HashMap<>();
@@ -691,6 +692,7 @@
            if (!Cools.isEmpty(batch)) itemWrapper.eq(WkOrderItem::getSplrBatch, batch);
            if (!Objects.isNull(fieldIndex)) itemWrapper.eq(WkOrderItem::getFieldsIndex, fieldIndex);
            if (!Cools.isEmpty(code)) itemWrapper.eq(WkOrderItem::getTrackCode, code);
            itemWrapper.orderByAsc(WkOrderItem::getPlatItemId).orderByAsc(WkOrderItem::getId);
            List<WkOrderItem> orderItems = asnOrderItemMapper.selectList(itemWrapper);
            List<WarehouseAreasItem> list = new ArrayList<>();
            for (WkOrderItem oi : orderItems) {
@@ -877,7 +879,18 @@
        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) {
@@ -885,30 +898,29 @@
        }
        List<Map<String, Object>> viewItems = null;
        try {
            viewItems = cusItemSyncViewQueryService.listByItemNos(Collections.singletonList(code));
            viewItems = cusBarcodeSyncViewQueryService.listByItemNos(Collections.singletonList(code));
        } catch (Exception ignore) {
        }
        Map<String, Object> row = null;
        if (viewItems != null) {
            row = viewItems.stream()
                    .filter(v -> StringUtils.equals(code, StringUtils.trimToNull(Objects.toString(v.get("item_no"), null))))
                    .filter(v -> CusBarcodeSyncViewQueryService.rowMatchesOrderMatnr(code, Objects.toString(v.get("barcode"), null)))
                    .findFirst()
                    .orElse(null);
        }
        Matnr local = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                .eq(Matnr::getCode, code)
                .eq(Matnr::getDeleted, 0)
                .last("LIMIT 1"));
        if (row == null) {
            return local;
            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(code)
            matnr.setCode(fullCode)
                    .setBatch("")
                    .setName(code)
                    .setName(viewName != null ? viewName : fullCode)
                    .setSpec(viewSpec)
                    .setUnit(viewUnit)
                    .setStockUnit(viewUnit)