From 85e327943d8a241c80a5d9f59c430e2fea955055 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 06 五月 2025 13:41:37 +0800 Subject: [PATCH] #pda物料组托 --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 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 7cbc8e9..48452e8 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 @@ -433,7 +433,8 @@ */ @Override public R getDeltByCode(Map<String, Object> params) { - String code = params.get("code").toString(); + Object code = params.get("code"); + Object matnrCode = params.get("matnrCode"); String batch = null; if (!Objects.isNull(params.get("batch"))) { batch = params.get("batch").toString(); @@ -441,10 +442,11 @@ //TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑 LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>() .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch,unit, stock_unit, qty, work_qty, matnr_code, matnr_id, maktx").lambda() - .eq(StringUtils.isNotBlank(code), WarehouseAreasItem::getTrackCode, code) + .eq(!Objects.isNull(code), WarehouseAreasItem::getTrackCode, code) .eq(StringUtils.isNotBlank(batch), WarehouseAreasItem::getSplrBatch, batch) + .eq(!Objects.isNull(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode) .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId); - return R.ok(warehouseAreasItemService.getOne(queryWrapper, false)); + return R.ok(warehouseAreasItemService.list(queryWrapper)); } /** -- Gitblit v1.9.1