From 3bcfebe3912bdaf8abf2d29b6913b771bad3804c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:44:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OutController.java | 283 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 176 insertions(+), 107 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index e3a92cb..ad89948 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -11,6 +11,9 @@
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.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;
@@ -19,6 +22,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -29,6 +35,7 @@
@RestController
public class OutController extends BaseController {
+ private static final Logger log = LoggerFactory.getLogger(OutController.class);
@Autowired
private OrderService orderService;
@Autowired
@@ -59,15 +66,26 @@
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
- public R pakoutPreview(@RequestBody List<Long> ids) {
+ public R pakoutPreview(@RequestBody HashMap<String,Object> param) {
+ List<Long> ids = (List<Long>) param.get("ids");
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
+ String cstateid = null;
+ Object cstateidObj = param.get("cstateid");
+ if (!Cools.isEmpty(cstateidObj)) {
+ cstateid = String.valueOf(cstateidObj);
+ }
+
List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
if (orderDetlPakouts.size() == 0) {
return R.parse("璁㈠崟鏄庣粏涓虹┖");
}
+
+ List<String> disableCstateidList = new ArrayList<>();
+ disableCstateidList.add("1001A1100000000H0KJP");//涓嶅悎鏍�
+ disableCstateidList.add("1001A1100000000LFERA");//寰呭鐞�
List<LocDto> locDtos = new ArrayList<>();
@@ -83,8 +101,8 @@
if (issued <= 0.0D) {
continue;
}
- 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());
+ 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);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -143,91 +161,123 @@
if (issued <= 0.0D) {
continue;
}
+ 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);
- //绗竴娆℃悳绱紝涓昏鎼滅储鍙叏鏉垮嚭搴撶殑鎵樼洏
- 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());
- //鏍规嵁鎺掑簭缁撴灉鑾峰彇搴撲綅鍙�
- List<String> locList = new ArrayList<>();
+ HashMap<String, Double> locAnfmeMap = new HashMap<>();
+ HashMap<String, Date> locTimeMap = new HashMap<>();
+ HashMap<String, List<LocDetl>> map = new HashMap<>();
for (LocDetl locDetl : locDetls) {
- if (locList.contains(locDetl.getLocNo())) {
- continue;
- }
- locList.add(locDetl.getLocNo());
- }
-
- List<String> containLocList = new ArrayList<>();
- for (String locNo : locList) {
- BigDecimal allStockDecimal = new BigDecimal(0);
- List<LocDetl> locDetls1 = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .eq("loc_no", locNo));
- for (LocDetl locDetl : locDetls1) {
- allStockDecimal = allStockDecimal.add(BigDecimal.valueOf(locDetl.getAnfme()));
- }
-
- //姝ゅ簱浣嶆�诲簱瀛�
- double allStock = allStockDecimal.doubleValue();
- if (issued <= 0) {
- break;
- }
-
- //搴撳瓨杩囧ぇ锛屾棤娉曞叏鏉垮嚭搴擄紝鎼滅储涓嬩竴鏉�
- if(allStock > issued) {
+ if (disableCstateidList.contains(locDetl.getCstateid())) {
continue;
}
- containLocList.add(locNo);
+ if (map.containsKey(locDetl.getLocNo())) {
+ List<LocDetl> list = map.get(locDetl.getLocNo());
+ list.add(locDetl);
+ map.put(locDetl.getLocNo(), list);
- for (LocDetl locDetl : locDetls1) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- locDto.setFrozen(locDetl.getFrozen());
- locDto.setFrozenLoc(locMast.getFrozen());
-// int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
- int ioType = 101;
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
- locDto.setStaNos(staNos);
- locDto.setBrand(orderDetl.getBrand());
-
- locDto.setStandby1(orderDetl.getStandby1());
- locDto.setStandby2(orderDetl.getStandby2());
- locDto.setStandby3(orderDetl.getStandby3());
- locDto.setBoxType1(orderDetl.getBoxType1());
- locDto.setBoxType2(orderDetl.getBoxType2());
- locDto.setBoxType3(orderDetl.getBoxType3());
- locDto.setUnit(orderDetl.getUnit());
-
- //璁＄畻杈呭崟浣�
- Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
- locDto.setWeight(weight);
-
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
- issued = issuedBigDecimal.doubleValue();
+ 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());
+ locTimeMap.put(locDetl.getLocNo(), locDetl.getAppeTime());
}
}
- //鍏ㄦ澘鎼滅储缁撴潫鍚庯紝杩樻湁鏈嚭鏁伴噺锛屽垯鎼滅储鎷ｉ�夊嚭搴�
- if(issued > 0) {
- for (LocDetl locDetl : locDetls) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ // 浣跨敤 TreeMap锛堣嚜鍔ㄦ寜 key 鍗囧簭鎺掑簭锛�
+ Map<String, List<Map.Entry<String, Date>>> sortedByDayAsc = locTimeMap.entrySet()
+ .stream()
+ .collect(Collectors.groupingBy(
+ entry -> sdf.format(entry.getValue()),
+ TreeMap::new, // 鑷姩鎸夐敭锛堟棩鏈燂級鍗囧簭鎺掑簭
+ Collectors.toList()
+ ));
+
+ //鏈尮閰嶄笂鏁存墭搴撳瓨
+ HashMap<String, Double> lessMap = new HashMap<>();
+
+ List<LocDetl> allLoc = new ArrayList<>();
+ List<LocDetl> lessLoc = new ArrayList<>();
+
+// //浼樺厛鎵炬暣鎵�
+// for (Map.Entry<String, List<Map.Entry<String, Date>>> listEntry : sortedByDayAsc.entrySet()) {
+// for (Map.Entry<String, Date> dateEntry : listEntry.getValue()) {
+// if (issued <= 0) {
+// break;
+// }
+// String locNo = dateEntry.getKey();
+// Double anfme = locAnfmeMap.get(locNo);
+// 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);
+
+ //蹇呴』鎶婂綋澶╁簱瀛樼敤瀹�
+ for (Map.Entry<String, List<Map.Entry<String, Date>>> listEntry : sortedByDayAsc.entrySet()) {
+ for (Map.Entry<String, Date> dateEntry : listEntry.getValue()) {
if (issued <= 0) {
break;
}
+ String locNo = dateEntry.getKey();
+ Double anfme = locAnfmeMap.get(locNo);
- if(containLocList.contains(locDetl.getLocNo())) {
- continue;
- }
+ List<LocDetl> list = map.get(locNo);
+ allLoc.addAll(list);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(anfme));
+ issued = issuedBigDecimal.doubleValue();
+ }
+ }
+
+ 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;
+ }
+
+ if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
locDto.setFrozen(locDetl.getFrozen());
locDto.setFrozenLoc(locMast.getFrozen());
-// int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
- int ioType = 103;
+ int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
locDto.setStaNos(staNos);
locDto.setBrand(orderDetl.getBrand());
@@ -239,6 +289,8 @@
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
locDto.setUnit(orderDetl.getUnit());
+ locDto.setInitialAnfme(locDetl.getAnfme());//鍘熸墭鐩樻暟閲�
+ locDto.setInitialWeight(locDetl.getWeight());//鍘熸墭鐩樿緟鏁伴噺
//璁＄畻杈呭崟浣�
Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
@@ -249,9 +301,10 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
issued = issuedBigDecimal.doubleValue();
+ } else {
+ break;
}
}
-
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setBrand(orderDetl.getBrand());
@@ -272,43 +325,59 @@
}
}
-// // 閲嶆柊璁＄畻鍑哄簱绔欑偣锛屽彲鑳藉瓨鍦ㄤ竴涓墭鐩樺鏉℃槑缁嗭紝澶氭潯鏄庣粏缁熻涓嬫潵鍙叏鏉垮嚭搴擄紝浣嗗疄闄呯粰鍑虹殑绔欑偣鍙兘鎷ｉ�夊嚭搴�
-// 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);
-// locStaNosMap.put(locNo, staNos);
-// }
-//
-// for (LocDto locDto : locDtos) {
-// List<Integer> staNos = locStaNosMap.get(locDto.getLocNo());
-// locDto.setStaNos(staNos);
-// }
+ // 閲嶆柊璁＄畻鍑哄簱绔欑偣锛屽彲鑳藉瓨鍦ㄤ竴涓墭鐩樺鏉℃槑缁嗭紝澶氭潯鏄庣粏缁熻涓嬫潵鍙叏鏉垮嚭搴擄紝浣嗗疄闄呯粰鍑虹殑绔欑偣鍙兘鎷ｉ�夊嚭搴�
+ 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 = null;
+ try {
+ user = getUser();
+ } catch (Exception e) {
+
+ }
+ 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