From 978a64cef6ac485bff42b2faa4caf0e5bf1276e0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 三月 2022 10:15:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 9e66c95..eba9ffc 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -3,20 +3,22 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+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.common.model.DetlDto;
+import com.zy.common.model.LocDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* Created by vincent on 2022/3/26
@@ -31,29 +33,71 @@
private OrderDetlService orderDetlService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private LocMastService locMastService;
+
+// @PostMapping("/out/pakout/preview/auth")
+// public R pakoutPreview(@RequestBody List<Long> ids) {
+// if (Cools.isEmpty(ids)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+// Set<DetlDto> detlDtos = new HashSet<>();
+// for (OrderDetl orderDetl : orderDetls) {
+// if (DetlDto.hasList(detlDtos, orderDetl)) {
+// DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
+// assert detlDto != null;
+// detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
+// } else {
+// detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
+// }
+// }
+// List<LocDto> locDtos = new ArrayList<>();
+// for (DetlDto detlDto : detlDtos) {
+// double issued = Optional.ofNullable(detlDto.getAnfme()).orElse(0.0D) ;
+// List<LocDetl> locDetls = locDetlService.queryStock(detlDto.getMatnr(), detlDto.getBatch(), null);
+// for (LocDetl locDetl : locDetls) {
+// if (issued > 0) {
+// locDtos.add(new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), issued>=locDetl.getAnfme()?locDetl.getAnfme():issued));
+// // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+// issued = issued - locDetl.getAnfme();
+// } else {
+// break;
+// }
+// }
+// }
+// return R.ok().add(locDtos);
+// }
@PostMapping("/out/pakout/preview/auth")
public R pakoutPreview(@RequestBody List<Long> ids) {
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
- // 鍚堝苟鍚岀被椤�
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
- Set<DetlDto> detlDtos = new HashSet<>();
+ List<LocDto> locDtos = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
- if (DetlDto.hasList(detlDtos, orderDetl)) {
- DetlDto detlDto = DetlDto.find(detlDtos, orderDetl.getMatnr(), orderDetl.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + orderDetl.getAnfme());
- } else {
- detlDtos.add(new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme()));
+ // 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));
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ if (issued > 0) {
+ LocDto locDto = new LocDto("缂鸿揣", orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ locDto.setLack(Boolean.TRUE);
+ locDtos.add(locDto);
}
}
- //
-// List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo());
-
- return R.ok().add(orderDetls);
-
+ return R.ok().add(locDtos);
}
}
--
Gitblit v1.9.1