From aa22bc31604e33e4d86cf7f4918a26192760209b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 07 一月 2025 18:16:04 +0800
Subject: [PATCH] 优化异常处理及订单同步逻辑
---
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
index b028627..9f6d390 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
@@ -8,9 +8,11 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.AgvLocDetlService;
+import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
@@ -22,6 +24,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -35,6 +38,8 @@
private MatService matService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private DocTypeService docTypeService;
@RequestMapping(value = "/locDetl/list/auth")
@ManagerAuth
@@ -113,14 +118,30 @@
.where("loc_no like '" +row +"%'");
}
Page<AgvLocDetl> agvLocDetlPage = agvLocDetlService.selectPage(new Page<>(curr, limit), wrapper);
- for (AgvLocDetl record : agvLocDetlPage.getRecords()) {
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", record.getThreeCode()).eq("matnr", record.getMatnr()).ne("order_no", record.getOrderNo()).ne("order_no", "DB" + record.getOrderNo()));
- if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
- record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
- } else {
- record.setStock(-1D);
+ 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() != 35) {
+ docIds.add(pakin.getDocId());
}
- record.setOrderNo(orderDetl.getOrderNo());
+ }
+ for (AgvLocDetl record : agvLocDetlPage.getRecords()) {
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
+ .eq("three_code", record.getThreeCode())
+ .eq("matnr", record.getMatnr())
+ .in("source",docIds));
+// if (orderDetl.getAnfme() - orderDetl.getQty() > 0) {
+// record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
+// } else {
+// record.setStock(-1D);
+// }
+ if (Cools.isEmpty(orderDetl)) {
+ record.setStock(0D);
+ } else {
+ record.setStock(orderDetl.getAnfme() - orderDetl.getQty());
+ record.setOrderNo(orderDetl.getOrderNo());
+ }
+
}
return R.ok(agvLocDetlPage);
}
--
Gitblit v1.9.1