From c94688c24570d094cf583c68d9cfcd01aff99e4c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 28 十一月 2024 10:17:55 +0800
Subject: [PATCH] #pda
---
src/main/java/com/zy/asrs/controller/OrderController.java | 13 +++++++++++++
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 15 +++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index a688989..6ed6449 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -45,6 +45,19 @@
@Autowired
private WrkMastLogService wrkMastLogService;
+ @RequestMapping(value = "/order/search/pda/auth")
+ @ManagerAuth
+ public R pdaOrderSearch(@RequestParam(required = false)String condition){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+// wrapper.like("matnr", condition).or().like("maktx", condition);
+ wrapper.like("order_no", condition);
+ }
+ wrapper.orderBy("create_time", false);
+ List<Order> mats = orderService.selectList(wrapper);
+ return R.ok().add(mats);
+ }
+
@RequestMapping(value = "/order/list/pda/page/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 86b40f3..ee4cbae 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -31,6 +31,21 @@
@Resource
private OrderDetlMapper orderDetlMapper;
+ @RequestMapping(value = "/orderDetl/search/pda/auth")
+ @ManagerAuth
+ public R pdaOrderDetlSearch(@RequestParam(required = false)String condition,@RequestParam(required = false) String order){
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+// wrapper.like("matnr", condition).or().like("maktx", condition);
+
+ wrapper.like("matnr", condition);
+ }
+ wrapper.eq("order_no", order);
+ wrapper.orderBy("create_time", false);
+ List<OrderDetl> mats = orderDetlService.selectList(wrapper);
+ return R.ok().add(mats);
+ }
+
@PostMapping("/orderDetl/list/pda/auth")
public R getPdaOrderDetl(@RequestBody Map<String,Object> map) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1