From e19163def1da10e16ad5baf58131a1563acfe7e1 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 二月 2026 15:24:21 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 16 ++++++++--------
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 6 +++---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 16 +++++++++++++---
8 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
index 9a4f334..c50d583 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -242,7 +242,7 @@
}
Task task = new Task();
task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setTaskType(TaskType.TASK_TYPE_EMPTY_IN.type)
.setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)//lsh寰呬慨鏀�
.setTargLoc(targetLoc)
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 8427aa3..32cdab7 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
@@ -274,7 +274,7 @@
if (Cools.isEmpty(loc)){
throw new CoolException("鏈煡璇㈠埌绗﹀悎鏉′欢鐨勬墭鐩�");
}
- //鐢熸垚鐩樼偣浠诲姟鍙傛暟
+ //鐢熸垚浠诲姟鍙傛暟
LocToTaskParams locToTaskParams = new LocToTaskParams();
locToTaskParams.setType(Constants.TASK_TYPE_OUT_STOCK_EMPTY)
.setSiteNo(basStation.getStationName())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index bf9a516..2d28fc9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -31,6 +31,8 @@
import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.manager.enums.LocStsType;
+import com.vincent.rsf.server.system.entity.User;
+import com.vincent.rsf.server.system.service.impl.UserServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -82,6 +84,8 @@
private RestTemplate restTemplate;
@Autowired
private RemotesInfoProperties.RcsApi rcsApi;
+ @Autowired
+ private UserServiceImpl userService;
@Override
@@ -201,7 +205,7 @@
String targetSite, String sourceSiteNo, Long loginUserId) {
Task task = new Task();
task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setTaskType(TaskType.TASK_TYPE_IN.type)
.setWarehType(WarehType.WAREHOUSE_TYPE_CRN.val)
.setTargLoc(targetLoc)
@@ -1011,7 +1015,13 @@
GenerateTaskParams taskParams = new GenerateTaskParams();
taskParams.setWaitPakins(waitPakins)
.setSiteId(basStation.getId());
- R r = taskService.generateTasksWcs(taskParams, 111L,params.getRowList());//lsh寰呬慨鏀� WCS鐢ㄦ埛淇℃伅
+
+ User wcs = userService.getByUsername("wcs", 1L);
+ Long wcsId = 1111L;
+ if (!Cools.isEmpty(wcs)) {
+ wcsId = wcs.getId();
+ }
+ R r = taskService.generateTasksWcs(taskParams, wcsId,params.getRowList());
if (r.get("msg").equals("浠诲姟鐢熸垚瀹屾瘯锛�")) {
one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
InTaskWcsReportParam inTaskWcsReportParam = new InTaskWcsReportParam();
@@ -1075,7 +1085,7 @@
}
if (params.getMsgType().equals(WcsMsgTypeEvent.TASK_COMPLETE.event)){
if (!Cools.isEmpty(one)) {
- one.setTaskStatus(TaskStsType.GENERATE_IN.id);
+ one.setTaskStatus(TaskStsType.MISSION_INITIAL.id);
one.setOrgSite(one.getTargSite());
if (!taskService.updateById(one)) {
// throw new CoolException("瀹屾垚浠诲姟澶辫触");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
index 3e5a60a..c3ccfb1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
@@ -380,7 +380,7 @@
continue;
}
String shallowLoc = LocUtils.getDeepLoc(locMast1.getCode());
- if ((ioType == TaskStsType.GENERATE_IN.id && deviceBind.getBeSimilar().equals("1"))) {
+ if ((ioType == TaskStsType.MISSION_INITIAL.id && deviceBind.getBeSimilar().equals("1"))) {
//鐩镐技鐗╂枡鎵撳紑锛屽垽鏂繁搴撲綅鏈夋病鏈夎揣锛屾病璐у氨鏀炬繁搴撲綅锛屾湁璐у氨涓嶆搷浣�
Loc locMast2 = locService.getOne(new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, shallowLoc)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
index 18b8ada..59d6eb7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
@@ -51,7 +51,7 @@
public void genReCheck() {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.select(Task::getId)
- .eq(Task::getTaskStatus, TaskStsType.GENERATE_OUT.id)
+ .eq(Task::getTaskStatus, TaskStsType.MISSION_INITIAL.id)
.eq(Task::getTaskType, TaskType.TASK_TYPE_CHECK_OUT.type));
if (tasks.isEmpty()) {
return;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index 6b434a1..d1cb0cf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -296,7 +296,7 @@
.setTargSite(checkItem.getSiteNo())
.setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
- .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setCreateTime(new Date())
.setUpdateBy(loginUserId)
.setUpdateTime(new Date())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index f926834..b2bcdf1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -98,7 +98,7 @@
.setCreateBy(loginUserId)
.setCreateTime(new Date())
.setUpdateTime(new Date())
- .setTaskStatus(TaskStsType.GENERATE_OUT.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setBarcode(loc.getBarcode())
.setMemo(map.getMemo());
@@ -177,7 +177,7 @@
//澧炲姞瀵瑰璐у崟寰楀垽鏂�
Integer taskStatus = resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
- ? TaskStsType.MISSION_INITIAL.id:TaskStsType.GENERATE_OUT.id;
+ ? TaskStsType.MISSION_INITIAL.id:TaskStsType.MISSION_INITIAL.id;
Task moveTask = new Task();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
@@ -411,7 +411,7 @@
.setUpdateBy(loginUserId)
.setSort(Constants.TASK_SORT_DEFAULT_VALUE)
.setUpdateTime(new Date())
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setBarcode(orgLoc.getBarcode())
.setMemo(map.getMemo());
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 5f36d3a..732a3fa 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
@@ -150,7 +150,7 @@
}
Task task = new Task();
task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setTaskType(TaskType.TASK_TYPE_IN.type)
.setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
.setTargLoc(targetLoc)
@@ -366,7 +366,7 @@
}
Task task = new Task();
task.setTaskCode(ruleCode)
- .setTaskStatus(TaskStsType.GENERATE_IN.id)
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setTaskType(TaskType.TASK_TYPE_IN.type)
.setResource(TaskResouceType.TASK_RESOUCE_PAKIN_TYPE.val)
.setTargLoc(targetLoc)
@@ -776,7 +776,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Task taskToTop(Long id, Long loginUserId) throws Exception {
- List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id);
Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
if (Objects.isNull(tasks)) {
throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
@@ -800,7 +800,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Task operateComplete(Long id, Long loginUserId) {
- List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id);
Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
.eq(Task::getId, id)
.in(Task::getTaskStatus, longs));
@@ -1071,7 +1071,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R removeTask(Long[] ids, Long loginUserId) {
- List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Integer> longs = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id);
List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPTY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type,
TaskType.TASK_TYPE_EMPTY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
@@ -1084,7 +1084,7 @@
}
for (Task task : tasks) {
//鍙栨秷绉诲簱浠诲姟
- if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id)) {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.MISSION_INITIAL.id)) {
if (!locService.update(new LambdaUpdateWrapper<Loc>()
.eq(Loc::getCode, task.getOrgLoc())
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type))) {
@@ -1312,7 +1312,7 @@
task.setTaskCode(ruleCode)
.setTaskType(type)
.setBarcode(task.getBarcode())
- .setTaskStatus(TaskStsType.GENERATE_IN.id);
+ .setTaskStatus(TaskStsType.MISSION_INITIAL.id);
TaskInParam param = new TaskInParam();
param.setSourceStaNo(task.getTargSite())
@@ -1693,7 +1693,7 @@
if (Objects.isNull(ids) || ids.isEmpty()) {
return R.error("浠诲姟缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Integer> integers = Arrays.asList(TaskStsType.MISSION_INITIAL.id, TaskStsType.MISSION_INITIAL.id);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.in(Task::getId, ids)
.in(Task::getTaskStatus, integers)
--
Gitblit v1.9.1