From a7ec33be10c9c70d1dd9efbce7248b008f899ed5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 25 二月 2025 09:00:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 87 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index ba4cce8..8f7f771 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -16,7 +17,6 @@
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StopWatch;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -163,46 +163,6 @@
@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);
- 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);
@@ -224,8 +184,49 @@
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) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ Object o = param.get("orderType");
+ if (o != null) {
+ String[] split = o.toString().split(",");
+ //-1璇存槑鏄崐鎴愬搧绠卞３鍑哄簱鍗�
+ if (split[0].equals("-1")) {
+ wrapper.like("order_no", "EB", SqlLike.RIGHT);
+ wrapper.in("source", split);
+ } else {
+ wrapper.in("source", split);
+ }
+ param.remove("orderType");
+ }
+ 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());
+// }
+// }
+// wrapper.in("source", docIds);
+ 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);
+ }
return R.ok(page);
}
--
Gitblit v1.9.1