From e6f31381b0b92a79f47389d10aa20db96ba40e58 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 13 一月 2025 16:28:31 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
index 16ef858..43c3f82 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java
@@ -22,6 +22,8 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -87,7 +89,9 @@
@Override
public PlatformWmsJob findByDetailId(Integer id) {
- PlatformWmsJob platformWmsJob = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda().eq(PlatformWmsJob::getIsdeleted, Constants.ZERO).eq(PlatformWmsJob::getJobId,id).last(" limit 1 "));
+ PlatformWmsJob platformWmsJob = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().
+ lambda().eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ .eq(PlatformWmsJob::getJobId,id).last(" limit 1 "));
if(Objects.isNull(platformWmsJob)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌杩愬崟淇℃伅");
}
@@ -97,17 +101,19 @@
platformWmsJob.setIoQty(
platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add)
);
- //鑾峰彇鎵�鏈夊悎鍚屽彿
- List<String> ioCodeList = platformWmsDetailList.stream().map(m->m.getIocode()).collect(Collectors.toList());
+ //鑾峰彇鎵�鏈夊悎鍚屽彿(鍘婚噸锛�
+ List<String> ioCodeList = platformWmsDetailList.stream().map(m->m.getContractNum()).distinct().collect(Collectors.toList());
Set<String> ioCodeSet = new HashSet<String>(ioCodeList);
List<WmsJobContractVO> wmsJobContractVOList = new ArrayList<>();
for (String ioCode:ioCodeSet) {
WmsJobContractVO wmsJobContractVO = new WmsJobContractVO();
wmsJobContractVO.setContractCode(ioCode);
- wmsJobContractVO.setAddress(platformWmsJob.getRepertotyAddress());
wmsJobContractVO.setPlatformWmsDetailList(
platformWmsDetailList.stream().filter(i->i.getIocode().equals(ioCode)).collect(Collectors.toList())
);
+ if(wmsJobContractVO.getPlatformWmsDetailList()!=null&& wmsJobContractVO.getPlatformWmsDetailList().size()>0){
+ wmsJobContractVO.setAddress(wmsJobContractVO.getPlatformWmsDetailList().get(0).getRepertotyAddress());
+ }
if(Objects.isNull(wmsJobContractVO.getLockStatus())&&
com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(wmsJobContractVO.getPlatformWmsDetailList())){
if(Constants.equalsInteger(platformWmsJob.getType(),Constants.ONE)){
--
Gitblit v1.9.3