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/TaskSchedules.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 9247168..9feded2 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
@@ -122,7 +122,7 @@
public synchronized void missionTaskEXECUTE() {
try{
List<FlowStepInstance> flowStepInstanceList = flowStepInstanceService.list(new LambdaQueryWrapper<FlowStepInstance>()
- .eq(FlowStepInstance::getStatus, 1).in(FlowStepInstance::getStepType,MissionStepType.getTaskISSUE()));
+ .eq(FlowStepInstance::getStatus, (short) 1).in(FlowStepInstance::getStepType,MissionStepType.getTaskISSUE()));
for (FlowStepInstance flowStepInstance : flowStepInstanceList) {
FlowInstance flowInstance = flowInstanceService.getById(flowStepInstance.getFlowInstanceId());
if (Cools.isEmpty(flowInstance)) { continue;}
@@ -201,7 +201,7 @@
flowStepInstanceService.updateById(flowStepInstance);
log.error("浠诲姟涓嬪彂澶辫触,婧愮偣鏈煡璇㈠埌鐩爣鐐规湭鏌ヨ鍒帮紝绛夊緟閲嶈瘯....");
}
- return;
+ continue;
} else {
missionTaskIssueParam.setSourceCode(basStation.getStationName());
}
@@ -226,7 +226,7 @@
flowStepInstanceService.updateById(flowStepInstance);
log.error("浠诲姟涓嬪彂澶辫触,婧愮偣鏈煡璇㈠埌鐩爣鐐规湭鏌ヨ鍒帮紝绛夊緟閲嶈瘯....");
}
- return;
+ continue;
} else {
missionTaskIssueParam.setSourceCode(basStation.getStationName());
}
@@ -252,7 +252,7 @@
flowStepInstanceService.updateById(flowStepInstance);
log.error("浠诲姟涓嬪彂澶辫触,鐩爣鐐规湭鏌ヨ鍒帮紝绛夊緟閲嶈瘯....");
}
- return;
+ continue;
} else {
missionTaskIssueParam.setTargetCode(basStation.getStationName());
}
@@ -278,7 +278,7 @@
flowStepInstanceService.updateById(flowStepInstance);
log.error("浠诲姟涓嬪彂澶辫触,鐩爣鐐规湭鏌ヨ鍒帮紝绛夊緟閲嶈瘯....");
}
- return;
+ continue;
} else {
missionTaskIssueParam.setTargetCode(basStation.getStationName());
}
@@ -460,15 +460,17 @@
} else {
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
}
- String targSite = task.getTargSite();
- BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, targSite));
- basStation.setUseStatus("F");
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+ basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
basStation.setBarcode(task.getBarcode());
basStationService.updateById(basStation);
} else if (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)) {
- if (!Cools.isEmpty(task.getResource()) && task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)){
+ if ((!Cools.isEmpty(task.getResource()) && task.getResource().equals(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val))
+ // 鐩樼偣鍑哄簱鍏堝埌 196(闈炴尝娆�)
+ ||task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
+ ) {
task.setTaskStatus(TaskStsType.AWAIT.id);
} else {
task.setTaskStatus(TaskStsType.WAVE_SEED.id);
@@ -477,9 +479,8 @@
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPTY_OUT.type)){
task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
- String targSite = task.getTargSite();
- BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, targSite));
- basStation.setUseStatus("D");
+ BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+ basStation.setUseStatus(LocStsType.LOC_STS_TYPE_F.type);
basStation.setBarcode(task.getBarcode());
basStationService.updateById(basStation);
} else {
@@ -853,7 +854,9 @@
if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
throw new CoolException("鐩爣绔欑偣涓嶅O.绌洪棽鐘舵�侊紝鏃犳硶棰勭害鍑哄簱銆�");
}
- station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+ if (!station.getType().equals(0)){
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+ }
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
}
@@ -958,7 +961,9 @@
}
/**濡傛灉鏄櫘閫氱珯鐐癸紝淇敼绔欑偣鐘舵�佷负鍏ュ簱棰勭害*/
if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
- station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+ if (!station.getType().equals(0)){
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
+ }
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣棰勭害澶辫触锛侊紒");
}
--
Gitblit v1.9.1