From b69d8253dbf8b29bca1ac5f6cf1f305e5e188f0a Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 12 三月 2026 15:33:46 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
index e6f0307..d73e80d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskMissionSchedules.java
@@ -173,10 +173,10 @@
if (targSiteArea != null && !targSiteArea.isEmpty()) {
for (String areaId : targSiteArea) {
BasStationArea basStationArea = basStationAreaService.getById(Long.parseLong(areaId));
- if (basStationArea == null || basStationArea.getStationAlias() == null || basStationArea.getStationAlias().isEmpty()) {
+ if (basStationArea == null || basStationArea.getStationAliasStaNo() == null || basStationArea.getStationAliasStaNo().isEmpty()) {
continue;
}
- siteList.put(basStationArea.getStationAreaId(), basStationArea.getStationAlias());
+ siteList.put(basStationArea.getStationAreaId(), basStationArea.getStationAliasStaNo());
// siteList.addAll(basStationArea.getStationAlias());
}
if (!siteList.isEmpty()) {
@@ -234,7 +234,6 @@
public boolean generateActualPath(Task task,TaskPathTemplateMerge taskPathTemplateMerge,boolean endSignUp) {
- boolean actualPath = false;
List<Integer> conditionExpression = taskPathTemplateMerge.getConditionExpression();
Integer i = 0;//it椤哄簭
Integer j = 0;//suT椤哄簭
@@ -349,17 +348,13 @@
if (basStation == null){
return false;
}
- if (!basStation.getType().equals(0)){
+ if (!basStation.getType().equals(0) && !task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)){
basStation.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+ basStation.setBarcode(task.getBarcode());
basStationService.updateById(basStation);
}
}
-
-
-
taskService.updateById(task);
- return actualPath;
+ return true;
}
-
-
}
--
Gitblit v1.9.1