From bfc43ca0e4683c1c0322a6cad5d5be2bc07decc3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 15:00:44 +0800
Subject: [PATCH] 新增调拔单功能 盘点功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index e63a975..f767169 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.utils.LocUtils;
+import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.TaskStsType;
@@ -48,7 +49,6 @@
private ConfigService configService;
@Autowired
private LocServiceImpl locService;
-
@Value("${wcs-slave.doubleLocs}")
private List<Integer> rows;
@Autowired
@@ -93,14 +93,19 @@
/**
* 浠诲姟鑷姩涓嬪彂
+ *
* @throws Exception
*/
-// @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void taskToWCS() throws Exception {
Long loginUserId = SystemAuthUtils.getLoginUserId();
List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type);
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getTaskType, list).orderByDesc(Task::getSort));
+ List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskType, list)
+ .in(Task::getTaskStatus, integers)
+ .orderByDesc(Task::getSort));
for (Task task : tasks) {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, task.getBarcode()));
if (Objects.isNull(loc)) {
@@ -121,7 +126,11 @@
LocToTaskParams params = new LocToTaskParams();
params.setOrgLoc(shallowLoc).setType(TaskType.TASK_TYPE_LOC_MOVE.type + "");
//鐢熸垚绉诲簱浠诲姟
- locItemService.genMoveTask(params, loginUserId);
+ Task moveTask = locItemService.genMoveTask(params, loginUserId);
+ moveTask.setSort(!Objects.isNull(task.getSort()) ? task.getSort() + 1 : Constants.TASK_SORT_DEFAULT_VALUE + 1);
+ if (!taskService.updateById(moveTask)) {
+ throw new Exception("浠诲姟浼樺厛绾ф洿鏂板け璐ワ紒锛�");
+ }
}
//TODO 璋冪敤涓嬪彂浠诲姟鎺ュ彛
}
@@ -129,25 +138,25 @@
/**
* 姣忎簲绉掓牎楠屾繁搴撲綅鏄惁涓虹┖锛屽鏋滄祬搴撲綅鏈夎揣锛屽皢娴呭簱浣嶇Щ鑷虫繁搴撲綅
- */
- @Scheduled(cron = "0/35 * * * * ? ")
- @Transactional(rollbackFor = Exception.class)
- public void shallocToDeep() throws Exception {
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
- .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
- .in(Loc::getRow, rows));
- if (locs.isEmpty()) {
- return;
- }
- for (Loc loc : locs) {
- String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
- Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
- if (Objects.isNull(one) || !one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
- continue;
- }
- taskService.moveToDeep(SystemAuthUtils.getLoginUserId(), shallowLoc);
- }
- }
+ *///TODO 鐢熸垚绉诲簱浠诲姟鍓嶏紝闇�瑕佹鏌ユ槸鍚︽湁浠诲姟鍓嶅線褰撳墠鎵樼洏
+// @Scheduled(cron = "0/35 * * * * ? ")
+// @Transactional(rollbackFor = Exception.class)
+// public void shallocToDeep() throws Exception {
+// List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
+// .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+// .in(Loc::getRow, rows));
+// if (locs.isEmpty()) {
+// return;
+// }
+// for (Loc loc : locs) {
+// String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
+// Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+// if (Objects.isNull(one) || !one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+// continue;
+// }
+// taskService.moveToDeep(SystemAuthUtils.getLoginUserId(), shallowLoc);
+// }
+// }
/**
@@ -161,7 +170,7 @@
@Transactional(rollbackFor = Exception.class)
public void taskLogUpdate() {
LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>();
- Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ORDER_INOF_REPORT_PLAT));
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ORDER_INOF_REPORT_PLAT));//鏄惁涓婃姤骞冲彴
if (!Objects.isNull(config)) {
if (Boolean.parseBoolean(config.getVal())) {
queryWrapper.in(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
--
Gitblit v1.9.1