From 8887422e04d93e8ab4b6d9a5c071eb6c64778995 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 13:34:36 +0800
Subject: [PATCH] 光电站点改为智能站点
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 2 +-
.gitignore | 3 ++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 8 ++++----
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/StationTypeEnum.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index 40a9521..0a1a46b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,5 @@
.DS_Store
**/.DS_Store
logs
-logs/**
\ No newline at end of file
+logs/**
+/log.path_IS_UNDEFINED/*.log
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 adbcaeb..7b7e4c9 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
@@ -327,7 +327,7 @@
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
if (basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
- throw new CoolException("绔欑偣涓哄厜鐢电珯鐐癸紝绂佹鍛煎彨AGV");
+ throw new CoolException("绔欑偣涓烘櫤鑳界珯鐐癸紝绂佹鍛煎彨AGV");
}
List<String> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), String.class);
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 9de8f34..060734a 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
@@ -991,7 +991,7 @@
throw new CoolException(params.getSourceStaNo()+"绔欑偣涓嶅瓨鍦紒锛�");
}
if (!basStation.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
- throw new CoolException(params.getSourceStaNo()+"绔欑偣闈炲厜鐢电珯鐐癸紒锛佽浣跨敤PDA缁戝畾鍏ュ簱");
+ throw new CoolException(params.getSourceStaNo()+"绔欑偣闈炴櫤鑳界珯鐐癸紒锛佽浣跨敤PDA缁戝畾鍏ュ簱");
}
Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
if (!Cools.isEmpty(one)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/StationTypeEnum.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/StationTypeEnum.java
index 9114759..9a233be 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/StationTypeEnum.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/StationTypeEnum.java
@@ -8,7 +8,7 @@
*/
public enum StationTypeEnum {
//绔欑偣绫诲瀷
- STATION_TYPE_MUTI(0, "鍏夌數绔欑偣"),
+ STATION_TYPE_MUTI(0, "鏅鸿兘绔欑偣"),
STATION_TYPE_NORMAL(1, "鏅�氱珯鐐�"),
;
/**绔欑偣绫诲瀷*/
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 8b123b5..d65e968 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
@@ -415,7 +415,7 @@
}
//
// /**
-// * 闈炲厜鐢电珯鐐逛换鍔′笅鍙�
+// * 闈炴櫤鑳界珯鐐逛换鍔′笅鍙�
// */
// @Scheduled(cron = "0/5 * * * * ? ")
// @Transactional(rollbackFor = Exception.class)
@@ -436,7 +436,7 @@
// .eq(BasStation::getStationName,
// task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
// if (Cools.isEmpty(station)){
-// log.info("闈炲厜鐢电珯鐐逛换鍔′笅鍙戯細绔欑偣淇℃伅寮傚父锛屼换鍔′俊鎭細"+ JSON.toJSONString(task));
+// log.info("闈炴櫤鑳界珯鐐逛换鍔′笅鍙戯細绔欑偣淇℃伅寮傚父锛屼换鍔′俊鎭細"+ JSON.toJSONString(task));
// continue;
// }
// if (station.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
@@ -451,7 +451,7 @@
// /**
// * @author Ryan
// * @date 2025/9/4
-// * @description: 鍏夌數绔欑偣浠诲姟涓嬪彂
+// * @description: 鏅鸿兘绔欑偣浠诲姟涓嬪彂
// * @version 1.0
// */
// @Scheduled(cron = "0/5 * * * * ? ")
@@ -603,7 +603,7 @@
}
- /**鍒ゆ柇鏄惁鍏夌數绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/ //鐩爣绔欑偣
+ /**鍒ゆ柇鏄惁鏅鸿兘绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/ //鐩爣绔欑偣
if (!Objects.isNull(station) && station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type && !task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
// if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
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 1daacaa..5f36d3a 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
@@ -1739,7 +1739,7 @@
}
}
- /**鍒ゆ柇鏄惁鍏夌數绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/
+ /**鍒ゆ柇鏄惁鏅鸿兘绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/
if (!Objects.isNull(station) && station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type && !task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
--
Gitblit v1.9.1