From c528736e1c65a8a49277efeefeca257efddeb34a Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期三, 11 三月 2026 18:35:58 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/OutController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 7717dcc..6877bfc 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -7,12 +7,14 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.enums.LocAreaType;
+import com.zy.api.enums.MatLocType;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasAreasServiceImpl;
import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.asrs.service.impl.LocCacheServiceImpl;
+import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -61,6 +63,8 @@
private LocCacheServiceImpl locCacheService;
@Autowired
private BasStationServiceImpl basStationService;
+ @Autowired
+ private MatService matService;
@PostMapping("/out/pakout/orderDetlIds/auth")
@@ -169,10 +173,20 @@
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
locDto.setFrozen(locDetl.getFrozen());
locDto.setFrozenLoc(locMast.getFrozen());
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), currentIssue >= available ? 101 : 103);
- locDto.setStaNos(staNos);
- locDto.setBrand(orderDetl.getBrand());
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>()
+ .eq("matnr", locDetl.getMatnr())
+ .eq("supp_code", locDetl.getSuppCode()));
+ if (Objects.isNull(mat)) {
+ throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ if (!Objects.isNull(mat.getLocType()) && mat.getLocType().equals(Long.parseLong(MatLocType.EO_HOLDING.type))) {
+ locDto.setStaNos(Arrays.asList(240));
+ } else {
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), currentIssue >= available ? 101 : 103);
+ locDto.setStaNos(staNos);
+ }
+ locDto.setBrand(orderDetl.getBrand());
locDto.setStandby1(orderDetl.getStandby1());
locDto.setStandby2(orderDetl.getStandby2());
locDto.setStandby3(orderDetl.getStandby3());
--
Gitblit v1.9.1