From e9e62abb618d334d6999102ec20c49d38df587e6 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 15 十月 2025 13:10:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 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 abfc36d..844fe80 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -1,6 +1,5 @@
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;
@@ -8,24 +7,26 @@
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 lombok.extern.slf4j.Slf4j;
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
*/
@RestController
+@Slf4j
public class OutController extends BaseController {
@Autowired
@@ -43,6 +44,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) {
@@ -51,17 +60,43 @@
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
+
+ Set<String> exist = new HashSet<>();
+
+ Set<String> exist2 = new HashSet<>();
+
for (OrderDetl orderDetl : orderDetls) {
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+ List<LocDetl> locDetls = new ArrayList<>();
+ 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);
+ locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist2);
+ //if (Cools.isEmpty(orderDetl.getBomCode())) {
+ // locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+ //} else {
+ // locDetls = locDetlService.queryStockByBomcode(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBomCode(),null, exist);
+ //}
+// locDetls = locDetlService.queryStockByBomcode(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBomCode(),null, exist);
for (LocDetl locDetl : locDetls) {
+ if (exist2.contains(locDetl.getLocNo())) {
+ for (LocDto locDto : locDtos) {
+ if(Cools.isEmpty(locDto.getLocNo())) { continue; }
+ if (locDto.getLocNo().equals(locDetl.getLocNo())) {
+ locDetl.setAnfme(locDetl.getAnfme() - locDto.getAnfme());
+ }
+ }
+ }
if (issued > 0) {
+ if (locDetl.getAnfme() <= 0) break;
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 locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+// locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
+// //閫熻吘鍙湁鍏ㄦ澘锛屾墍浠ュ彧鑳�101鍏ㄦ澘鍑哄簱
+// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101);
locDto.setStaNos(staNos);
locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
} else {
@@ -70,6 +105,7 @@
}
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
}
@@ -83,17 +119,18 @@
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
- boolean refuse = true;
+ boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
- refuse = !refuse;
+ lack = false;
+ break;
}
}
- if (refuse) {
+ if (lack) {
return R.error("搴撳瓨涓嶈冻");
}
- Thread.sleep(500L);
+ Thread.sleep(1000L);
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
@@ -109,6 +146,7 @@
}
}
// -----------------------------------------------------------------------------------------------
+ log.info("鍑哄簱鍒嗙粍鏁版嵁锛歿}",taskDtos);
for (TaskDto taskDto : taskDtos) {
BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
workService.stockOut(staNo, taskDto, getUserId());
--
Gitblit v1.9.1