From d7d764b347c10e13acfa3ee9bc3e0ec2af1cf1cc Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 08 五月 2025 13:18:07 +0800 Subject: [PATCH] #pda解绑修复 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java index 3e08e1f..c12c7c4 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java +++ b/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浣島uid // 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); } -- Gitblit v1.9.1