From 1674f2b873da35814f5f1bdd199b0b37d5d04a3b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 十月 2025 09:07:31 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformWmsJobServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 a38e315..ed86b04 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
@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.biz.system.SystemUserBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.service.business.third.model.PageData;
@@ -37,6 +39,8 @@
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
@@ -96,19 +100,26 @@
if(Objects.isNull(platformWmsJob)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌杩愬崟淇℃伅");
}
+ String codeStr =systemDictDataBiz.queryByCode(Constants.WMS_PARAM, Constants.WMS_IN_REPERTOTY_CODE_LIST).getCode();
List<PlatformWmsDetail> platformWmsDetailList = platformWmsDetailMapper.selectList(new QueryWrapper<PlatformWmsDetail>()
.lambda().eq(PlatformWmsDetail::getJobId,id).eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformWmsDetailList)){
platformWmsJob.setIoQty(
platformWmsDetailList.stream().map(m->m.getIoQty()).reduce(BigDecimal.ZERO,BigDecimal::add)
);
+ for(PlatformWmsDetail d :platformWmsDetailList){
+ if(StringUtils.isNotBlank(d.getInRepertotyCode())){
+ //渚涘簲鍟嗗悕绉�
+ d.setInRepertotyName(Constants.getWmsAreasNameByCode(codeStr,d.getInRepertotyCode()));
+ }
+ }
//鑾峰彇鎵�鏈夊悎鍚屽彿(鍘婚噸锛�
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;
+// continue;
}
WmsJobContractVO wmsJobContractVO = new WmsJobContractVO();
wmsJobContractVO.setContractCode(ioCode);
@@ -122,7 +133,7 @@
com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(wmsJobContractVO.getPlatformWmsDetailList())){
if(Constants.equalsInteger(platformWmsJob.getType(),Constants.ONE)){
if(Objects.isNull(wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus())){
- wmsJobContractVO.setLockStatus(Constants.ZERO
+ wmsJobContractVO.setLockStatus(Constants.ZERO
);
}else{
wmsJobContractVO.setLockStatus(
--
Gitblit v1.9.3