增加几种出入库单类型

cl

昨天 91831843f3b9fa4c9f29e518e10dae5d3f9aead8

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

@@ -30,6 +30,7 @@
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.mapper.FieldsMapper;
import com.vincent.rsf.server.system.mapper.TenantMapper;
import com.vincent.rsf.server.system.entity.Config;
import com.vincent.rsf.server.system.service.ConfigService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.UserLoginService;
@@ -135,6 +136,8 @@
    private OutStockService outStockService;
    @Autowired
    private BasContainerService basContainerService;
    @Autowired
    private CusBarcodeSyncViewQueryService cusBarcodeSyncViewQueryService;

    /**
     * @return
@@ -260,8 +263,10 @@
        }
        //TODO /**收货数量累加，1. 会出超收情况 2. 会有收货不足情况*/
        Double rcptedQty = QuantityUtils.add(wkOrder.getQty(), receiptQty);
        // 新顺序：未执行(组托)→任务执行中→已完成，不再设置执行中/收货完成
        wkOrder.setQty(rcptedQty); // .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val)
        wkOrder.setQty(rcptedQty);
        if (AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val.equals(wkOrder.getExceStatus())) {
            wkOrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
        }
        if (!asnOrderMapper.updateById(wkOrder)) {
            throw new CoolException("已收货数量修改失败！！");
        }
@@ -352,18 +357,21 @@
            if (asnOrderItemMapper.updateById(orderItem) < 1) {
                throw new CoolException("通知单明细数量修改失败！！");
            }
            // 收货区已停用，不再保存至收货区
            // extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
            // DirectWaitPakin 启用时保存至收货区，形成闭环；未启用时不写收货区
            Config directPakinConfig = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
            if (directPakinConfig != null && Boolean.parseBoolean(directPakinConfig.getVal())) {
                extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
            }
        }

        // 新顺序：未执行(组托)→任务执行中→已完成，不再设置收货完成
        // WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
        // if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
        //     order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
        //     if (!asnOrderMapper.updateById(order)) {
        //         throw new CoolException("订单状态修改失败！！");
        //     }
        // }
        // 已收数量 >= 计划数量时置为收货完成(2)
        WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
        if (order != null && order.getAnfme() != null && QuantityUtils.compare(order.getQty(), order.getAnfme()) >= 0) {
            order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
            if (!asnOrderMapper.updateById(order)) {
                throw new CoolException("订单状态修改失败！！");
            }
        }

        return R.ok("收货成功！！");
    }
@@ -379,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())
@@ -406,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);

@@ -512,13 +513,16 @@
     * @description 获取收货区
     * @time 2025/3/11 10:12
     */
    /** 收货区已停用，返回空列表 */
    /** DirectWaitPakin 启用时返回收货区列表，未启用时返回空列表（不影响组托与云仓入库流程） */
    @Override
    public R getReceiptAreas() {
        // List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
        //         .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
        // return R.ok(areas);
        return R.ok(Collections.emptyList());
        Config directPakinConfig = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
        if (directPakinConfig == null || !Boolean.parseBoolean(directPakinConfig.getVal())) {
            return R.ok(Collections.emptyList());
        }
        List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
                .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type));
        return R.ok(areas);
    }

    /**
@@ -547,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");
@@ -588,13 +598,14 @@
        // 如果扫描物料编码且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>()
                    .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);
@@ -623,15 +634,56 @@
            return R.ok(resultList);
        }
        
        // 收货区已停用：有ASN单号时从订单明细查可组托物料；可组盘数量 = 计划数量 - 已组托数量 - 已上架数量
        // 有 WMS 单号时：必须能精确命中单据，否则直接返回空（避免落入无单号分支后 queryWrapper 无条件查全表收货区）
        WkOrder asnOrder = null;
        if (!Cools.isEmpty(asnCode)) {
            WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
            if (order == null) {
                logger.info("未找到ASN单号: {}", asnCode);
                return R.ok(Collections.emptyList());
            asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
            if (asnOrder == null) {
                logger.info("未找到WMS单号: {}，返回空列表", asnCode);
                return R.ok(new ArrayList<>());
            }
            // 按明细汇总已组托数量（组托数量不会因改单而变）
            List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, order.getId()));
            asnCode = asnOrder.getCode();
        }

        // 有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);
                if (!Cools.isEmpty(matnrCode)) receiptWrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
                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<>();
                if (!receiptList.isEmpty() && receiptList.stream().anyMatch(e -> e.getAsnId() != null && e.getAsnItemId() != null)) {
                    List<Long> asnItemIds = receiptList.stream().map(WarehouseAreasItem::getAsnItemId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
                    Long asnId = receiptList.get(0).getAsnId();
                    if (asnId != null && !asnItemIds.isEmpty()) {
                        List<WaitPakinItem> wpItems = waitPakinItemService.list(
                                new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, asnId).in(WaitPakinItem::getAsnItemId, asnItemIds).eq(WaitPakinItem::getDeleted, 0));
                        wpItems.forEach(w -> waitPakinSumByItemId.merge(w.getAsnItemId(), w.getAnfme() != null ? w.getAnfme() : 0.0, (a, b) -> (a != null ? a : 0.0) + (b != null ? b : 0.0)));
                        waitPakinSumByItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
                    }
                }
                // 可组托 = 计划(anfme) - 已组托(waitPakinSumByItemId)，不叠加 areaWorkQty 避免与组托档汇总重复计算
                receiptList.removeIf(e -> {
                    Double anfme = e.getAnfme() != null ? e.getAnfme() : 0.0;
                    Double qty = e.getQty() != null ? e.getQty() : 0.0;
                    Double alreadyInWaitPakin = e.getAsnItemId() != null ? waitPakinSumByItemId.getOrDefault(e.getAsnItemId(), 0.0) : 0.0;
                    Double totalAlready = QuantityUtils.roundToScale(alreadyInWaitPakin);
                    Double available = QuantityUtils.roundToScale(QuantityUtils.subtract(QuantityUtils.subtract(anfme, totalAlready), qty));
                    e.setWorkQty(totalAlready);
                    e.setAvailablePalletQty(available);
                    return QuantityUtils.compare(available, 0.0) <= 0;
                });
                logger.info("=== 从收货区查询可组托物料（DirectWaitPakin）asnCode: {} 返回 {} 条", asnCode, receiptList.size());
                return R.ok(receiptList);
            }
            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)));
            palletizedByItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
@@ -640,13 +692,16 @@
            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) {
                Double anfme = QuantityUtils.roundToScale(oi.getAnfme() != null ? oi.getAnfme() : 0.0);
                Double qty = QuantityUtils.roundToScale(oi.getQty() != null ? oi.getQty() : 0.0);
                Double workQty = palletizedByItemId.getOrDefault(oi.getId(), 0.0); // 已组托数量
                if (QuantityUtils.compare(QuantityUtils.subtract(QuantityUtils.subtract(anfme, workQty), qty), 0.0) <= 0) continue; // 可组盘数量<=0 不返回
                Double workQty = palletizedByItemId.getOrDefault(oi.getId(), 0.0);
                // 可组盘数量 = 计划 - 已组托（不扣减明细完成数量 qty，避免云仓同步完成数量=计划后导致可组托被算成 0）
                Double availablePalletQty = QuantityUtils.roundToScale(QuantityUtils.subtract(anfme, workQty));
                if (QuantityUtils.compare(availablePalletQty, 0.0) <= 0) continue;
                WarehouseAreasItem v = new WarehouseAreasItem();
                v.setId(oi.getId());
                v.setAsnItemId(oi.getId());
@@ -655,6 +710,7 @@
                v.setAnfme(anfme);
                v.setQty(qty);
                v.setWorkQty(QuantityUtils.roundToScale(workQty));
                v.setAvailablePalletQty(availablePalletQty);
                v.setMatnrCode(oi.getMatnrCode());
                v.setMaktx(oi.getMaktx());
                v.setSplrBatch(oi.getSplrBatch());
@@ -669,7 +725,7 @@
                }
                list.add(v);
            }
            logger.info("=== 从订单明细查询可组托物料（收货区已停用）asnCode: {} 返回 {} 条", asnCode, list.size());
            logger.info("=== 从订单明细查询可组托物料 asnCode: {} 返回 {} 条", asnCode, list.size());
            return R.ok(list);
        }
        
@@ -780,10 +836,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);
                    }
@@ -820,6 +877,87 @@

        logger.info("返回 {} 条可组托物料数据", list.size());
        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;
    }

    /**
@@ -1051,7 +1189,7 @@
                .setType(order.getType())
                .setUpdateBy(loginUserId)
                .setCreateBy(loginUserId)
                .setWkType(Short.parseShort(order.getWkType()));
                .setWkType(order.getWkType());
        if (!stockService.save(stock)) {
            throw new CoolException("库存保存失败！！");
        }
@@ -1072,7 +1210,7 @@
                    .setUpdateBy(loginUserId)
                    .setUpdateBy(loginUserId)
                    .setOrderItemId(asnOrderItem.getId())
                    .setWkType(Short.parseShort(order.getWkType()))
                    .setWkType(order.getWkType())
                    .setType(order.getType());
            locItems.add(item);
        });