From ce0f9490376709fdd96ce6b864bd105ac64f086c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 07 五月 2025 17:14:38 +0800 Subject: [PATCH] no message --- rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 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 6a5e4ca..86f79f9 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 @@ -318,7 +318,7 @@ //搴撳瓨鍗曚綅涓烘渶灏忓崟浣� .setUnit(orderItem.getStockUnit()) .setStockUnit(orderItem.getStockUnit()) - .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch()) +// .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch()) .setAnfme(dto.getReceiptQty()) .setSplrBatch(dto.getSplrBatch()) .setMatnrCode(matnr.getCode()) @@ -331,8 +331,9 @@ .setShipperId(matnr.getShipperId()); //TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲 WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>() - .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId()) - .eq(WarehouseAreasItem::getTrackCode, item.getTrackCode()) +// .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId()) + .eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode()) + .eq(WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex()) .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch())); if (!Objects.isNull(serviceOne)) { item.setAnfme(item.getAnfme() + serviceOne.getAnfme()); @@ -417,7 +418,8 @@ */ @Override public R getReceiptAreas() { - List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type)); + List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>() + .eq(WarehouseAreas::getType, WarehouseAreaType.WAREHOUSE_AREA_RECEIPT.type)); return R.ok(areas); } @@ -452,8 +454,7 @@ .eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code) .eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch) .eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode) - .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode) - ; + .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode); List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper); list.removeIf(e -> e.getAnfme() <= e.getWorkQty()); return R.ok(list); -- Gitblit v1.9.1