From 08a36a83e1f6169bcde01e940f1a436031de010c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 八月 2025 10:03:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index a03e8db..7a5096c 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -12,6 +12,8 @@
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import com.zy.system.entity.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +32,7 @@
@RestController
public class OutController extends BaseController {
+ private static final Logger log = LoggerFactory.getLogger(OutController.class);
@Autowired
private OrderService orderService;
@Autowired
@@ -65,7 +68,11 @@
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- String cstateid = param.getOrDefault("cstateid", "").toString();
+ String cstateid = null;
+ Object cstateidObj = param.get("cstateid");
+ if (!Cools.isEmpty()) {
+ cstateid = String.valueOf(cstateidObj);
+ }
List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
@@ -153,7 +160,79 @@
}
List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), cstateid);
+
+ HashMap<String, Double> locAnfmeMap = new HashMap<>();
+ HashMap<String, List<LocDetl>> map = new HashMap<>();
for (LocDetl locDetl : locDetls) {
+ if (map.containsKey(locDetl.getLocNo())) {
+ List<LocDetl> list = map.get(locDetl.getLocNo());
+ list.add(locDetl);
+ map.put(locDetl.getLocNo(), list);
+
+ Double originAnfme = locAnfmeMap.get(locDetl.getLocNo());
+ originAnfme += locDetl.getAnfme();
+ locAnfmeMap.put(locDetl.getLocNo(), originAnfme);
+ }else {
+ List<LocDetl> list = new ArrayList<>();
+ list.add(locDetl);
+ map.put(locDetl.getLocNo(), list);
+ locAnfmeMap.put(locDetl.getLocNo(), locDetl.getAnfme());
+ }
+ }
+
+ // 浣跨敤Stream API杩涜鎺掑簭骞跺垱寤烘柊鐨凪ap锛屽悓鏃朵繚鎸佹彃鍏ラ『搴忋��
+ Map<String, Double> sortedMap = locAnfmeMap.entrySet().stream()
+ .sorted(Map.Entry.<String, Double>comparingByValue(Comparator.reverseOrder())) // 鏍规嵁鍊兼帓搴忔潯鐩��
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
+
+ //鏈尮閰嶄笂鏁存墭搴撳瓨
+ HashMap<String, Double> lessMap = new HashMap<>();
+
+ List<LocDetl> allLoc = new ArrayList<>();
+ List<LocDetl> lessLoc = new ArrayList<>();
+ //浼樺厛鎵炬暣鎵�
+ for (Map.Entry<String, Double> entry : sortedMap.entrySet()) {
+ if (issued <= 0) {
+ break;
+ }
+
+ String locNo = entry.getKey();
+ Double anfme = entry.getValue();
+ if(anfme > orderDetl.getAnfme()) {
+ lessMap.put(locNo, anfme);
+ continue;
+ }
+ List<LocDetl> list = map.get(locNo);
+ allLoc.addAll(list);
+
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(anfme));
+ issued = issuedBigDecimal.doubleValue();
+ }
+
+ if(issued > 0) {
+ //闆舵暎鎼滅储
+ for (Map.Entry<String, Double> entry : lessMap.entrySet()) {
+ if (issued <= 0) {
+ break;
+ }
+
+ String locNo = entry.getKey();
+ Double anfme = entry.getValue();
+ if (anfme >= issued) {
+ List<LocDetl> list = map.get(locNo);
+ lessLoc.addAll(list);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(anfme));
+ issued = issuedBigDecimal.doubleValue();
+ }
+ }
+ }
+
+ allLoc.addAll(lessLoc);
+ issuedBigDecimal = Optional.of(BigDecimal.valueOf(orderDetl.getAnfme()).subtract(BigDecimal.valueOf(orderDetl.getWorkQty()))).orElse(new BigDecimal(0));
+ issued = issuedBigDecimal.doubleValue();
+ for (LocDetl locDetl : allLoc) {
if (disableCstateidList.contains(locDetl.getCstateid())) {
continue;
}
--
Gitblit v1.9.1