From 469d41fe09ceec3dc5259d01a4060aac1448e09f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 03 九月 2025 09:59:34 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java | 330 ++++++++++++++++++++++++++++--------------------------
1 files changed, 173 insertions(+), 157 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
index 226acbb..a9be339 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
@@ -72,51 +72,110 @@
//瀵圭墿鏂欐暟杩涜鎺掑簭
List<ReportStockDto> stock = locDetlService.getStock(matnrs);
- Boolean boo1 = false;
+ //鍒ゆ柇鏄惁鏈夊鐗╂枡鎵樼洏锛屾病鏈夌殑璇濊繘琛屽厛杩涘厛鍑恒�傛湁鐨勮瘽杩涜澶氱墿鏂欐墭鐩樺嚭搴�
+ Boolean boo2 = false;
for (ReportStockDto reportStockDto : stock) {
- List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
- .eq(LocDetl::getLocNo, reportStockDto.getLocNo())
- .eq(LocDetl::getHostId, hostId));
- if (Cools.isEmpty(locDetls)) {
- continue;
- }
- for (LocDetl locDetl : locDetls) {
- if(Cools.isEmpty(locDtoss)){
- boo1=true;
- break;
- }
- for (LocDto locDto1 : locDtoss) {
- if (locDto1.getMatnr().equals(locDetl.getMatnr())) {
- if (locDto1.getAnfme() <= 0.0D) {
- continue;
- }
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), locDto1.getOrderNo(),
- locDto1.getAnfme() >= locDetl.getAnfme() ? locDetl.getAnfme() : locDto1.getAnfme());
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((locDto1.getAnfme() >= locDetl.getAnfme()) && (locDetls.size() == 1)) ? 101 : 103, hostId);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- if(locDto1.getAnfme() - locDetl.getAnfme()==0){
- locDtoss.remove(locDto1);
- }else{
- locDto1.setAnfme(locDto1.getAnfme() - locDetl.getAnfme());
- }
- break;
- }
- }
- }
- if(boo1){
+ if (reportStockDto.getAnfme() != 1) {
+ boo2 = true;
break;
}
}
- if (!boo1) {
- for(LocDto locDto : locDtoss){
- if (locDto.getAnfme() > 0) {
+
+
+ if (!boo2) {
+ //鏍囪搴撲綅
+ HashMap<String, Integer> hm = new HashMap<>();
+
+ for (OrderDetl orderDetl : orderDetls) {
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+ if (!Cools.isEmpty(hm)) {
+ for (HashMap.Entry<String, Integer> entry : hm.entrySet()) {
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getHostId, hostId)
+ .eq(LocDetl::getLocNo, entry.getKey())
+ .eq(LocDetl::getMatnr, orderDetl.getMatnr()));
+ for (LocDetl locDetl : locDetls) {
+ List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getLocNo, locDetl.getLocNo())
+ .eq(LocDetl::getHostId, hostId));
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
+ locDto.setStaNos(staNos);
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ hm.put(locDetl.getLocNo(), 1);
+ } else {
+ break;
+ }
+ }
+ }
+ if (issued > 0) {
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
+ for (LocDetl locDetl : locDetls) {
+ //杩囨护鎺夊湪宸茶鏍囪鐨勫簱浣嶅彿
+ boolean boo = false;
+ for (HashMap.Entry<String, Integer> entry : hm.entrySet()) {
+ if (locDetl.getLocNo().equals(entry.getKey())) {
+ boo = true;
+ break;
+ }
+ }
+ if (boo) {
+ continue;
+ }
+ List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getLocNo, locDetl.getLocNo())
+ .eq(LocDetl::getHostId, hostId));
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
+ locDto.setStaNos(staNos);
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ hm.put(locDetl.getLocNo(), 1);
+ } else {
+ break;
+ }
+ }
+ }
+ } else {
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
+ for (LocDetl locDetl : locDetls) {
+ List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getLocNo, locDetl.getLocNo())
+ .eq(LocDetl::getHostId, hostId));
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
+ locDto.setStaNos(staNos);
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ hm.put(locDetl.getLocNo(), 1);
+ } else {
+ break;
+ }
+ }
+ }
+
+ if (issued > 0) {
List<LocDetl> locDetls1 = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
- .eq(LocDetl::getMatnr, locDto.getMatnr()).eq(LocDetl::getHostId, hostId));
+ .eq(LocDetl::getMatnr, orderDetl.getMatnr()).eq(LocDetl::getHostId, hostId));
boolean boo = false;
if (Cools.isEmpty(locDetls1)) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
} else {
@@ -125,18 +184,90 @@
String locNo = locDetl.getLocNo().substring(1, 2);
if (Integer.valueOf(locNo) > 4) {
boo = true;
-// LocDto locDto = new LocDto("鍦ㄥ钩搴�", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto("鍦ㄥ钩搴�", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
- locDto.setLocNo("鍦ㄥ钩搴�");
locDtos.add(locDto);
break;
}
}
if (!boo) {
-// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLocNo(null);
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
+ }
+ }
+ }
+ }
+ }else{
+ Boolean boo1 = false;
+ for (ReportStockDto reportStockDto : stock) {
+ List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getLocNo, reportStockDto.getLocNo())
+ .eq(LocDetl::getHostId, hostId));
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getHostId, hostId)
+ .eq(LocMast::getLocNo, reportStockDto.getLocNo()));
+ if (Cools.isEmpty(locDetls) || Cools.isEmpty(locMast) || !locMast.getLocSts().equals("F")) {
+ continue;
+ }
+ for (LocDetl locDetl : locDetls) {
+ if (Cools.isEmpty(locDtoss)) {
+ boo1 = true;
+ break;
+ }
+ for (LocDto locDto1 : locDtoss) {
+ if (locDto1.getMatnr().equals(locDetl.getMatnr())) {
+ if (locDto1.getAnfme() <= 0.0D) {
+ continue;
+ }
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), locDto1.getOrderNo(),
+ locDto1.getAnfme() >= locDetl.getAnfme() ? locDetl.getAnfme() : locDto1.getAnfme());
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((locDto1.getAnfme() >= locDetl.getAnfme()) && (locDetls.size() == 1)) ? 101 : 103, hostId);
+ locDto.setStaNos(staNos);
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ if (locDto1.getAnfme() - locDetl.getAnfme() == 0) {
+ locDtoss.remove(locDto1);
+ } else {
+ locDto1.setAnfme(locDto1.getAnfme() - locDetl.getAnfme());
+ }
+ break;
+ }
+ }
+ }
+ if (boo1) {
+ break;
+ }
+ }
+ if (!boo1) {
+ for (LocDto locDto : locDtoss) {
+ if (locDto.getAnfme() > 0) {
+ List<LocDetl> locDetls1 = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getMatnr, locDto.getMatnr()).eq(LocDetl::getHostId, hostId));
+ boolean boo = false;
+ if (Cools.isEmpty(locDetls1)) {
+ locDto.setLack(Boolean.TRUE);
+ locDtos.add(locDto);
+ } else {
+ for (LocDetl locDetl : locDetls1
+ ) {
+ String locNo = locDetl.getLocNo().substring(1, 2);
+ if (Integer.valueOf(locNo) > 4) {
+ boo = true;
+// LocDto locDto = new LocDto("鍦ㄥ钩搴�", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ locDto.setLack(Boolean.TRUE);
+ locDto.setLocNo("鍦ㄥ钩搴�");
+ locDtos.add(locDto);
+ break;
+ }
+ }
+ if (!boo) {
+// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ locDto.setLocNo(null);
+ locDto.setLack(Boolean.TRUE);
+ locDtos.add(locDto);
+ }
}
}
}
@@ -157,121 +288,6 @@
//
// Set<String> exist = new HashSet<>();
//
-// //鏍囪搴撲綅
-// HashMap<String,Integer> hm = new HashMap<>();
-//
-// for (OrderDetl orderDetl : orderDetls) {
-// double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
-// if (issued <= 0.0D) {
-// continue;
-// }
-// if(!Cools.isEmpty(hm)){
-// for(HashMap.Entry<String,Integer> entry:hm.entrySet()){
-// List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
-// .eq(LocDetl::getHostId, hostId)
-// .eq(LocDetl::getLocNo, entry.getKey())
-// .eq(LocDetl::getMatnr, orderDetl.getMatnr()));
-// for (LocDetl locDetl : locDetls) {
-// List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
-// .eq(LocDetl::getLocNo, locDetl.getLocNo())
-// .eq(LocDetl::getHostId, hostId));
-// if (issued > 0) {
-// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
-// issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
-// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
-// locDto.setStaNos(staNos);
-// locDtos.add(locDto);
-// exist.add(locDetl.getLocNo());
-// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-// issued = issued - locDetl.getAnfme();
-// hm.put(locDetl.getLocNo(), 1);
-// } else {
-// break;
-// }
-// }
-// }
-// if (issued >0){
-// List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
-// for (LocDetl locDetl : locDetls) {
-// //杩囨护鎺夊湪宸茶鏍囪鐨勫簱浣嶅彿
-// boolean boo=false;
-// for (HashMap.Entry<String,Integer> entry:hm.entrySet()) {
-// if(locDetl.getLocNo().equals(entry.getKey())){
-// boo=true;
-// break;
-// }
-// }
-// if (boo){
-// continue;
-// }
-// List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
-// .eq(LocDetl::getLocNo, locDetl.getLocNo())
-// .eq(LocDetl::getHostId, hostId));
-// if (issued > 0) {
-// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
-// issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
-// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
-// locDto.setStaNos(staNos);
-// locDtos.add(locDto);
-// exist.add(locDetl.getLocNo());
-// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-// issued = issued - locDetl.getAnfme();
-// hm.put(locDetl.getLocNo(), 1);
-// } else {
-// break;
-// }
-// }
-// }
-// }else{
-// List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
-// for (LocDetl locDetl : locDetls) {
-// List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
-// .eq(LocDetl::getLocNo, locDetl.getLocNo())
-// .eq(LocDetl::getHostId, hostId));
-// if (issued > 0) {
-// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
-// issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
-// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ((issued >= locDetl.getAnfme()) && (locMats.size() == 1)) ? 101 : 103, hostId);
-// locDto.setStaNos(staNos);
-// locDtos.add(locDto);
-// exist.add(locDetl.getLocNo());
-// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
-// issued = issued - locDetl.getAnfme();
-// hm.put(locDetl.getLocNo(), 1);
-// } else {
-// break;
-// }
-// }
-// }
-//
-// if (issued > 0) {
-// List<LocDetl> locDetls1 = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
-// .eq(LocDetl::getMatnr, orderDetl.getMatnr()).eq(LocDetl::getHostId, hostId));
-// boolean boo = false;
-// if (Cools.isEmpty(locDetls1)) {
-// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
-// locDto.setLack(Boolean.TRUE);
-// locDtos.add(locDto);
-// } else {
-// for (LocDetl locDetl : locDetls1
-// ) {
-// String locNo = locDetl.getLocNo().substring(1, 2);
-// if (Integer.valueOf(locNo) > 4) {
-// boo = true;
-// LocDto locDto = new LocDto("鍦ㄥ钩搴�", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
-// locDto.setLack(Boolean.TRUE);
-// locDtos.add(locDto);
-// break;
-// }
-// }
-// if (!boo) {
-// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
-// locDto.setLack(Boolean.TRUE);
-// locDtos.add(locDto);
-// }
-// }
-// }
-// }
// return R.ok().add(locDtos);
// }
--
Gitblit v1.9.1