skyouc
5 天以前 190d2d153d6737830f6173c7de1b0bc03e6d7dac
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -273,7 +273,7 @@
                    if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
                        //获取16位uuid
//                        String uuid16 = Cools.md5(dto.getBarcode());
                        String uuid16 = Cools.md5(dto.getId() + dto.getMatnr());
                        String uuid16 = Cools.md5(dto.getMatnr() + dto.getSplrBatch());
                        rcpt.put("index", uuid16);
                        orderItem.setFieldsIndex(uuid16);
                    }
@@ -882,20 +882,20 @@
        }
        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
                .eq(WaitPakinItem::getPakinId, waitPakin.getId()));
        if (pakinItems.isEmpty()) {
            return R.ok(new ArrayList<>());
        }
        List<Long> list = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().in(WarehouseAreasItem::getId, list);
        List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
        for (int i = 0; i < warehouseAreasItems.size(); i++) {
            for (WaitPakinItem pakinItem : pakinItems) {
                if (warehouseAreasItems.get(i).getId().equals(pakinItem.getSource())) {
                    warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
                }
            }
        }
        return R.ok(warehouseAreasItems);
//        if (pakinItems.isEmpty()) {
//            return R.ok(new ArrayList<>());
//        }
//        List<Long> list = pakinItems.stream().map(WaitPakinItem::getSource).collect(Collectors.toList());
//        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>().in(WarehouseAreasItem::getId, list);
//        List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
//        for (int i = 0; i < warehouseAreasItems.size(); i++) {
//            for (WaitPakinItem pakinItem : pakinItems) {
//                if (warehouseAreasItems.get(i).getId().equals(pakinItem.getSource())) {
//                    warehouseAreasItems.get(i).setAnfme(pakinItem.getAnfme());
//                }
//            }
//        }
        return R.ok(pakinItems);
    }