From 0a3a59432a0ff8d4169ad7484250a0a0d5bed1f9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 09 一月 2025 19:50:58 +0800
Subject: [PATCH] # 1. 波次预览重复问题 2. PDA组拖超过3个物料后，组拖按钮被遮挡 3. 平库入库物料ID为空 4. PDA出库成功后，界面数据重置，避免重复操作 5. 入库单历史档，按时间倒序排列
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 65 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index 6a4b7d9..2a97b80 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mysql.cj.util.StringUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.dto.*;
import com.zy.asrs.wms.asrs.entity.dto.OrderOutMergeDto;
@@ -24,6 +25,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* 鍑哄簱绠＄悊
@@ -551,7 +553,7 @@
sortParams.add(sortParam);
List<MergePreviewResultDto> resultDtos = new ArrayList<>();
-
+ //浼樺厛鏌ヨ骞冲簱鏁版嵁
param.forEach(pars -> {
List<MergePreviewResultLocDto> locDtos = new ArrayList<>();
MergePreviewResultDto resultDto = new MergePreviewResultDto();
@@ -600,15 +602,9 @@
resultDtos.add(resultDto);
- } else {
- resultDto.sync(pars);
- resultDto.setLocs(new ArrayList<>());
- resultDto.setOrderIds(pars.getOrderIds());
- resultDto.setAnfme(pars.getAnfme());
- resultDtos.add(resultDto);
}
});
-
+ //骞冲簱鏌ヨ瀹屾垚鍚庯紝鍐嶆煡璇CU
for (MergePreviewDto dto : param) {
Double anfme = dto.getAnfme() - dto.getWorkQty();
//鍑忓幓骞冲簱鏁伴噺鍚庯紝灏忎簬绛変簬0锛岃烦鍑哄鐞�
@@ -647,7 +643,7 @@
locDto.setLocId(locDetl.getLocId());
locDto.setLocNo(locDetl.getLocNo());
locDto.setLocDetlId(locDetl.getId());
-
+ locDto.setTypeId(LocAreaTypeSts.LOC_AREA_TYPE_UTC.id);
locDtos.add(locDto);
if (anfme - locDetl.getAnfme() < 0) {
locDto.setAnfme(anfme);
@@ -671,6 +667,7 @@
MergePreviewResultLocDto locDto = new MergePreviewResultLocDto();
locDto.setLocId(locDetl.getLocId());
locDto.setLocNo(locDetl.getLocNo());
+ locDto.setTypeId(LocAreaTypeSts.LOC_AREA_TYPE_UTC.id);
locDto.setLocDetlId(locDetl.getId());
locDto.setAnfme(locDetl.getAnfme());
otherLocDtos.add(locDto);
@@ -1014,9 +1011,13 @@
//TUC鏁版嵁婧�
List<OrderOutMergeParam> tucOrders = new ArrayList<>();//listMap.get(LocAreaTypeSts.LOC_AREA_TYPE_UTC);
//鎸夊簱浣嶇被鍨嬪垎绫�
- Map<Long, List<OrderOutMergeParam>> listMap = params.stream().collect(Collectors.groupingBy(OrderOutMergeParam::getTypeId));
-
+ //fixme 濡傛灉搴撳瓨涓嶈冻鏃讹紝鐢熸垚浠诲姟妗� 杩囨护鎺夋病鏈夊簱浣嶄俊鎭殑鏁版嵁銆傛壘鍚涙澃纭
+ List<OrderOutMergeParam> mergeParam = params.stream().filter(par -> {
+ return !StringUtils.isNullOrEmpty(par.getLocNo());
+ }).collect(Collectors.toList());
//鏁版嵁鍒嗙被 1.骞冲簱鏁版嵁 2. TUC鏁版嵁
+ Map<Long, List<OrderOutMergeParam>> listMap = mergeParam.stream().collect(Collectors.groupingBy(OrderOutMergeParam::getTypeId));
+
listMap.keySet().forEach(key -> {
if (key == LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id) {
flatOrders.addAll(listMap.get(key));
@@ -1045,9 +1046,7 @@
*/
private void outStockByTUC(List<OrderOutMergeParam> tucOrders, Wave wave) {//123
Map<Long, List<OrderOutMergeDto>> map = checkLoc(tucOrders, wave);
- if (!Objects.isNull(map)) {
- return;
- }
+
for (Map.Entry<Long, List<OrderOutMergeDto>> entry : map.entrySet()) {
Long locId = entry.getKey();
List<OrderOutMergeDto> list = entry.getValue();
@@ -1232,12 +1231,12 @@
throw new CoolException("閫氶亾鍙傛暟涓嶈兘涓虹┖");
}
- for (String channel : channels) {
- long count = cacheSiteService.count(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, channel).ne(CacheSite::getSiteStatus, 0));
- if (count > 0) {
- throw new CoolException(channel + "閫氶亾宸茬粡鍒嗛厤娉㈡");
- }
- }
+// for (String channel : channels) {
+// long count = cacheSiteService.count(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getChannel, channel).ne(CacheSite::getSiteStatus, 0));
+// if (count > 0) {
+// throw new CoolException(channel + "閫氶亾宸茬粡鍒嗛厤娉㈡");
+// }
+// }
List<Long> orderIds = param.getOrderIds();
@@ -1290,19 +1289,19 @@
throw new CoolException("璁㈠崟鍙嶅啓娉㈡澶辫触");
}
- List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).in(CacheSite::getChannel, channels).orderBy(true, true, CacheSite::getChannel));
- if (cacheSites.isEmpty()) {
- throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
- }
-
- CacheSite cacheSite = cacheSites.get(0);
- cacheSite.setOrderId(order.getId());
- cacheSite.setOrderNo(order.getOrderNo());
- cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
- cacheSite.setUpdateTime(new Date());
- if (!cacheSiteService.updateById(cacheSite)) {
- throw new CoolException("缂撳瓨绔欐洿鏂板け璐�");
- }
+// List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).in(CacheSite::getChannel, channels).orderBy(true, true, CacheSite::getChannel));
+// if (cacheSites.isEmpty()) {
+// throw new CoolException("缂撳瓨绔欑┖闂翠笉瓒筹紝璇风◢鍚庡啀璇�");
+// }
+//
+// CacheSite cacheSite = cacheSites.get(0);
+// cacheSite.setOrderId(order.getId());
+// cacheSite.setOrderNo(order.getOrderNo());
+// cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
+// cacheSite.setUpdateTime(new Date());
+// if (!cacheSiteService.updateById(cacheSite)) {
+// throw new CoolException("缂撳瓨绔欐洿鏂板け璐�");
+// }
}
for (Map.Entry<String, List<OrderDetl>> entry : map.entrySet()) {
--
Gitblit v1.9.1