From 2b0e94aaf3aadc55db3069d69bc9f1b45455299d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 02 八月 2025 08:58:51 +0800 Subject: [PATCH] 调拔单功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java index 634c151..0e9c566 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java @@ -243,7 +243,7 @@ throw new CoolException("鍑哄簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�"); } - transfer.setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_ING.val); + transfer.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val); if (!this.updateById(transfer)) { throw new CoolException("璋冩嫈鍗曟洿鏂板け璐ワ紒锛�"); @@ -353,13 +353,13 @@ if (!locs.isEmpty()) { Page<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize()); QueryWrapper<LocItem> wrapper = new QueryWrapper<>(); - wrapper.select("id, matnr_id, maktx, matnr_code, SUM(anfme) anfme, SUM(work_qty) work_qty, SUM(qty) qty, batch, unit, fields_index, model, spec, loc_id ") + wrapper.select("id, matnr_id, maktx, matnr_code, SUM(anfme) anfme, SUM(work_qty) work_qty, SUM(qty) qty, batch, unit, fields_index, model, spec, loc_id, loc_code ") .lambda() .eq(StringUtils.isNotBlank(params.getMatnrCode()), LocItem::getMatnrCode, params.getMatnrCode()) .like(StringUtils.isNotBlank(params.getMaktx()), LocItem::getMaktx, params.getMaktx()); Set<Long> locIds = locs.stream().map(Loc::getId).collect(Collectors.toSet()); wrapper.lambda().in(LocItem::getLocId, locIds) - .groupBy(LocItem::getBatch, LocItem::getFieldsIndex, LocItem::getMatnrCode); + .groupBy(LocItem::getBatch, LocItem::getMatnrId); return locItemService.page(page, wrapper); } else { IPage<LocItem> page = new Page<>(params.getCurrent(), params.getPageSize()); -- Gitblit v1.9.1