From a83669aa251ddeae5147555ef1493595fa1db013 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 05 三月 2026 09:09:33 +0800
Subject: [PATCH] #备货
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index e9337cc..0f70cbc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -115,8 +115,6 @@
if (!task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)) {
throw new CoolException("褰撳墠鎵樼洏涓嶆槸澶囪揣鍑哄簱浠诲姟");
}
- List<TaskItem> taskItems = taskItemService
- .list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
WaitPakin waitPakin = waitPakinService
.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, param.getNewContainerNo()));
@@ -128,7 +126,11 @@
}
waitPakin1.setCode(ruleCode)
.setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_HOLD.val)
- .setAnfme(taskItems.stream().map(TaskItem::getAnfme).mapToDouble(Double::doubleValue).sum())
+ .setAnfme(param.getTaskItemList().stream()
+ .map(TaskItem::getInputQty)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .doubleValue())
.setUpdateBy(userId)
.setCreateBy(userId)
.setBarcode(param.getNewContainerNo());
@@ -136,9 +138,9 @@
throw new CoolException("缁勬墭涓诲崟淇濆瓨澶辫触锛侊紒");
}
List<WaitPakinItem> items = new ArrayList<>();
- for (TaskItem taskItem : taskItems) {
+ for (TaskItem taskItem : param.getTaskItemList()) {
WaitPakinItem pakinItem = new WaitPakinItem();
- pakinItem.setAnfme(taskItem.getAnfme())
+ pakinItem.setAnfme(taskItem.getInputQty().doubleValue())
.setPakinId(waitPakin1.getId())
.setSource(taskItem.getId())
.setAsnId(taskItem.getSourceId())
@@ -168,7 +170,11 @@
throw new CoolException("缁勬墭鏄庣粏淇濆瓨澶辫触锛侊紒");
}
} else {
- double sum = taskItems.stream().map(TaskItem::getAnfme).mapToDouble(Double::doubleValue).sum();
+ double sum = param.getTaskItemList().stream()
+ .map(TaskItem::getInputQty)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .doubleValue();
waitPakin
.setAnfme(waitPakin.getAnfme() + sum)
.setUpdateBy(userId)
@@ -179,7 +185,7 @@
List<WaitPakinItem> existPakinItems = waitPakinItemService
.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
List<WaitPakinItem> items = new ArrayList<>();
- for (TaskItem taskItem : taskItems) {
+ for (TaskItem taskItem : param.getTaskItemList()) {
Optional<WaitPakinItem> optionalItem = existPakinItems.stream()
.filter(e -> Objects.equals(e.getMatnrCode(), taskItem.getMatnrCode())
&& Objects.equals(e.getBatch(), taskItem.getSplrBatch())
@@ -190,14 +196,14 @@
if (optionalItem.isPresent()) {
WaitPakinItem existItem = optionalItem.get();
- existItem.setAnfme(existItem.getAnfme() + taskItem.getAnfme())
+ existItem.setAnfme(existItem.getAnfme() + taskItem.getInputQty().doubleValue())
.setUpdateBy(userId);
if (!items.contains(existItem)) {
items.add(existItem);
}
} else {
WaitPakinItem pakinItem = new WaitPakinItem();
- pakinItem.setAnfme(taskItem.getAnfme())
+ pakinItem.setAnfme(taskItem.getInputQty().doubleValue())
.setPakinId(waitPakin.getId())
.setSource(taskItem.getId())
.setAsnId(taskItem.getSourceId())
@@ -234,6 +240,24 @@
}
@Override
+ public R taskItemList(PdaGeneralParam param, Long loginUserId) {
+ if (Cools.isEmpty(param.getContainerNo())) {
+ throw new CoolException("鏃犲鍣ㄥ彿");
+ }
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, param.getContainerNo()));
+ if (null == task) {
+ throw new CoolException("鏈壘鍒颁换鍔�");
+ }
+ if (!task.getResource().equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)) {
+ throw new CoolException("褰撳墠鎵樼洏涓嶆槸澶囪揣鍑哄簱浠诲姟");
+ }
+ List<TaskItem> taskItems = taskItemService
+ .list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+
+ return R.ok(taskItems);
+ }
+
+ @Override
public R getWaveListItem(String barcode) {
LambdaQueryWrapper<Wave> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(!Cools.isEmpty(barcode), Wave::getCode, barcode);
--
Gitblit v1.9.1