From 37bdbc67236066dde69299d4eef3e93232aa1e4f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 15:01:24 +0800
Subject: [PATCH] 移除冗余Autowired注解，优化订单同步逻辑
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..47ca17f 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);
}
@@ -312,7 +317,7 @@
@ManagerAuth
public R update(OrderDetl orderDetl){
if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
orderDetlService.updateById(orderDetl);
return R.ok();
--
Gitblit v1.9.1