From 41411a57fc0d237577aa10ccfc1aded50556f5ba Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 28 三月 2026 13:35:23 +0800
Subject: [PATCH] Revert "添加的分属环境配置文件 暂停上报功能"
---
src/main/java/com/zy/asrs/controller/OutController.java | 75 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index ec8168e..0e7d5d9 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")
@@ -84,7 +88,7 @@
List<LocDto> locDtos = new ArrayList<>();
- Set<String> exist = new HashSet<>();
+ Set<String> exist = new HashSet<>();
// 鑾峰彇璁㈠崟涓昏〃
OrderPakout orderPakOut = orderPakOutService.selectByNo(orderDetlPakouts.get(0).getOrderNo());
@@ -113,6 +117,7 @@
List<String> collect = basStations.stream().map(BasStation::getDevNo).collect(Collectors.toList());
locDto.setAgvStaNos(collect);
locDto.setBrand(orderDetl.getBrand());
+ locDto.setSuppCode(orderDetl.getSuppCode());
locDto.setStandby1(orderDetl.getStandby1());
locDto.setStandby2(orderDetl.getStandby2());
@@ -146,24 +151,43 @@
List<Long> areaIds = basAreas.stream()
.map(BasAreas::getId)
.collect(Collectors.toList());
+ Map<Long, Double> locDetlUsage = new HashMap<>();
for (OrderDetlPakout orderDetl : orderDetlPakouts) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, null,orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),areaIds);
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);
+ Long detlId = locDetl.getId();
+ Double used = locDetlUsage.getOrDefault(detlId, 0.0);
+ Double available = locDetl.getAnfme() - used;
+ if (available <= 0.000001) {
+ continue;
+ }
+
+ Double currentIssue = (issued >= available) ? available : issued;
+
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), currentIssue);
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(), issued >= locDetl.getAnfme() ? 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());
@@ -171,9 +195,10 @@
locDto.setBoxType2(orderDetl.getBoxType2());
locDto.setBoxType3(orderDetl.getBoxType3());
locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
+
+ locDetlUsage.put(detlId, used + currentIssue);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
+ issued = issued - currentIssue;
} else {
break;
}
@@ -309,6 +334,8 @@
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
+
+
List<LocDto> locDtoArrayList = new ArrayList<>();
for (LocDto locDto : locDtos){
if (locDto.getFrozen()!=1 && locDto.getFrozenLoc()!=1){
@@ -337,8 +364,8 @@
for (LocDto locDto : locDtos) {
if (locDto.isLack()) { continue; }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
- if (TaskDto.has(taskDtos, taskDto)) {
- TaskDto dto = TaskDto.find(taskDtos, taskDto);
+ if (TaskDto.hasAgv(taskDtos, taskDto)) {
+ TaskDto dto = TaskDto.findAgv(taskDtos, taskDto);
assert dto != null;
dto.getLocDtos().addAll(taskDto.getLocDtos());
} else {
@@ -346,14 +373,24 @@
}
}
// -----------------------------------------------------------------------------------------------
- for (TaskDto taskDto : taskDtos) {
-// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
- .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
- .eq("dev_no", taskDto.getAgvStaNo()));
- if (Objects.isNull(station)) { throw new CoolException("鏁版嵁閿欒锛岀珯鐐逛笉瀛樺湪鎴栧凡浣跨敤锛侊紒"); }
- workService.agvStockOut(station, taskDto, getUserId());
- }
+ Map<String, List<TaskDto>> listMap = taskDtos.stream().collect(Collectors.groupingBy(TaskDto::getLocNo));
+ listMap.keySet().forEach(locNo -> {
+ listMap.get(locNo).forEach(taskDto -> {
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
+ .eq("dev_no", taskDto.getAgvStaNo()));
+ if (Objects.isNull(station)) { throw new CoolException("鏁版嵁閿欒锛岀珯鐐逛笉瀛樺湪鎴栧凡浣跨敤锛侊紒"); }
+ workService.agvStockOut(station, taskDto, getUserId());
+ });
+ });
+// for (TaskDto taskDto : taskDtos) {
+//// BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
+// BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+// .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
+// .eq("dev_no", taskDto.getAgvStaNo()));
+// if (Objects.isNull(station)) { throw new CoolException("鏁版嵁閿欒锛岀珯鐐逛笉瀛樺湪鎴栧凡浣跨敤锛侊紒"); }
+// workService.agvStockOut(station, taskDto, getUserId());
+// }
return R.ok();
}
--
Gitblit v1.9.1