From b68cf299e68473295dba11d94cc2e70a19dc673a Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 31 三月 2025 15:50:06 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 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 d3ef48a..59b033c 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
@@ -2,22 +2,21 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.TaskType;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.mapper.TaskMapper;
-import com.vincent.rsf.server.manager.service.LocService;
-import com.vincent.rsf.server.manager.service.TaskService;
+import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.WaitPakinItemService;
-import com.vincent.rsf.server.manager.service.WaitPakinService;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,6 +30,9 @@
@Autowired
private WaitPakinService waitPakinService;
+
+ @Autowired
+ private TaskItemService taskItemService;
@Autowired
private WaitPakinItemService waitPakinItemService;
@@ -64,7 +66,6 @@
}
List<Task> tasks = new ArrayList<>();
- List<TaskItem> taskItems = new ArrayList<>();
waitPakins.forEach(pakin -> {
Task task = new Task();
task.setTaskCode(ruleCode)
@@ -79,15 +80,28 @@
if (!this.saveBatch(tasks)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
}
-
- //TODO 淇濆瓨浠诲姟妗ｆ槑缁�
- waitPakinItems.forEach(item -> {
- TaskItem taskItem = new TaskItem();
-
- taskItems.add(taskItem);
- });
-
- return null;
+ List<Long> orderIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
+ List<Task> taskList = this.list(new LambdaQueryWrapper<Task>().in(Task::getId, orderIds));
+ if (taskList.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氳鍗旾D涓嶈兘涓虹┖锛侊紒");
+ }
+ for (Task task : taskList) {
+ List<TaskItem> taskItems = new ArrayList<>();
+ waitPakinItems.forEach(item -> {
+ TaskItem taskItem = new TaskItem();
+ BeanUtils.copyProperties(item, taskItem);
+ taskItem.setTaskId(task.getId())
+ .setOrderType(OrderType.ORDER_RECEIPT.type)
+ .setSourceCode(item.getAsnCode())
+ .setOrderId(item.getAsnId())
+ .setOrderItemId(item.getAsnItemId());
+ taskItems.add(taskItem);
+ });
+ if (!taskItemService.saveBatch(taskItems)) {
+ throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ }
+ return R.ok("浠诲姟鐢熸垚瀹屾瘯锛�");
}
--
Gitblit v1.9.1