From eba3ce4a22ea7bd74c6ad4a9114039c3ce43f476 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 21 一月 2026 14:52:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 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 d5f77f6..753449e 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
@@ -380,6 +380,22 @@
}
+ /**鍒ゆ柇鏄惁璧风偣绯荤粺绫诲瀷 闈炴爣鍑嗙▼搴�*/
+ Loc loc = null;
+ if (task.getTaskType()>=TaskType.TASK_TYPE_OUT.type) {
+ loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("婧愬簱浣嶄笉瀛樺湪锛侊紒");
+ }
+ }
+
+ if (!Objects.isNull(loc)) {
+ taskParams.setSign(LocStsWcsOrOtherType.getApiType(loc.getAreaId$()));
+ } else {
+ taskParams.setSign(LocStsWcsOrOtherType.LOC_STS_TYPE_RCS.type);
+ }
+
+
/**鍒ゆ柇鏄惁鍏夌數绔欑偣锛岄潪鍏夊簵绔欑偣闇�绠℃帶绔欑偣鐘舵��*/
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)) {
--
Gitblit v1.9.1