From 6212655d5e574ed473a7670f918c0fcd7f00d003 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 三月 2026 14:55:50 +0800
Subject: [PATCH] 任务管理完结功能
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 c5ece92..fd84f81 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
@@ -80,7 +80,9 @@
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
- List<Long> longs1 = JSONObject.parseArray(basStation.getContainerType(), Long.class);
+ List<Long> longs1 = basStation.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
List<BasContainer> containers = basContainerService.list(
new LambdaQueryWrapper<BasContainer>()
.in(BasContainer::getContainerType, longs1)
@@ -131,12 +133,13 @@
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
- List<String> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), String.class);
- if (!areaList.contains(area)) {
+ if (!basStation.getCrossZoneArea().contains(Integer.parseInt(area))) {
throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洰鏍囧簱鍖�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
- List<Long> longs1 = JSONObject.parseArray(basStation.getContainerType(), Long.class);
+ List<Long> longs1 = basStation.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
List<BasContainer> containers = basContainerService.list(
new LambdaQueryWrapper<BasContainer>()
.in(BasContainer::getContainerType, longs1)
@@ -317,11 +320,11 @@
.setTaskCode(ruleCode)
.setOrgLoc(loc.getCode())
.setTargSite(station.getStationName())
- .setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
- .setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
+ .setResource(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val)
+ .setTaskType(TaskType.TASK_TYPE_OUT.type)
.setTaskStatus(TaskStsType.MISSION_INITIAL.id)
.setWarehType(WarehType.WAREHOUSE_TYPE_AGV.val)
- .setBarcode(param.getContainerNo())
+ .setBarcode(loc.getBarcode())
.setCreateTime(new Date())
.setUpdateBy(loginUserId)
.setUpdateTime(new Date())
@@ -346,7 +349,7 @@
.setSplrBatch(item.getBatch())
.setPlatWorkCode(item.getPlatWorkCode())
.setPlatItemId(item.getPlatItemId())
- .setOrderType(OrderType.ORDER_IN.type)
+ .setOrderType(OrderType.ORDER_OUT.type)
.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
taskItems.add(taskItem);
}
--
Gitblit v1.9.1