From 48d8d31c884712a5dae653bc4c53ed6ae9e5b781 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 12 十一月 2023 17:30:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 134 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 130 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 8f20a4f..17b8e4a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,18 +1,27 @@
package com.zy.asrs.controller;
+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.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.WorkServiceImpl;
+import com.zy.asrs.utils.OutboundAllocationUtil;
+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.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/3/26
@@ -25,15 +34,132 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private WorkService workService;
+ @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) {
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
- return R.ok().add(orderDetls);
+ List<LocDto> locDtos = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls) {
+ LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(),
+ orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme());
+ locDtos.add(locDto);
+ }
+
+
+
+// Set<String> exist = new HashSet<>();
+
+// 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);
+// 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);
+// 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);
+ }
+
+ @PostMapping("/out/pakout/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ StockOutParam param = new StockOutParam();
+ ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
+ for (LocDto locDto:locDtos){
+ StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
+ locDetl.setBrand(locDto.getBrand());
+ locDetl.setLocNo(locDto.getLocNo());
+ locDetl.setAnfme(locDto.getAnfme());
+ locDetl.setMatnr(locDto.getMatnr());
+ locDetl.setBatch(locDto.getBatch());
+ locDetl.setModel(locDto.getModel());
+ locDetl.setSpecs(locDto.getSpecs());
+ locDetl.setZpallet(locDto.getZpallet());
+
+ param.setOrderNo(locDto.getOrderNo());
+
+ locDetls.add(locDetl);
+ }
+ param.setLocDetls(locDetls);
+
+ List<StockOutParam> stockOutParams = OutboundAllocationUtil.OutboundClassification(param);
+ for (StockOutParam stockOutParam : stockOutParams){
+ workService.startupFullTakeStore(stockOutParam, getUserId());
+ }
+// 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