From 7a99dc66a52651adffaa919fb03e73136986b775 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 29 七月 2025 13:44:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 7ea79d4..c6b8899 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -11,6 +11,7 @@
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -197,7 +198,57 @@
locDtos.add(locDto);
}
}
+
+ // 閲嶆柊璁＄畻鍑哄簱绔欑偣锛屽彲鑳藉瓨鍦ㄤ竴涓墭鐩樺鏉℃槑缁嗭紝澶氭潯鏄庣粏缁熻涓嬫潵鍙叏鏉垮嚭搴擄紝浣嗗疄闄呯粰鍑虹殑绔欑偣鍙兘鎷ｉ�夊嚭搴�
+ HashMap<String, Double> locAnfmeMap = new HashMap<>();
+ for (LocDto locDto : locDtos) {
+ if(locAnfmeMap.containsKey(locDto.getLocNo())) {
+ Double anfme = locAnfmeMap.get(locDto.getLocNo());
+ BigDecimal decimal = BigDecimal.valueOf(locDto.getAnfme()).add(BigDecimal.valueOf(anfme));
+ locAnfmeMap.put(locDto.getLocNo(), decimal.doubleValue());
+ }else {
+ locAnfmeMap.put(locDto.getLocNo(), locDto.getAnfme());
+ }
+ }
+
+ HashMap<String, List<Integer>> locStaNosMap = new HashMap<>();
+ for (Map.Entry<String, Double> entry : locAnfmeMap.entrySet()) {
+ String locNo = entry.getKey();
+ Double realAnfme = entry.getValue();
+
+ double stockAnfme = 0D;
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ for (LocDetl locDetl : locDetls) {
+ BigDecimal decimal = BigDecimal.valueOf(stockAnfme).add(BigDecimal.valueOf(locDetl.getAnfme()));
+ stockAnfme = decimal.doubleValue();
+ }
+
+ int ioType = 103;
+ if(stockAnfme == realAnfme) {
+ ioType = 101;
+ }
+
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locNo, ioType);
+ User user = getUser();
+ if(user != null) {
+ Integer defaultOutSta = user.getDefaultOutSta();
+ if(defaultOutSta != null) {
+ if (staNos.contains(defaultOutSta)) {
+ staNos.remove(defaultOutSta);
+ staNos.add(0, defaultOutSta);
+ }
+ }
+ }
+
+ locStaNosMap.put(locNo, staNos);
+ }
+
+ for (LocDto locDto : locDtos) {
+ List<Integer> staNos = locStaNosMap.get(locDto.getLocNo());
+ locDto.setStaNos(staNos);
+ }
}
+
return R.ok().add(locDtos);
}
--
Gitblit v1.9.1