From 34f587564c9a34515e7deda4dcd02eb748480e1f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 一月 2025 18:05:24 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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..a38e315 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
@@ -16,12 +16,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -87,7 +90,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 +102,22 @@
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) {
+ if(StringUtils.isBlank(ioCode)){
+ continue;
+ }
WmsJobContractVO wmsJobContractVO = new WmsJobContractVO();
wmsJobContractVO.setContractCode(ioCode);
- wmsJobContractVO.setAddress(platformWmsJob.getRepertotyAddress());
wmsJobContractVO.setPlatformWmsDetailList(
- platformWmsDetailList.stream().filter(i->i.getIocode().equals(ioCode)).collect(Collectors.toList())
+ platformWmsDetailList.stream().filter(i-> StringUtils.equals(i.getContractNum(),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