From a489f1aeefb1cccea10c785a84d3d833b1eef648 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 07 十一月 2024 15:56:25 +0800
Subject: [PATCH] 呼叫agv自动绑定，pda解绑
---
src/main/java/com/zy/asrs/controller/MatController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index e79b7e8..68069f7 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -169,13 +169,6 @@
return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
}
- @RequestMapping("/mat/turn/over/out/start")
- @ManagerAuth(memo = "鍝佸彿绉讳氦")
- public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
-
- return R.ok("鍝佸彿绉讳氦鎴愬姛");
- }
-
@RequestMapping("/mat/turn/over/take/site")
@ManagerAuth()
public R availableTakeSite(@RequestParam(required = false) String matnr){
@@ -337,5 +330,15 @@
return R.ok().add(valueVos);
}
+ @RequestMapping(value = "/mat/list/pda/page/auth")
+ @ManagerAuth
+ public R pdaPageList(@RequestParam(required = true)Long tagId,
+ @RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit){
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+// wrapper.eq("tag_id", tagId);
+ wrapper.orderBy("create_time", false);
+ return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper));
+ }
}
--
Gitblit v1.9.1