From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 2c04fa4..d6b8dfb 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -9,7 +9,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
@@ -34,7 +34,7 @@
@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<>();
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
// wrapper.like("matnr", condition).or().like("maktx", condition);
@@ -42,13 +42,13 @@
}
wrapper.eq("order_no", order);
wrapper.orderBy("create_time", false);
- List<OrderDetl> mats = orderDetlService.selectList(wrapper);
+ List<OrderDetlPakout> 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<>();
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
wrapper.eq("order_no", map.get("orderNo"));
return R.ok(orderDetlService.selectList(wrapper));
}
@@ -66,7 +66,7 @@
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
@@ -75,7 +75,7 @@
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
- Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok(orderDetlPage);
}
@@ -84,7 +84,7 @@
public R pakoutList(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam Map<String, Object> param) {
- return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+ return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetlPakout.class)));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
@@ -102,18 +102,18 @@
@RequestMapping(value = "/orderDetl/add/auth")
@ManagerAuth
- public R add(OrderDetl orderDetl) {
- orderDetlService.insert(orderDetl);
+ public R add(OrderDetlPakout orderDetlPakout) {
+ orderDetlService.insert(orderDetlPakout);
return R.ok();
}
@RequestMapping(value = "/orderDetl/update/auth")
@ManagerAuth
- public R update(OrderDetl orderDetl) {
- if (Cools.isEmpty(orderDetl) || null == orderDetl.getId()) {
+ public R update(OrderDetlPakout orderDetlPakout) {
+ if (Cools.isEmpty(orderDetlPakout) || null == orderDetlPakout.getId()) {
return R.error();
}
- orderDetlService.updateById(orderDetl);
+ orderDetlService.updateById(orderDetlPakout);
return R.ok();
}
@@ -129,25 +129,25 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param) {
- EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
convert(map, wrapper);
- List<OrderDetl> list = orderDetlService.selectList(wrapper);
+ List<OrderDetlPakout> list = orderDetlService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/orderDetlQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
+ Page<OrderDetlPakout> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetl orderDetl : page.getRecords()) {
+ for (OrderDetlPakout orderDetlPakout : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
- map.put("id", orderDetl.getId());
- map.put("value", orderDetl.getId());
+ map.put("id", orderDetlPakout.getId());
+ map.put("value", orderDetlPakout.getId());
result.add(map);
}
return R.ok(result);
@@ -156,9 +156,9 @@
@RequestMapping(value = "/orderDetl/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != orderDetlService.selectOne(wrapper)) {
- return R.parse(BaseRes.REPEAT).add(getComment(OrderDetl.class, String.valueOf(param.get("key"))));
+ return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
--
Gitblit v1.9.1