From 796103a3913320b81a5769ef3b643109be82b6aa Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 15 八月 2025 14:49:35 +0800
Subject: [PATCH] #优先整托出库，其次拣选
---
src/main/java/com/zy/asrs/controller/OutController.java | 195 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 181 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index c196404..5cc59ae 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -7,9 +7,13 @@
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MatUtils;
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;
@@ -17,6 +21,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -27,6 +32,7 @@
@RestController
public class OutController extends BaseController {
+ private static final Logger log = LoggerFactory.getLogger(OutController.class);
@Autowired
private OrderService orderService;
@Autowired
@@ -57,15 +63,22 @@
@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 = param.getOrDefault("cstateid", "").toString();
+
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<>();
@@ -76,12 +89,13 @@
// 鐩樼偣鍗曞嚭搴�
if (orderPakOut.getDocType() == 8) {
for (OrderDetlPakout orderDetl : orderDetlPakouts) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ BigDecimal issuedBigDecimal = Optional.of(BigDecimal.valueOf(orderDetl.getAnfme()).subtract(BigDecimal.valueOf(orderDetl.getWorkQty()))).orElse(new BigDecimal(0));
+ double issued = issuedBigDecimal.doubleValue();
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(),
@@ -97,13 +111,18 @@
locDto.setBoxType1(orderDetl.getBoxType1());
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
- locDto.setWeight(orderDetl.getWeight());
+
+ //璁＄畻杈呭崟浣�
+ Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
+ locDto.setWeight(weight);
+
locDto.setUnit(orderDetl.getUnit());
locDto.setStaNos(staNos);
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
+ issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
+ issued = issuedBigDecimal.doubleValue();
} else {
break;
}
@@ -118,7 +137,11 @@
locDto.setBoxType1(orderDetl.getBoxType1());
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
- locDto.setWeight(orderDetl.getWeight());
+
+ //璁＄畻杈呭崟浣�
+ Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
+ locDto.setWeight(weight);
+
locDto.setUnit(orderDetl.getUnit());
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
@@ -126,20 +149,98 @@
}
} else {
for (OrderDetlPakout orderDetl : orderDetlPakouts) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ BigDecimal issuedBigDecimal = Optional.of(BigDecimal.valueOf(orderDetl.getAnfme()).subtract(BigDecimal.valueOf(orderDetl.getWorkQty()))).orElse(new BigDecimal(0));
+ double issued = issuedBigDecimal.doubleValue();
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);
+
+ 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;
+ }
+
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());
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 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());
@@ -149,12 +250,19 @@
locDto.setBoxType1(orderDetl.getBoxType1());
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
- locDto.setWeight(orderDetl.getWeight());
locDto.setUnit(orderDetl.getUnit());
+ locDto.setInitialAnfme(locDetl.getAnfme());//鍘熸墭鐩樻暟閲�
+ locDto.setInitialWeight(locDetl.getWeight());//鍘熸墭鐩樿緟鏁伴噺
+
+ //璁＄畻杈呭崟浣�
+ Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
+ locDto.setWeight(weight);
+
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
+ issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
+ issued = issuedBigDecimal.doubleValue();
} else {
break;
}
@@ -168,13 +276,72 @@
locDto.setBoxType1(orderDetl.getBoxType1());
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
- locDto.setWeight(orderDetl.getWeight());
+
+ //璁＄畻杈呭崟浣�
+ Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
+ locDto.setWeight(weight);
+
locDto.setUnit(orderDetl.getUnit());
locDto.setLack(Boolean.TRUE);
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 = 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