From 79843611908e58f9538f8d8ebac62d3f0d01712c Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 17:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java
index 2f27222..0cdb7ce 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOtherController.java
@@ -45,4 +45,33 @@
         return pdaOtherService.inspectConfirm2(generalParam);
     }
 
+    @RequestMapping(value = "/other/station/page")
+    public R stationPage(@RequestParam String staNo,
+                          @RequestParam(defaultValue = "1") Integer curr,
+                          @RequestParam(defaultValue = "5") Integer limit) {
+
+        return pdaOtherService.stationPage(staNo,curr,limit);
+    }
+
+
+    @PostMapping(value = "/other/staOperate")
+    public R staOperate(@RequestBody PdaGeneralParam generalParam) {
+
+        return pdaOtherService.staOperate(generalParam,getLoginUser());
+    }
+
+    @RequestMapping(value = "/other/loc/page")
+    public R locPage(@RequestParam String locNo,
+                         @RequestParam(defaultValue = "1") Integer curr,
+                         @RequestParam(defaultValue = "5") Integer limit) {
+
+        return pdaOtherService.locPage(locNo,curr,limit);
+    }
+
+    @PostMapping(value = "/other/locOperate")
+    public R locOperate(@RequestBody PdaGeneralParam generalParam) {
+
+        return pdaOtherService.locOperate(generalParam,getLoginUser());
+    }
+
 }

--
Gitblit v1.9.1