From 3217d6f977040632c116293dbe483e0d22712e81 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 十一月 2025 18:14:16 +0800
Subject: [PATCH] 拣货功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 1 +
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 40 +++++++++++++++++++++++++++++++---------
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 5 +++--
4 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java
index eb8b5e6..fe13e17 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/ContainerWaveParam.java
@@ -16,7 +16,7 @@
private String container;
- private List<WkOrderItem> orderItems;
+ private List<WkOrderItem> containerWaveDtos;
- private List<ContainerWaveDto> containerWaveDtos;
+// private List<ContainerWaveDto> containerWaveDtos;
}
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 4775bf7..1d89aaa 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
@@ -18,6 +18,7 @@
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import com.vincent.rsf.server.system.service.impl.FieldsServiceImpl;
+import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -279,17 +280,18 @@
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, params.getOrderId()));
double total = orderItems.stream().mapToDouble(WkOrderItem::getQty).sum();
- order.setQty(total);
+ double wkQty = orderItems.stream().mapToDouble(WkOrderItem::getWorkQty).sum();
+ order.setQty(total).setWorkQty(order.getWorkQty() - wkQty);
if (!asnOrderService.updateById(order)) {
throw new CoolException("璁㈠崟鏁伴噺鏇存柊澶辫触锛侊紒");
}
-// //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
-// if (order.getAnfme().compareTo(order.getQty()) == 0) {
-// order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
-// if (!asnOrderService.updateById(order)) {
-// throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
-// }
-// }
+ //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
+ if (order.getAnfme().compareTo(order.getQty()) == 0) {
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
+ }
+ }
return R.ok();
}
@@ -304,9 +306,14 @@
@Transactional(rollbackFor = Exception.class)
@Synchronized
public R saveWavePick(ContainerWaveParam containerWaveParam, Long loginUserId) {
- if (null == containerWaveParam || containerWaveParam.getContainerWaveDtos().size() <= 0) {
+ if (null == containerWaveParam ) {
return R.error("鍙傛暟閿欒");
}
+ List<WkOrderItem> orderItems = containerWaveParam.getContainerWaveDtos();
+ if (Objects.isNull(orderItems) || orderItems.isEmpty()) {
+ return R.error("鏁版嵁閿欒锛侊紒");
+ }
+
Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, containerWaveParam.getContainer()));
if (null == task) {
return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
@@ -315,6 +322,21 @@
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ taskItems.forEach(taskItem -> {
+ if (!(taskItem.getQty().compareTo(taskItem.getAnfme()) == 0)) {
+ throw new CoolException("鏈夊崟鎹墿鏂欐湭鎷ｏ紝璇锋嫞瀹屽悗鍐嶇‘璁わ紒锛�");
+ }
+ });
+
+ orderItems.forEach(orderItem -> {
+ try {
+ taskService.saveOutStockItem(taskItems, orderItem, null, null, SystemAuthUtils.getLoginUserId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+
// containerWaveParam.getOrderItems().forEach(orderItem -> {
//
// });
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
index c67e035..317123c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
-import com.vincent.rsf.server.manager.entity.Task;
-import com.vincent.rsf.server.manager.entity.WaitPakin;
+import com.vincent.rsf.server.manager.entity.*;
import java.util.List;
@@ -29,4 +28,6 @@
Task operateComplete(Long id, Long loginUserId);
void moveToDeep(Long loginUserId, String curLoc) throws Exception;
+
+ void saveOutStockItem(List<TaskItem> taskItems, WkOrderItem orderItem, WaveItem waveItem, WkOrderItem diffItem, Long loginUserId) throws Exception;
}
\ No newline at end of file
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 82a7389..348bfd1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -1251,6 +1251,7 @@
* @description: 鍑哄簱淇℃伅淇濆瓨鑷冲簱瀛樻槑缁嗚〃
* @version 1.0
*/
+ @Override
@Transactional(rollbackFor = Exception.class)
public void saveOutStockItem(List<TaskItem> taskItems, WkOrderItem orderItem, WaveItem waveItem, WkOrderItem diffItem, Long loginUserId) throws Exception {
Stock stock = new Stock();
--
Gitblit v1.9.1