From 4df965ceb66f05f9e13d849003821e8eaac76e1f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 03 十一月 2024 09:49:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 1c3cd11..1206ea0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -9,6 +9,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
@@ -25,6 +26,13 @@
@Autowired
private OrderDetlService orderDetlService;
+
+ @RequestMapping("/orderDetl/list/pda/auth")
+ public R getPdaOrderDetl(@RequestParam String orderNo) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("order_no", orderNo);
+ return R.ok(orderDetlService.selectList(wrapper));
+ }
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
@@ -46,7 +54,8 @@
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
- return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
}
@RequestMapping(value = "/orderDetl/pakout/list/auth")
--
Gitblit v1.9.1