From b17fe3091ae104984347622eb9db40765b5d025c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 13:30:49 +0800
Subject: [PATCH] 优化订单查询逻辑

---
 src/main/java/com/zy/asrs/controller/OrderDetlController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index e56ddff..83caf0b 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -15,7 +15,9 @@
 import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.service.*;
 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;
@@ -149,12 +151,15 @@
     }
 
     @RequestMapping(value = "/orderDetl/pakout/list/authV3")
+    @Synchronized
     @ManagerAuth
     public R pakoutList3(@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);
@@ -164,18 +169,18 @@
         List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
         List<Long> docIds = new ArrayList<>();
         for (DocType pakin : pakins) {
-            if (pakin.getDocId() != 33 && pakin.getDocId() != 34 && pakin.getDocId() != 35) {
+            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);
         }
-
+        stopWatch.stop();
+        System.out.println(stopWatch.getTotalTimeSeconds());
         return R.ok(page);
     }
 

--
Gitblit v1.9.1