From 3536629992d020f689b3726925155a3fd662f442 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 15:45:53 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/asrs/LocDetlMapper.xml | 2
src/main/java/com/zy/asrs/controller/OutController.java | 156 ++++++++++++++++++++++++++++++++++++++-------------
2 files changed, 116 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 1a0c62f..e3a92cb 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -143,16 +143,49 @@
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<String> locList = new ArrayList<>();
for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
+ 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) {
+ continue;
+ }
+
+ containLocList.add(locNo);
+
+ 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 = (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());
@@ -174,10 +207,51 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issuedBigDecimal = issuedBigDecimal.subtract(BigDecimal.valueOf(locDetl.getAnfme()));
issued = issuedBigDecimal.doubleValue();
- } else {
- break;
}
}
+
+ //鍏ㄦ澘鎼滅储缁撴潫鍚庯紝杩樻湁鏈嚭鏁伴噺锛屽垯鎼滅储鎷ｉ�夊嚭搴�
+ if(issued > 0) {
+ for (LocDetl locDetl : locDetls) {
+ if (issued <= 0) {
+ break;
+ }
+
+ if(containLocList.contains(locDetl.getLocNo())) {
+ continue;
+ }
+
+ 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;
+ 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();
+ }
+ }
+
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setBrand(orderDetl.getBrand());
@@ -198,43 +272,43 @@
}
}
- // 閲嶆柊璁＄畻鍑哄簱绔欑偣锛屽彲鑳藉瓨鍦ㄤ竴涓墭鐩樺鏉℃槑缁嗭紝澶氭潯鏄庣粏缁熻涓嬫潵鍙叏鏉垮嚭搴擄紝浣嗗疄闄呯粰鍑虹殑绔欑偣鍙兘鎷ｉ�夊嚭搴�
- 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);
+// locStaNosMap.put(locNo, staNos);
+// }
+//
+// for (LocDto locDto : locDtos) {
+// List<Integer> staNos = locStaNosMap.get(locDto.getLocNo());
+// locDto.setStaNos(staNos);
+// }
}
return R.ok().add(locDtos);
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index 4eace42..e1c9d3e 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -565,7 +565,7 @@
</if>
order by
- a.loc_no, DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ a.loc_no, a.anfme, DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
desc
</select>
--
Gitblit v1.9.1