From 83f738105416c9b11e3b7c5246a0980e41b6650e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 十月 2025 16:59:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
index 1ab8446..2299c73 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
@@ -303,33 +303,32 @@
for (List<HollowGlassRelationInfo> item : tempHollowList) {
relationInfoList.addAll(item);
}
- log.info("鍒嗛厤瀹屾瘯");
- this.saveBatch(relationInfoList);
+ log.info("鍒嗛厤瀹屾瘯:{}", relationInfoList);
+ try {
+ this.saveBatch(relationInfoList);
+ } catch (Exception e) {
+ log.error("淇濆瓨澶辫触:{}", e);
+ }
}
@Override
public List<HollowAllFlowCardVO> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query) {
Date startDate = new Date();
log.info("寮�濮嬫煡璇腑绌烘祦绋嬪崱浠诲姟淇℃伅锛屽紑濮嬫椂闂磠}", startDate);
- List<HollowBigStorageCageDetails> detailsList = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
- .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
- .like(StringUtils.isNotBlank(query.getFlowCardId()), HollowBigStorageCageDetails::getFlowCardId, query.getFlowCardId())
- .eq(query.getThickness() != 0, HollowBigStorageCageDetails::getThickness, query.getThickness())
- .orderByAsc(HollowBigStorageCageDetails::getFlowCardId)
- );
+ List<FlowCardGlassInfoDTO> detailsList = hollowBigStorageCageDetailsService.queryHollowAllFlowCard(query);
+
if (CollectionUtil.isEmpty(detailsList)) {
log.info("绗煎唴鏃犵幓鐠�");
return new ArrayList<>();
}
Date middleDate = new Date();
log.info("涓┖鐞嗙墖绗艰鎯呮暟鎹凡鏌ヨ瀹屾瘯锛岃�楁椂:{}ms", middleDate.getTime() - startDate.getTime());
- Map<String, List<HollowBigStorageCageDetails>> listMap = detailsList.stream().collect(Collectors.groupingBy(HollowBigStorageCageDetails::getFlowCardId));
+ Map<String, List<FlowCardGlassInfoDTO>> listMap = detailsList.stream().collect(Collectors.groupingBy(FlowCardGlassInfoDTO::getFlowCardId));
List<HollowAllFlowCardVO> resultList = new ArrayList<>();
AtomicInteger pairTotalCount = new AtomicInteger();
listMap.forEach((e, v) -> {
HollowAllFlowCardVO hollowAllFlowCardVO = new HollowAllFlowCardVO();
- HollowBigStorageCageDetails cageDetails = v.get(0);
+ FlowCardGlassInfoDTO cageDetails = v.get(0);
//鎸夌収娴佺▼鍗¤幏鍙栧搴旂殑浜у搧鍚嶇О
OrderDetailsDTO orderDetails = this.queryProductNameByFlowCardId(cageDetails.getFlowCardId(), query.getProductName(), query.getCustomerName());
if (null != orderDetails) {
@@ -340,12 +339,8 @@
} else {
hollowAllFlowCardVO.setIsThroughSlot(Boolean.FALSE);
}
- List<FlowCardGlassInfoDTO> flowCardInfoList = hollowBigStorageCageDetailsService.hollowIsAll(e, cageDetails.getTotalLayer(), Boolean.FALSE);
- log.info("鑾峰彇鍒扮殑娴佺▼鍗′俊鎭负:{}", flowCardInfoList);
- if (CollectionUtil.isNotEmpty(flowCardInfoList)) {
- hollowAllFlowCardVO.setFlowCardGlassInfoDTOList(flowCardInfoList);
- pairTotalCount.addAndGet(flowCardInfoList.get(0).getPairCount());
- }
+ hollowAllFlowCardVO.setFlowCardGlassInfoDTOList(v);
+ pairTotalCount.addAndGet(cageDetails.getPairCount());
resultList.add(hollowAllFlowCardVO);
}
});
@@ -407,14 +402,20 @@
}
@Override
- public List<LackDetailsDTO> queryLackByFlowCard() {
- List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard();
+ public List<LackDetailsDTO> queryAllLackByFlowCard() {
+ List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryAllLackByFlowCard();
return lackDetailsList;
}
@Override
public int queryLayerByFlowCardId(String flowCardId) {
return baseMapper.queryLayerByFlowCardId(flowCardId);
+ }
+
+ @Override
+ public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
+ List<LackDetailsDTO> detailsDTOS = baseMapper.queryLackByFlowCard(flowCardId);
+ return detailsDTOS.stream().collect(Collectors.groupingBy(item -> item.getLayer()));
}
@Override
@@ -448,13 +449,13 @@
}
@Override
- public List<GlassInfo> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query) {
+ public List<LackDetailsDTO> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query) {
return baseMapper.queryLackGlassByFlowCard(query.getFlowCardId(), query.getOrderSort(), query.getLayer());
}
@Override
public OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId, String productName, String customerName) {
- OrderDetailsDTO dto = hollowGlassOutRelationInfoService.queryProductNameByFlowCardId(flowCardId);
+ OrderDetailsDTO dto = ordersService.queryProductNameByFlowCardId(flowCardId);
if ((StringUtils.isBlank(productName) || dto.getProductName().contains(productName)) && (StringUtils.isBlank(customerName) || dto.getCustomerName().contains(customerName))) {
return dto;
}
--
Gitblit v1.8.0