From 50acd5996ba9f88bbfd4341855c38b625598a190 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 24 十月 2024 20:29:35 +0800
Subject: [PATCH] 打印添加制令,晚上订单上报
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 a56d3aa..731fb0e 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
@@ -54,17 +54,17 @@
Set<String> exist = new HashSet<>();
for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+ 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) {
-// 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());
@@ -135,6 +135,9 @@
LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocNo, locDto.getLocNo())
.eq(LocMast::getHostId, hostId));
+ if (locMast.getWhsType()!=0){
+ continue;
+ }
if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
return R.error("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
}
@@ -153,7 +156,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