From 9b6a50bf1288d2f7f06a67bec0c902d1256e44fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 05 七月 2025 11:15:54 +0800
Subject: [PATCH] 1.订单出库改物料多的先出 2.新增订单明细打印功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java | 296 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 200 insertions(+), 96 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 5cdedf2..3e7a0b3 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.LocDto;
import com.zy.asrs.common.domain.dto.OrderDto;
+import com.zy.asrs.common.domain.dto.ReportStockDto;
import com.zy.asrs.common.domain.dto.TaskDto;
import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.common.web.BaseController;
@@ -53,123 +54,226 @@
Set<String> exist = new HashSet<>();
- //鏍囪搴撲綅
- HashMap<String,Integer> hm = new HashMap<>();
+ List<String> matnrs = new ArrayList<>();
+ List<LocDto> locDtoss = new ArrayList<>();
+ //鑾峰彇鎵�鏈夌殑鐗╂枡鍚嶇О
for (OrderDetl orderDetl : orderDetls) {
+ LocDto locDto = new LocDto();
+ matnrs.add(orderDetl.getMatnr());
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) {
+ locDto.setMatnr(orderDetl.getMatnr());
+ locDto.setAnfme(issued);
+ locDto.setMaktx(orderDetl.getMaktx());
+ locDto.setOrderNo(orderDetl.getOrderNo());
+ locDtoss.add(locDto);
+ }
+
+ //瀵圭墿鏂欐暟杩涜鎺掑簭
+ List<ReportStockDto> stock = locDetlService.getStock(matnrs);
+
+ Boolean boo1 = 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;
}
- 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;
- }
- }
+ for (LocDetl locDetl : locDetls) {
+ if(Cools.isEmpty(locDtoss)){
+ boo1=true;
+ 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){
+ for (LocDto locDto1 : locDtoss) {
+ if (locDto1.getMatnr().equals(locDetl.getMatnr())) {
+ if (locDto1.getAnfme() <= 0.0D) {
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 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()) && (reportStockDto.getAnfme() == 1)) ? 101 : 103, hostId);
locDto.setStaNos(staNos);
locDtos.add(locDto);
exist.add(locDetl.getLocNo());
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- hm.put(locDetl.getLocNo(), 1);
- } else {
+ if(locDto1.getAnfme() - locDetl.getAnfme()==0){
+ locDtoss.remove(locDto1);
+ }else{
+ locDto1.setAnfme(locDto1.getAnfme() - locDetl.getAnfme());
+ }
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);
+ 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);
+ }
}
}
}
}
return R.ok().add(locDtos);
}
+
+// @PostMapping("/out/pakout/preview/auth")
+// @ManagerAuth
+// public R pakoutPreview(@RequestBody List<Long> ids) {
+// if (Cools.isEmpty(ids)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// Long hostId = getHostId();
+// List<OrderDetl> orderDetls = orderDetlService.listByIds(ids);
+// List<LocDto> locDtos = new ArrayList<>();
+//
+// 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);
+// }
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
@@ -212,12 +316,12 @@
return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
}
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null, getHostId());
- if(Cools.isEmpty(orderDetl)){
+ if (Cools.isEmpty(orderDetl)) {
return R.error("娌℃湁鎵惧埌璁㈠崟鏄庣粏");
}
int oerderDetlCount = orderDetlService.count(new LambdaQueryWrapper<OrderDetl>()
- .eq(OrderDetl::getOrderId,order.getId()).eq(OrderDetl::getMatnr,orderDto.getMatnr()).eq(OrderDetl::getHostId,getHostId()));
- if(oerderDetlCount>1){
+ .eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getMatnr, orderDto.getMatnr()).eq(OrderDetl::getHostId, getHostId()));
+ if (oerderDetlCount > 1) {
return R.error("鍚屼竴璁㈠崟涓嶅厑璁告湁鐩稿悓鐗╂枡");
}
if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
--
Gitblit v1.9.1