From 54629f35d244cbe96da1ad5c30c821bb4d300b41 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 06 九月 2024 14:38:27 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OutController.java | 162 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 124 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 49d5e1c..eb631b7 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,21 +1,25 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.result.StoPreTab;
import com.zy.asrs.service.*;
-import com.zy.common.model.DetlDto;
import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
@@ -34,70 +38,152 @@
private LocMastService locMastService;
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private BasDevpService basDevpService;
-// @PostMapping("/out/pakout/preview/auth")
-// public R pakoutPreview(@RequestBody List<Long> ids) {
+
+ @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) {
// 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()));
-// }
-// }
+// //鐢ㄦ埛纭鍑哄叆搴撻兘浠gno涓哄噯锛岄偅涔堜笉鑰冭檻鏁伴噺浜�
// 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);
+// if (orderDetls != null && !orderDetls.isEmpty()) {
+// List<LocDetl> locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
// 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;
-// }
+// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetls.get(0).getOrderNo(),
+// locDetl.getAnfme());
+// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101);
+// locDto.setStaNos(staNos);
+// locDto.setZpallet(locDetl.getZpallet());
+// locDto.setSPgNO(orderDetls.get(0).getSPgNO());
+// locDtos.add(locDto);
// }
// }
// 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);
List<LocDto> locDtos = new ArrayList<>();
+ orderDetls = orderDetls.stream()
+ .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
+ .collect(Collectors.toList());
+ Set<String> exist = new HashSet<>();
+
for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.ofNullable(orderDetl.getAnfme()).orElse(0.0D) ;
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null);
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+ List<LocDetl> locDetls = null;
+ if (Cools.isEmpty(orderDetls.get(0).getSPgNO())) {
+ locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
+ if (locDetls == null) {
+ locDetls = locDetlService.queryStock(orderDetl.getMatnr(), null, null, null);
+ }
+ } else {
+ locDetls = locDetlService.queryStock(orderDetl.getSPgNO());
+ }
+
for (LocDetl locDetl : locDetls) {
- 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);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
+ if (Cools.isEmpty(locDetl.getBatch()) || Cools.isEmpty(orderDetl.getBatch())) {
+ if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
+ 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);
+ locDto.setStaNos(staNos);
+ locDto.setModel(locDetl.getModel());
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
} else {
- break;
+ if (locDetl.getMatnr().equals(orderDetl.getMatnr()) && locDetl.getBatch().equals(orderDetl.getBatch())) {
+ 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);
+ locDto.setStaNos(staNos);
+ locDto.setModel(locDetl.getModel());
+ 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);
+ locDto.setModel(orderDetl.getModel());
locDtos.add(locDto);
}
}
return R.ok().add(locDtos);
}
+ @PostMapping("/out/pakout/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ if (Cools.isEmpty(locDtos)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ boolean lack = true;
+ for (LocDto locDto : locDtos) {
+ if (!locDto.isLack()) {
+ lack = false;
+ break;
+ }
+ }
+ if (lack) {
+ return R.error("搴撳瓨涓嶈冻");
+ }
+
+ Thread.sleep(1000L);
+
+ List<TaskDto> taskDtos = new ArrayList<>();
+ // 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
+ for (LocDto locDto : locDtos) {
+ if (locDto.isLack()) {
+ continue;
+ }
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
+ if (TaskDto.has(taskDtos, taskDto)) {
+ TaskDto dto = TaskDto.find(taskDtos, taskDto);
+ assert dto != null;
+ dto.getLocDtos().addAll(taskDto.getLocDtos());
+ } else {
+ taskDtos.add(taskDto);
+ }
+ }
+ // -----------------------------------------------------------------------------------------------
+ for (TaskDto taskDto : taskDtos) {
+ BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
+ workService.stockOut(staNo, taskDto, getUserId());
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1