From 55b0ad7d6c0dbab544f23878626bc16b529f1950 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 八月 2025 14:26:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 1a0c62f..a03e8db 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -11,6 +11,7 @@
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -59,15 +60,22 @@
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
- public R pakoutPreview(@RequestBody List<Long> ids) {
+ public R pakoutPreview(@RequestBody HashMap<String,Object> param) {
+ List<Long> ids = (List<Long>) param.get("ids");
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
+ String cstateid = param.getOrDefault("cstateid", "").toString();
+
List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectBatchIds(ids);
if (orderDetlPakouts.size() == 0) {
return R.parse("璁㈠崟鏄庣粏涓虹┖");
}
+
+ List<String> disableCstateidList = new ArrayList<>();
+ disableCstateidList.add("1001A1100000000H0KJP");//涓嶅悎鏍�
+ disableCstateidList.add("1001A1100000000LFERA");//寰呭鐞�
List<LocDto> locDtos = new ArrayList<>();
@@ -83,8 +91,8 @@
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), cstateid);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -143,9 +151,13 @@
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), cstateid);
for (LocDetl locDetl : locDetls) {
+ if (disableCstateidList.contains(locDetl.getCstateid())) {
+ continue;
+ }
+
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
@@ -164,6 +176,8 @@
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
locDto.setUnit(orderDetl.getUnit());
+ locDto.setInitialAnfme(locDetl.getAnfme());//鍘熸墭鐩樻暟閲�
+ locDto.setInitialWeight(locDetl.getWeight());//鍘熸墭鐩樿緟鏁伴噺
//璁＄畻杈呭崟浣�
Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
@@ -228,6 +242,22 @@
}
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locNo, ioType);
+ User user = null;
+ try {
+ user = getUser();
+ } catch (Exception e) {
+
+ }
+ if(user != null) {
+ Integer defaultOutSta = user.getDefaultOutSta();
+ if(defaultOutSta != null) {
+ if (staNos.contains(defaultOutSta)) {
+ staNos.remove(defaultOutSta);
+ staNos.add(0, defaultOutSta);
+ }
+ }
+ }
+
locStaNosMap.put(locNo, staNos);
}
--
Gitblit v1.9.1