From f0c28c1962d5635db98c79fa9f05a55d43894d11 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期三, 30 十一月 2022 10:08:09 +0800
Subject: [PATCH] #回退11-14部分代码
---
src/main/java/com/zy/asrs/controller/OutController.java | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 70c0187..a58988f 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -14,9 +14,11 @@
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
@@ -40,6 +42,14 @@
@Autowired
private BasDevpService basDevpService;
+
+ @PostMapping("/out/pakout/orderDetlIds/auth")
+ @ManagerAuth
+ public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
+ Thread.sleep(200);
+ return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
+ }
+
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
public R pakoutPreview(@RequestBody List<Long> ids) {
@@ -54,9 +64,10 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null);
+
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+
for (LocDetl locDetl : locDetls) {
-// if (exist.contains(locDetl.getLocNo())) { continue; }
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
@@ -102,6 +113,11 @@
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
if (locDto.isLack()) { continue; }
+
+ //娣诲姞閮ㄥ垎:澧炲姞宸ヤ綔鏁伴噺
+ // orderDetlService.increaseWorkQtytest(locDto.getOrderNo(),locDto.getMatnr(),locDto.getBatch(),locDto.getAnfme());
+
+
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
@@ -119,4 +135,77 @@
return R.ok();
}
+ @PostMapping("/out/pakout/preview/authtest")
+ @ManagerAuth
+ public R pakoutPreviewtest(@RequestBody List<Long> ids) {
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<LocDto> locDtos = new ArrayList<>();
+
+ Set<String> exist = new HashSet<>();
+
+ boolean boo=false;
+
+ for (OrderDetl orderDetl : orderDetls) {
+ 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(), null, exist);
+
+ if(!Cools.isEmpty(locDetls)){
+ boo=true;
+ //鍒ゆ柇鍑哄簱鏁伴噺鏄惁澶т簬瑕佸嚭鐨勭墿鍝�
+ LocDto locDtoo = new LocDto(locDetls.get(0).getLocNo(), locDetls.get(0).getMatnr(), locDetls.get(0).getMaktx(), locDetls.get(0).getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetls.get(0).getAnfme() ? locDetls.get(0).getAnfme() : issued);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetls.get(0).getLocNo(), issued >= locDetls.get(0).getAnfme() ? 101 : 103);
+ locDtoo.setStaNos(staNos);
+ if(issued<locDetls.get(0).getAnfme()){
+
+ locDtos.add(locDtoo);
+ exist.add(locDetls.get(0).getLocNo());
+ break;
+ }else if(issued==locDetls.get(0).getAnfme()){
+
+ locDtos.add(locDtoo);
+ exist.add(locDetls.get(0).getLocNo());
+ break;
+ }else {
+
+ locDtos.add(locDtoo);
+ exist.add(locDetls.get(0).getLocNo());
+ issued=issued-locDetls.get(0).getAnfme();
+ }
+ }
+ List<LocDetl> locDetlList =new ArrayList<>();
+ if(boo){
+ locDetlList=locDetlService.queryStockOther(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,locDetls.get(0).getLocNo());
+ }else{
+ locDetlList=locDetlService.queryStockOther(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,null);
+ }
+ for (LocDetl locDetl : locDetlList) {
+ 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> staNoss = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ locDto.setStaNos(staNoss);
+
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ 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);
+ }
+ }
+ return R.ok().add(locDtos);
+ }
+
}
--
Gitblit v1.9.1