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 | 114 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index db4b088..d6b8dfb 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -9,12 +9,14 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -26,6 +28,31 @@
@Autowired
private OrderDetlService orderDetlService;
+ @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<OrderDetlPakout> 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<OrderDetlPakout> mats = orderDetlService.selectList(wrapper);
+ return R.ok().add(mats);
+ }
+
+ @PostMapping("/orderDetl/list/pda/auth")
+ public R getPdaOrderDetl(@RequestBody Map<String, Object> map) {
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ wrapper.eq("order_no", map.get("orderNo"));
+ return R.ok(orderDetlService.selectList(wrapper));
+ }
+
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -34,22 +61,36 @@
@RequestMapping(value = "/orderDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
- EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ @RequestMapping(value = "/orderDetl/pakout/list/auth")
+ @ManagerAuth
+ 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, OrderDetlPakout.class)));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -61,25 +102,25 @@
@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()){
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
+ public R update(OrderDetlPakout orderDetlPakout) {
+ if (Cools.isEmpty(orderDetlPakout) || null == orderDetlPakout.getId()) {
return R.error();
}
- orderDetlService.updateById(orderDetl);
+ orderDetlService.updateById(orderDetlPakout);
return R.ok();
}
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderDetlService.deleteById(id);
}
return R.ok();
@@ -87,26 +128,26 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ public R export(@RequestBody JSONObject param) {
+ 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);
@@ -115,11 +156,20 @@
@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"));
- if (null != orderDetlService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(OrderDetl.class, String.valueOf(param.get("key"))));
+ 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(OrderDetlPakout.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
+ @RequestMapping(value = "/orderDetl/getPrintDetl/{id}")
+ @ManagerAuth
+ public R getPrintDetl(@PathVariable("id") Integer id) {
+ if (Cools.isEmpty(id)) {
+ return R.parse("id涓虹┖");
+ }
+ return R.ok(orderDetlService.selectById(id));
+ }
+
}
--
Gitblit v1.9.1