From c620f4cbc6f5ed50758ea548855773bfed2dcd39 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 16 三月 2026 16:37:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 89 insertions(+), 11 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 4c67313..417cae7 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,9 @@
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()));
+ if (Cools.isEmpty(param.getTaskItemList())) {
+ throw new CoolException("浠诲姟鏄庣粏涓虹┖");
+ }
WaitPakin waitPakin = waitPakinService
.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, param.getNewContainerNo()));
@@ -127,8 +128,12 @@
throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
}
waitPakin1.setCode(ruleCode)
- .setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_HOLD.val)
- .setAnfme(taskItems.stream().map(TaskItem::getAnfme).mapToDouble(Double::doubleValue).sum())
+ .setIoStatus(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)
+ .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 +141,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 +173,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 +188,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 +199,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())
@@ -230,7 +239,74 @@
}
}
+ Map<Long, BigDecimal> taskItemInputQtyMap = param.getTaskItemList().stream()
+ .filter(Objects::nonNull)
+ .filter(e -> !Objects.isNull(e.getId()))
+ .collect(Collectors.toMap(TaskItem::getId,
+ e -> Objects.isNull(e.getInputQty()) ? BigDecimal.ZERO : e.getInputQty(),
+ BigDecimal::add));
+ if (taskItemInputQtyMap.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏鍙傛暟閿欒");
+ }
+ List<TaskItem> toUpdateTaskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
+ .eq(TaskItem::getTaskId, task.getId())
+ .in(TaskItem::getId, taskItemInputQtyMap.keySet()));
+ if (Cools.isEmpty(toUpdateTaskItems) || toUpdateTaskItems.size() != taskItemInputQtyMap.size()) {
+ throw new CoolException("鏈壘鍒板搴斾换鍔℃槑缁�");
+ }
+ toUpdateTaskItems.forEach(item -> {
+ double currentWorkQty = Objects.isNull(item.getWorkQty()) ? 0D : item.getWorkQty();
+ BigDecimal inputQty = taskItemInputQtyMap.getOrDefault(item.getId(), BigDecimal.ZERO);
+ item.setWorkQty(BigDecimal.valueOf(currentWorkQty).add(inputQty).doubleValue())
+ .setUpdateBy(userId);
+ });
+ if (!taskItemService.updateBatchById(toUpdateTaskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏鏇存柊澶辫触");
+ }
+
+
+ //鍒ゆ柇浠诲姟鏄庣粏鏄惁鍏ㄩ儴瀹屾垚
+ List<TaskItem> allTaskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
+ .eq(TaskItem::getTaskId, task.getId()));
+ if (Cools.isEmpty(allTaskItems)) {
+ throw new CoolException("鏈壘鍒颁换鍔℃槑缁�");
+ }
+ boolean allTaskItemsFinished = allTaskItems.stream().allMatch(item -> {
+ BigDecimal workQty = BigDecimal.valueOf(Objects.isNull(item.getWorkQty()) ? 0D : item.getWorkQty());
+ BigDecimal qty = BigDecimal.valueOf(Objects.isNull(item.getQty()) ? 0D : item.getQty());
+ return workQty.compareTo(qty) == 0;
+ });
+ if (allTaskItemsFinished) {
+ task.setTaskStatus(TaskStsType.COMPLETE_OUT.id)
+ .setUpdateBy(userId)
+ .setUpdateTime(new Date());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐�");
+ }
+ }
+
return R.ok();
+ }
+
+ @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())
+ .eq(Task::getTaskStatus, TaskStsType.AWAIT.id)
+ );
+ 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
@@ -393,7 +469,9 @@
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
- List<Long> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), Long.class);
+ List<Long> areaList = basStation.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
if (Cools.isEmpty(areaList)) {
throw new CoolException("褰撳墠绔欑偣搴撳尯鏈厤缃�");
}
--
Gitblit v1.9.1