From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
index fad1ee1..241be87 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
@@ -153,11 +153,14 @@
 	 * @param trackStatus 出入库状态
 	 * @return 是否更新成功
 	 */
-	boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus);
+	boolean updateTrackStatusByDeviceId(Long deviceId, Integer trackStatus, String outTarget);
 
 	/**
 	 * 查询非本部门区域的设备
+	 *
+	 * @param regionCode 区域编码，用于查询不在该区域内的设备
+	 * @param deptId 机构ID，用于限定查询范围
 	 * @return 设备列表
 	 */
-	List<FwDeviceVO> getNonDeptAreaDevices();
+	List<FwDeviceVO> getNonDeptAreaDevices(String regionCode, String deptId);
 }

--
Gitblit v1.9.3