From 57405b2270f76abca1f844871e72fbf2ed73278f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 17 二月 2025 16:27:49 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index eb59028..ba4cce8 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -163,8 +163,46 @@
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- StopWatch stopWatch = new StopWatch();
- stopWatch.start();
+ //StopWatch stopWatch = new StopWatch();
+ //stopWatch.start();
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convertLike(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+// List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+// List<Long> docIds = new ArrayList<>();
+// for (DocType pakin : pakins) {
+// if (pakin.getDocId() != 17 && pakin.getDocId() != 33 && pakin.getDocId() != 34 && pakin.getDocId() != 35) {
+// docIds.add(pakin.getDocId());
+// }
+// }
+ Object o = param.get("orderType");
+ if (o != null) {
+ wrapper.in("source", o);
+ }
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ }
+ //stopWatch.stop();
+ //System.out.println(stopWatch.getTotalTimeSeconds());
+ return R.ok(page);
+ }
+
+ @RequestMapping(value = "/orderDetl/pakout/list/authV7")
+ @ManagerAuth
+ public R pakoutList7(@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) {
+ //StopWatch stopWatch = new StopWatch();
+ //stopWatch.start();
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convertLike(param, wrapper);
@@ -186,8 +224,8 @@
Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
record.setStock(sumAnfme == null ? 0 : sumAnfme);
}
- stopWatch.stop();
- System.out.println(stopWatch.getTotalTimeSeconds());
+ //stopWatch.stop();
+ //System.out.println(stopWatch.getTotalTimeSeconds());
return R.ok(page);
}
@@ -278,7 +316,7 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- if (pakin.getDocId() == 37) {
+ if (pakin.getDocId() == 37 || pakin.getDocId() == 43) {
docIds.add(pakin.getDocId());
}
}
--
Gitblit v1.9.1