From 2e550be60b3bbd14a61695489ec1fc242fd0e38a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 25 六月 2025 13:22:19 +0800
Subject: [PATCH] #出库完成变为等待确认
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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 3430a52..8b0bba2 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
@@ -464,7 +464,7 @@
// if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
// task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
// } else {
- task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
+ task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.AWAIT.id);
// }
if (!this.updateById(task)) {
throw new CoolException("瀹屾垚浠诲姟澶辫触");
@@ -790,7 +790,7 @@
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (!taskItems.isEmpty()) {
for (TaskItem item : taskItems) {
- if (item.getOrderType().equals(OrderType.ORDER_OUT.type)) {
+ if (!Objects.isNull(item.getOrderType()) && item.getOrderType().equals(OrderType.ORDER_OUT.type)) {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
if (Objects.isNull(loc)) {
throw new CoolException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉瀛樺湪锛侊紒");
--
Gitblit v1.9.1