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 | 271 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 247 insertions(+), 24 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 d804dc8..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
@@ -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,35 +54,242 @@
Set<String> exist = new HashSet<>();
+ 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) { continue; }
- 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();
+ 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 boo2 = false;
+ for (ReportStockDto reportStockDto : stock) {
+ if (reportStockDto.getAnfme() != 1) {
+ boo2 = true;
+ break;
+ }
+ }
+
+
+ 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, 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);
+ }
+ }
+ }
+ }
+ }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 (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setLack(Boolean.TRUE);
- locDtos.add(locDto);
+ 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<>();
+//
+// return R.ok().add(locDtos);
+// }
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
@@ -106,7 +314,9 @@
// 璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
List<OrderDto> orderDtos = new ArrayList<>();
for (LocDto locDto : locDtos) {
- if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
+ if (Cools.isEmpty(locDto.getOrderNo())) {
+ continue;
+ }
OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getAnfme());
if (OrderDto.has(orderDtos, orderDto)) {
OrderDto dto = OrderDto.find(orderDtos, orderDto);
@@ -121,7 +331,15 @@
if (order.getSettle() > 2) {
return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
}
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null,getHostId());
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null, getHostId());
+ 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) {
+ return R.error("鍚屼竴璁㈠崟涓嶅厑璁告湁鐩稿悓鐗╂枡");
+ }
if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
}
@@ -130,12 +348,17 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
//2022-08-04 Add锛岄槻姝㈠墠绔〉闈㈡彁鍙栧簱浣嶄俊鎭悗锛屽湪鍏朵粬鍦版柟瀵硅搴撲綅鐢熸垚浜嗗嚭搴撲换鍔�(搴撲綅鐘舵�侀潪F鐘舵��)
LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocNo, locDto.getLocNo())
.eq(LocMast::getHostId, hostId));
- if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
+ if (locMast.getWhsType() != 0) {
+ continue;
+ }
+ if (!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")) {
return R.error("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
}
@@ -153,7 +376,7 @@
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo(), false, hostId);
workService.stockOut(staNo.getDevNo(), taskDto, getUserId(), hostId);
}
- return R.ok();
+ return R.ok("绔嬩綋浠撳簱鐢熸垚鍑哄簱浠诲姟鎴愬姛锛屽钩搴撹浣跨敤PDA杩涜鍑哄簱锛侊紒锛�");
}
}
--
Gitblit v1.9.1