weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改一般贸易的详情数据查询

Browse Source
This commit is contained in:
zhaoqing
2026-06-23 17:12:19 +08:00
parent bc3bdd669e
commit 186d76f9fc
2 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java
+56 -20
View File
@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mhd.common.core.web.page.TableDataInfo;
import com.mhd.oms.domain.materialPushRecord.entity.MaterialPushRecord;
import com.mhd.oms.domain.materialPushRecord.repository.mapper.MaterialPushRecordMapper;
import com.mhd.oms.domain.documentPushMaterialRecord.entity.DocumentPushMaterialRecord;
import com.mhd.oms.domain.documentPushMaterialRecord.repository.mapper.DocumentPushMaterialRecordMapper;
import com.mhd.system.api.WmsServiceFeign;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -24,11 +24,14 @@ public class MaterialPushRecordService {
@Resource
private WmsServiceFeign wmsServiceFeign;
@Resource
private DocumentPushMaterialRecordMapper documentPushMaterialRecordMapper;
/**
* 按物料ID列表查询物料数据
* 优先查物料推送快照，没有则调WMS查实时数据
* 先按orderId查单证推送快照，没有再查物料推送快照，最后调WMS
*/
public TableDataInfo getBatchByIds(List<Long> materialBaseInfoIds) {
public TableDataInfo getBatchByIds(List<Long> materialBaseInfoIds, Long orderId) {
if (materialBaseInfoIds == null || materialBaseInfoIds.isEmpty()) {
TableDataInfo emptyResult = new TableDataInfo();
emptyResult.setData(new ArrayList<>());
@@ -37,28 +40,61 @@ public class MaterialPushRecordService {
return emptyResult;
}
// 1. 先查物料推送记录表
List<MaterialPushRecord> pushRecords = materialPushRecordMapper.selectList(
new LambdaQueryWrapper<MaterialPushRecord>()
.in(MaterialPushRecord::getMaterialBaseInfoId, materialBaseInfoIds)
.eq(MaterialPushRecord::getDelFlag, 1));
if (pushRecords != null && !pushRecords.isEmpty()) {
// 1. 先按orderId查单证推送物料记录表
List<DocumentPushMaterialRecord> docRecords = documentPushMaterialRecordMapper.selectList(
new LambdaQueryWrapper<DocumentPushMaterialRecord>()
.eq(DocumentPushMaterialRecord::getOrderId, orderId)
.eq(DocumentPushMaterialRecord::getDelFlag, 1));
if (docRecords != null && !docRecords.isEmpty()) {
// 有单证推送数据，按物料ID去重取最新一条，并检查是否覆盖所有请求的物料ID
Map<Long, DocumentPushMaterialRecord> latestMap = new HashMap<>();
for (DocumentPushMaterialRecord r : docRecords) {
Long mid = r.getMaterialBaseInfoId();
if (mid == null) continue;
DocumentPushMaterialRecord old = latestMap.get(mid);
if (old == null || (r.getPushTime() != null && old.getPushTime() == null)
|| (r.getPushTime() != null && old.getPushTime() != null && r.getPushTime().after(old.getPushTime()))) {
latestMap.put(mid, r);
}
}
// 检查是否所有请求的物料ID都查到了
Set<Long> foundIds = pushRecords.stream()
.map(MaterialPushRecord::getMaterialBaseInfoId)
.collect(Collectors.toSet());
if (foundIds.containsAll(materialBaseInfoIds)) {
// 全部ID都有推送快照，直接返回
if (latestMap.keySet().containsAll(materialBaseInfoIds)) {
List<DocumentPushMaterialRecord> resultList = new ArrayList<>(latestMap.values());
TableDataInfo result = new TableDataInfo();
result.setData(pushRecords);
result.setTotal(pushRecords.size());
result.setData(resultList);
result.setTotal(resultList.size());
result.setCode(200);
return result;
}
}
// 2. 有物料没有推送数据，调WMS查全部实时数据
// 2. 查物料推送记录表
List<MaterialPushRecord> pushRecords = materialPushRecordMapper.selectList(
new LambdaQueryWrapper<MaterialPushRecord>()
.in(MaterialPushRecord::getMaterialBaseInfoId, materialBaseInfoIds)
.eq(MaterialPushRecord::getDelFlag, 1));
if (pushRecords != null && !pushRecords.isEmpty()) {
// 按物料ID去重取最新一条
Map<Long, MaterialPushRecord> latestMap = new HashMap<>();
for (MaterialPushRecord r : pushRecords) {
Long mid = r.getMaterialBaseInfoId();
if (mid == null) continue;
MaterialPushRecord old = latestMap.get(mid);
if (old == null || (r.getPushTime() != null && old.getPushTime() == null)
|| (r.getPushTime() != null && old.getPushTime() != null && r.getPushTime().after(old.getPushTime()))) {
latestMap.put(mid, r);
}
}
if (latestMap.keySet().containsAll(materialBaseInfoIds)) {
TableDataInfo result = new TableDataInfo();
result.setData(new ArrayList<>(latestMap.values()));
result.setTotal(latestMap.size());
result.setCode(200);
return result;
}
}
// 3. 都没有全命中，调WMS查全部实时数据
try {
return wmsServiceFeign.getBatchByIds(materialBaseInfoIds);
} catch (Exception e) {
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java
+4 -3
View File
@@ -17,9 +17,10 @@ public class MaterialPushRecordApi {
@Resource
private MaterialPushRecordService materialPushRecordService;
@ApiOperation("批量查询物料推送数据（优先查推送快照，没有则调WMS查实时数据）")
@ApiOperation("批量查询物料推送数据（先按orderId查单证推送快照，再按物料id查推送快照，最后调WMS）")
@GetMapping("/getBatchByIds")
public AjaxResult getBatchByIds(@RequestParam("materialBaseInfoIds") List<Long> materialBaseInfoIds) {
return AjaxResult.success(materialPushRecordService.getBatchByIds(materialBaseInfoIds));
public AjaxResult getBatchByIds(@RequestParam("materialBaseInfoIds") List<Long> materialBaseInfoIds,
@RequestParam("orderId") Long orderId) {
return AjaxResult.success(materialPushRecordService.getBatchByIds(materialBaseInfoIds, orderId));
}
}