From 94d510fca880983739dcb35bf8981eff46f212e9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 03 六月 2024 09:21:57 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 4acd058..44bd1fc 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
@@ -58,13 +58,13 @@
if (issued <= 0.0D) { continue; }
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
for (LocDetl locDetl : locDetls) {
- if (!Cools.isEmpty(locDetl.getMemo())){
- 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() ? 101 : 103, hostId);
+ 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());
@@ -121,7 +121,7 @@
if (order.getSettle() > 2) {
return R.error(orderDto.getOrderNo() + "璁㈠崟宸插け鏁堬紝璇峰強鏃跺埛鏂伴〉闈�");
}
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null);
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), orderDto.getMatnr(), null,getHostId());
if (orderDetl.getAnfme() - orderDetl.getQty() < orderDto.getAnfme()) {
return R.ok(orderDto.getOrderNo() + "璁㈠崟宸蹭綔涓氾紝璇峰強鏃跺埛鏂伴〉闈�");
}
--
Gitblit v1.9.1