From 89c7b3a61b7e182cb420a8ae0bee8b983f1311c6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 三月 2022 11:08:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 9f494e4..49d5e1c 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -6,10 +6,7 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.result.StoPreTab;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
import com.zy.common.web.BaseController;
@@ -35,6 +32,8 @@
private LocDetlService locDetlService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private StaDescService staDescService;
// @PostMapping("/out/pakout/preview/auth")
// public R pakoutPreview(@RequestBody List<Long> ids) {
@@ -77,14 +76,15 @@
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
- // check stock
-// Double stockAnfme = locDetlService.queryStockAnfme(orderDetl.getMatnr(), orderDetl.getBatch());
double issued = Optional.ofNullable(orderDetl.getAnfme()).orElse(0.0D) ;
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
- locDtos.add(new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued>=locDetl.getAnfme()?locDetl.getAnfme():issued));
+ 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);
+ locDto.setStaNos(staNos);
+ locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
} else {
@@ -92,7 +92,9 @@
}
}
if (issued > 0) {
- locDtos.add(new LocDto("缂鸿揣", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued));
+ 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