From 7a92ebbfb8227ff30ebe3300cc9db263a75b7e22 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 05 三月 2026 13:06:15 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 7
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 20 ++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 12 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java | 12 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 169 ++++++++++++++++++++++++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java | 9 +
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 11 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java | 33 +++++-
13 files changed, 247 insertions(+), 43 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
index ffcaf89..3cf92ea 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
@@ -20,6 +20,7 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Api(tags = "PDA鑾峰彇淇℃伅鎺ュ彛")
@RequestMapping("/pda")
@@ -49,11 +50,15 @@
PageParam<BasStation, BaseParam> page = basStationService.page(pageParam, pageParam.buildWrapper(true));
for (BasStation station : page.getRecords()) {
if (!Cools.isEmpty(station.getCrossZoneArea())) {
- List<Long> longs1 = station.getCrossZoneArea();
+ List<Long> longs1 = station.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
station.setAreaIds(longs1);
}
if (!Cools.isEmpty(station.getContainerType())) {
- List<Long> longs1 = station.getContainerType();
+ List<Long> longs1 = station.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
station.setContainerTypes(longs1);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
index c29ee3d..74d1b2e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
@@ -22,6 +22,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
public class AgvServiceImpl implements AgvService {
@@ -83,7 +84,9 @@
if (Cools.isEmpty(basStation)) {
throw new CoolException("鏈壘鍒版帴椹崇珯鐐逛俊鎭紝璇锋鏌ョ珯鐐圭姸鎬�");
}
- List<Long> ids = basStation.getCrossZoneArea();
+ List<Long> ids = basStation.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
// ids.add(basStation.getArea());
// if (basStation.getIsCrossZone() == 1) {
// String content = basStation.getCrossZoneArea().substring(1,.length() - 1);
@@ -213,7 +216,9 @@
if (Cools.isEmpty(waitPakinItems)) {
throw new CoolException("鏁版嵁閿欒锛屾湭鎵惧埌缁勬墭鏄庣粏");
}
- List<Long> ids = basStation.getCrossZoneArea();
+ List<Long> ids = basStation.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
// ids.add(basStation.getArea());
// if (basStation.getIsCrossZone() == 1) {
// String content = basStation.getCrossZoneArea().substring(1, basStation.getCrossZoneArea().length() - 1);
@@ -274,7 +279,9 @@
throw new CoolException("鏈壘鍒扮珯鐐逛俊鎭�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
- List<Long> longs1 = basStation.getCrossZoneArea();
+ List<Long> longs1 = basStation.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
List<BasContainer> containers = basContainerService.list(
new LambdaQueryWrapper<BasContainer>()
.in(BasContainer::getContainerType, longs1)
@@ -330,12 +337,13 @@
throw new CoolException("绔欑偣涓哄厜鐢电珯鐐癸紝绂佹鍛煎彨AGV");
}
- List<Long> areaList = basStation.getCrossZoneArea();
- if (!areaList.contains(Long.parseLong(area))) {
+ if (!basStation.getCrossZoneArea().contains(Integer.parseInt(area))) {
throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洰鏍囧簱鍖�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
- List<Long> longs1 = basStation.getContainerType();
+ List<Long> longs1 = basStation.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
List<BasContainer> containers = basContainerService.list(
new LambdaQueryWrapper<BasContainer>()
.in(BasContainer::getContainerType, longs1)
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 358ea16..1c10002 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 = basStation.getContainerType();
+ 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<Long> areaList = basStation.getCrossZoneArea();
- if (!areaList.contains(Long.parseLong(area))) {
+ if (!basStation.getCrossZoneArea().contains(Integer.parseInt(area))) {
throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洰鏍囧簱鍖�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
- List<Long> longs1 = basStation.getContainerType();
+ List<Long> longs1 = basStation.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
List<BasContainer> containers = basContainerService.list(
new LambdaQueryWrapper<BasContainer>()
.in(BasContainer::getContainerType, longs1)
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 8de9724..289d40e 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
@@ -445,7 +445,9 @@
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
- List<Long> areaList = basStation.getCrossZoneArea();
+ List<Long> areaList = basStation.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
if (Cools.isEmpty(areaList)) {
throw new CoolException("褰撳墠绔欑偣搴撳尯鏈厤缃�");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
index e76bba3..3eee640 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
@@ -20,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class BasStationController extends BaseController {
@@ -35,11 +36,15 @@
PageParam<BasStation, BaseParam> page = basStationService.page(pageParam, pageParam.buildWrapper(true));
for (BasStation station : page.getRecords()) {
if (!Cools.isEmpty(station.getCrossZoneArea())) {
- List<Long> longs1 = station.getCrossZoneArea();
+ List<Long> longs1 = station.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
station.setAreaIds(longs1);
}
if (!Cools.isEmpty(station.getContainerType())) {
- List<Long> longs1 = station.getContainerType();
+ List<Long> longs1 = station.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
station.setContainerTypes(longs1);
}
@@ -72,11 +77,15 @@
public R get(@PathVariable("id") Long id) {
BasStation station = basStationService.getById(id);
if (!Cools.isEmpty(station.getCrossZoneArea())) {
- List<Long> longs1 = station.getCrossZoneArea();
+ List<Long> longs1 = station.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
station.setAreaIds(longs1);
}
if (!Cools.isEmpty(station.getContainerType())) {
- List<Long> longs1 = station.getContainerType();
+ List<Long> longs1 = station.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
station.setContainerTypes(longs1);
}
@@ -96,10 +105,14 @@
return R.error(basStation.getStationName()+"绔欏凡琚垵濮嬪寲");
}
if (null !=basStation.getAreaIds()){
- basStation.setCrossZoneArea(basStation.getAreaIds());
+ basStation.setCrossZoneArea(basStation.getAreaIds().stream()
+ .map(Long::intValue)
+ .collect(Collectors.toList()));
}
if (null !=basStation.getContainerTypes()){
- basStation.setContainerType(basStation.getContainerTypes());
+ basStation.setContainerType(basStation.getContainerTypes().stream()
+ .map(Long::intValue)
+ .collect(Collectors.toList()));
}
if (Cools.isEmpty(basStation.getStationAlias())){
basStation.setStationAlias(new ArrayList<>());
@@ -120,10 +133,14 @@
basStation.setUpdateBy(getLoginUserId());
basStation.setUpdateTime(new Date());
if (null !=basStation.getAreaIds() && !basStation.getContainerTypes().isEmpty()){
- basStation.setCrossZoneArea(basStation.getAreaIds());
+ basStation.setCrossZoneArea(basStation.getAreaIds().stream()
+ .map(Long::intValue)
+ .collect(Collectors.toList()));
}
if (null != basStation.getContainerTypes() && !basStation.getContainerTypes().isEmpty()){
- basStation.setContainerType(basStation.getContainerTypes());
+ basStation.setContainerType(basStation.getContainerTypes().stream()
+ .map(Long::intValue)
+ .collect(Collectors.toList()));
}
if (null !=basStation.getUseStatus() && basStation.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)){
basStation.setBarcode(null);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index 5ef6604..bb7b249 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -89,7 +89,7 @@
*/
@ApiModelProperty(value = "鍙法鍖哄尯鍩焛d")
@TableField(typeHandler = JacksonTypeHandler.class)
- private List<Long> crossZoneArea;
+ private List<Integer> crossZoneArea;
/**
* 鏄惁wcs绔欑偣
@@ -108,7 +108,7 @@
*/
@ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
@TableField(typeHandler = JacksonTypeHandler.class)
- private List<Long> containerType;
+ private List<Integer> containerType;
/**
* 鏉＄爜
@@ -276,4 +276,6 @@
return null;
}
}
+
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 782c27b..82061e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -212,7 +212,7 @@
private String endStep;
@TableField(typeHandler = JacksonTypeHandler.class)
- private List<Integer> targSiteArea;
+ private List<String> targSiteArea;
private String targLocArea;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
index ad8549b..630403a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
@@ -19,7 +19,7 @@
TASK_TYPE_PICK_AGAIN_OUT("103", "鎷ｆ枡鍑哄簱"),
TASK_TYPE_MERGE_OUT("104", "骞舵澘鍑哄簱"),
TASK_TYPE_CHECK_OUT("107", "鐩樼偣鍑哄簱"),
- TASK_TYPE_CROSS_DOCKING_OUT("109", "瓒婂簱"),
+ TASK_TYPE_CROSS_DOCKING_OUT("109", "澶囪揣"),
TASK_TYPE_EMPTY_OUT("110", "绌烘澘鍑哄簱"),
;
public Integer type;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
index b6526ed..12add74 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
@@ -101,15 +101,19 @@
* @description: 鑷姩瀹屾垚鐩樼偣鍔熻兘
* @version 1.0
*/
-// @Scheduled(cron = "0/25 * * * * ?")
+ @Scheduled(cron = "0/25 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void autoCheckComplete() {
//鑾峰彇浠诲姟鍒楄〃涓紝涓虹洏鐐瑰嚭搴撶殑浠诲姟
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.in(Task::getTaskType, Arrays.asList(TaskType.TASK_TYPE_CHECK_OUT.type,
- TaskType.TASK_TYPE_PICK_IN.type,
- TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
- TaskType.TASK_TYPE_CHECK_IN.type)));
+// TaskType.TASK_TYPE_PICK_IN.type,
+ TaskType.TASK_TYPE_PICK_AGAIN_OUT.type
+// ,
+// TaskType.TASK_TYPE_CHECK_IN.type
+ )
+ )
+ );
if (!tasks.isEmpty()) {
tasks.forEach(task -> {
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 64c43bd..5ea60ab 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
@@ -456,9 +456,10 @@
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) {
+ || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+ task.setTaskStatus(TaskStsType.AWAIT.id);
+ } else if ( task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)) {//澶囪揣
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
}
taskService.updateById(task);
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 9486159..264c649 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
@@ -177,7 +177,7 @@
throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
}
- //澧炲姞瀵瑰璐у崟寰楀垽鏂�
+ //澧炲姞瀵瑰璐у崟鐨勫垽鏂�
Integer taskStatus = resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)
? TaskStsType.MISSION_INITIAL.id:TaskStsType.MISSION_INITIAL.id;
@@ -194,6 +194,7 @@
.setUpdateTime(new Date())
.setTaskStatus(taskStatus)
.setBarcode(loc.getBarcode())
+ .setTargSiteArea(map.getTargSiteAreaList())
.setMemo(map.getMemo());
List<LocItem> locItems = this.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, key));
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 a3a28ed..db8643e 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
@@ -494,12 +494,13 @@
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
- List<Long> areaList = basStation.getCrossZoneArea();
- if (!areaList.contains(Long.parseLong(area))) {
+ if (!basStation.getCrossZoneArea().contains(Integer.parseInt(area))) {
throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洰鏍囧簱鍖�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
- List<Long> longs1 = basStation.getContainerType();
+ List<Long> longs1 = basStation.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
List<BasContainer> containers = basContainerService.list(
new LambdaQueryWrapper<BasContainer>()
.in(BasContainer::getContainerType, longs1)
@@ -558,7 +559,9 @@
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
- List<Long> longs1 = basStation.getContainerType();
+ List<Long> longs1 = basStation.getContainerType().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
List<BasContainer> containers = basContainerService.list(
new LambdaQueryWrapper<BasContainer>()
.in(BasContainer::getContainerType, longs1)
@@ -612,7 +615,9 @@
}
warehouseAreasList.add(warehouseArea);
} else {
- List<Long> areaList = basStation.getCrossZoneArea();
+ List<Long> areaList = basStation.getCrossZoneArea().stream()
+ .map(Integer::longValue)
+ .collect(Collectors.toList());
if (areaList.isEmpty()) {
throw new CoolException("褰撳墠绔欑偣搴撳尯鏈厤缃�");
}
@@ -992,10 +997,12 @@
complateOutStockDocking(task, loginUserId);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
//107.鐩�
- pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_CHECK);
+// pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_CHECK);
+ complateOutStock2(task, loginUserId);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
//103.鎷ｉ��
- pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_PICK);
+// pickOrCheckTask(task.getId(), Constants.TASK_TYPE_OUT_PICK);
+ complateOutStock2(task, loginUserId);
} else {
complateOutStock(task, loginUserId);
}
@@ -1498,6 +1505,154 @@
*/
@Synchronized
@Transactional(rollbackFor = Exception.class)
+ public void complateOutStock2(Task task, Long loginUserId) throws Exception {
+ if (Objects.isNull(task)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ throw new CoolException("搴撲綅鐘舵�佷笉澶勭悊浜嶳.鍑哄簱棰勭害锛侊紒");
+ }
+
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (taskItems.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
+ if (locItems.isEmpty()) {
+ throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ List<LocItemWorking> workings = new ArrayList<>();
+ for (LocItem item : locItems) {
+ LocItemWorking working = new LocItemWorking();
+ BeanUtils.copyProperties(item, working);
+ working.setId(null)
+ .setTaskId(task.getId())
+ .setLocItemId(item.getId())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date());
+ workings.add(working);
+ }
+
+ if (!locItemWorkingService.saveBatch(workings)) {
+ throw new CoolException("涓存椂搴撳瓨淇濆瓨澶辫触锛侊紒");
+ }
+
+ try {
+ //鏇存柊搴撲綅鏄庣粏
+ subtractLocItem(loc);
+ } catch (Exception e) {
+ logger.error("<UNK>", e);
+ throw new CoolException(e.getMessage());
+ }
+
+ //娣诲姞鍑哄叆搴撹褰曚俊鎭�
+ Map<Short, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getWkType));
+ /***鑾峰彇搴撳瓨鍑哄簱鍊硷紝濡傛灉涓虹┖琛ㄧず姝ｅ父鍗曟嵁鍑哄簱锛岄潪绌鸿〃鏄庢槸搴撳瓨鍑哄簱
+ * 1. 搴撳瓨鍑哄簱娌℃湁鍗曟嵁淇℃伅锛屽崟鎹俊鎭粯璁や负绌�
+ * 2. 鍗曟嵁搴撳瓨闇�閫氳繃娉㈡鏌ヨ鍘熷鍗曟嵁淇℃伅锛屽皢鍗曟嵁淇℃伅濉叆stock涓�
+ * */
+ List<TaskItem> list = listMap.get(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type));
+ if (Objects.isNull(list) || list.isEmpty()) {
+ Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
+ maps.keySet().forEach(key -> {
+ if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)) {
+ WaveItem waveItem = waveItemService.getById(key);
+ if (Objects.isNull(waveItem)) {
+ throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+// try {
+// saveOutStockItem(maps.get(key), null, waveItem, null, loginUserId);
+// } catch (Exception e) {
+// throw new CoolException(e.getMessage());
+// }
+ } else if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val)) {
+ WkOrderItem orderItem = asnOrderItemService.getById(key);
+ if (Objects.isNull(orderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ try {
+ saveOutStockItem(maps.get(key), orderItem, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ } else if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)) {
+ WkOrderItem orderItem = asnOrderItemService.getById(key);
+ if (Objects.isNull(orderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ try {
+ saveOutStockItem(maps.get(key), null, null, orderItem, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ } else {
+
+ }
+ });
+ } else {
+ try {
+ saveOutStockItem(taskItems, null, null, null, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+
+ /**淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱*/
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ .set(Loc::getBarcode, null)
+ .set(Loc::getUpdateBy, loginUserId)
+ .set(Loc::getUpdateTime, new Date())
+ .eq(Loc::getId, loc.getId()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ if (!this.update(new LambdaUpdateWrapper<Task>()
+ .eq(Task::getId, task.getId())
+ .set(Task::getUpdateBy, loginUserId)
+ .set(Task::getUpdateTime, new Date())
+ .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
+ throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
+// if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+// if (!this.update(new LambdaUpdateWrapper<Task>()
+// .eq(Task::getId, task.getId())
+// .set(Task::getUpdateBy, loginUserId)
+// .set(Task::getUpdateTime, new Date())
+// .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
+// throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+// } else {
+// if (!this.update(new LambdaUpdateWrapper<Task>()
+// .eq(Task::getId, task.getId())
+// .set(Task::getUpdateBy, loginUserId)
+// .set(Task::getUpdateTime, new Date())
+// .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
+// throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�");
+// }
+//// //鍏ㄦ澘鍑哄簱锛屽垹闄や复鏃跺簱瀛�
+//// if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) {
+//// throw new CoolException("涓存椂搴撳瓨娓呴櫎澶辫触锛侊紒");
+//// }
+// }
+
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/5/20
+ * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板嚭搴撳簱瀛樹俊鎭�
+ * @version 1.0
+ */
+ @Synchronized
+ @Transactional(rollbackFor = Exception.class)
public void complateOutStock(Task task, Long loginUserId) throws Exception {
if (Objects.isNull(task)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index da7af21..124e0bb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -233,11 +233,17 @@
orderOutItemDto.setLoc(loc);
orderOutItemDto.getLocItemList().add(locItem);
BasContainer containerType = getContainerType(loc.getBarcode());
+ if (Cools.isEmpty(containerType)){
+ continue;
+ }
List<BasStationArea> basStationAreas = basStationAreaService.list(new LambdaQueryWrapper<BasStationArea>()
- .apply("JSON_CONTAINS(cross_zone_area, '{0}') = 1", loc.getAreaId())//鍙墽琛屽簱鍖哄尯鍖哄煙id
- .apply("JSON_CONTAINS(container_type, '{0}') = 1", containerType)//瀹瑰櫒绫诲瀷
-// .apply("JSON_CONTAINS(station_alias, '\"{0}\"') = 1", null)//鍖哄煙鍖呭惈绔欑偣闆�
+ .apply("cross_zone_area != '[]'") // 涓嶆槸绌烘暟缁�
+ .apply("container_type != '[]'") // 涓嶆槸绌烘暟缁�
+ .apply("station_alias != '[]'") // 涓嶆槸绌烘暟缁�
+ .apply("JSON_CONTAINS(cross_zone_area, '{0}') = 1", loc.getAreaId().toString())//鍙墽琛屽簱鍖哄尯鍖哄煙id
+ .apply("JSON_CONTAINS(container_type, '{0}') = 1", containerType.getContainerType().toString())//瀹瑰櫒绫诲瀷
.eq(BasStationArea::getDeleted, 0));// 閫氬父闇�瑕佸姞涓婃湭鍒犻櫎鏉′欢
+// .apply("JSON_CONTAINS(station_alias, '\"{0}\"') = 1", null)//鍖哄煙鍖呭惈绔欑偣闆�
List<String> targSiteAreaList = new ArrayList<>();
for (BasStationArea basStationArea : basStationAreas) {
targSiteAreaList.add(basStationArea.getStationAreaId());
--
Gitblit v1.9.1