From 97789ba474555471e0347928e148f5971ad4285a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 15 十二月 2025 09:49:33 +0800
Subject: [PATCH] 1、 fixbug：中空创建任务查询异常 2、中空线关闭预先送一车逻辑
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 133 insertions(+), 18 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 61c9c18..03ac794 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.Const;
import com.mes.common.config.ConstSysConfig;
+import com.mes.damage.entity.Damage;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
import com.mes.glassinfo.entity.GlassInfo;
@@ -15,7 +16,9 @@
import com.mes.hollow.entity.HollowBigStorageCageDetails;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
import com.mes.hollow.entity.HollowGlassRelationInfo;
-import com.mes.hollow.entity.dto.*;
+import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
+import com.mes.hollow.entity.dto.HollowBigStorageDTO;
+import com.mes.hollow.entity.dto.LackDetailsDTO;
import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import com.mes.hollow.mapper.HollowGlassRelationInfoMapper;
@@ -23,6 +26,10 @@
import com.mes.hollow.service.HollowBigStorageCageService;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollow.service.HollowGlassRelationInfoService;
+import com.mes.order.entity.HollowGlassDetailsDTO;
+import com.mes.order.entity.OrderDetailsDTO;
+import com.mes.order.entity.ProcessCardReport;
+import com.mes.order.service.OrdersService;
import com.mes.sysconfig.service.SysConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -60,6 +67,8 @@
SysConfigService sysConfigService;
@Resource
DamageService damageService;
+ @Resource
+ OrdersService ordersService;
// @Value("${mes.slotWidth}")
// private Integer slotWidth;
// @Value("${mes.glassGap}")
@@ -107,11 +116,24 @@
if (null == relationInfoOne) {
throw new RuntimeException("鐩稿叧娴佺▼鍗℃湭鎵惧埌瀵瑰簲鐨勭粍鍙蜂俊鎭紝鐜荤拑娴佺▼鍗★細" + flowCardId + "锛屽簭鍙凤細" + glassType + "锛屾�诲眰鏁帮細" + totalLayer + "锛屽眰鏁帮細" + layer);
}
+ Integer slotMaxHeight = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_MAX_HEIGHT);
Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
+ HollowBigStorageCage storageCage = null;
+ if (Math.min(width, height) > slotMaxHeight) {
+ storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
+ .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth)
+ .eq(HollowBigStorageCage::getDeviceId, 6)
+ .orderByAsc(HollowBigStorageCage::getMaxThickness).last("limit 1"));
+ HollowBigStorageDTO storageDTO = new HollowBigStorageDTO();
+ BeanUtils.copyProperties(storageCage, storageDTO);
+ BeanUtils.copyProperties(relationInfoOne, storageDTO);
+ return storageDTO;
+ }
+
//璇︽儏琛ㄥ唴鑾峰彇鏈粍鏄惁宸茬粡鏈夌幓鐠冨湪绗煎瓙鍐咃紙0琛ㄧず鎻愬墠鍗犵敤锛�
int taskCount = hollowGlassOutRelationInfoService.count(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
.eq(HollowGlassOutRelationInfo::getFlowCardId, flowCardId));
- HollowBigStorageCage storageCage = null;
+
//濡傛灉涓嶅瓨鍦ㄥ垯閫夋嫨绗煎唴鏈敤鐨勬柊鏍煎瓙
if (taskCount > 0) {
storageCage = hollowBigStorageCageService.getOne(new LambdaQueryWrapper<HollowBigStorageCage>()
@@ -207,13 +229,13 @@
return;
}
//鎸夌収娴佺▼鍗¤幏鍙栨湰娴佺▼鍗℃渶鍚庝竴灞傛垨绗竴娆＄殑鐜荤拑鏁版嵁
- List<HollowGlassDetailsDTO> glassDetailsDTOS = this.baseMapper.queryFlowCardIdMaxLayerGlassInfo(flowCardId, totalLayer);
+ List<HollowGlassDetailsDTO> glassDetailsDTOS = ordersService.queryFlowCardIdMaxLayerGlassInfo(flowCardId, totalLayer);
if (CollectionUtil.isEmpty(glassDetailsDTOS)) {
log.info("褰撳墠娴佺▼鍗℃渶澶栧眰鏁版嵁鏈壘鍒帮紝璇峰湪erp纭鏁版嵁鏃犺锛屾祦绋嬪崱锛歿}锛屾�诲眰鏁皗}", flowCardId, totalLayer);
return;
}
if (totalLayer != layer) {
- glassDetailsDTOS = this.baseMapper.queryFlowCardIdLayerGlassInfo(flowCardId, totalLayer, layer);
+ glassDetailsDTOS = ordersService.queryFlowCardIdLayerGlassInfo(flowCardId, totalLayer, layer);
}
if (CollectionUtil.isEmpty(glassDetailsDTOS)) {
log.info("褰撳墠娴佺▼鍗℃渶澶栧眰鏁版嵁鏈壘鍒帮紝璇峰湪erp纭鏁版嵁鏃犺锛屾祦绋嬪崱锛歿}锛屾�诲眰鏁皗},灞傛暟{}", flowCardId, totalLayer, layer);
@@ -298,8 +320,12 @@
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
@@ -404,8 +430,90 @@
}
@Override
- public Map<Integer,List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
+ public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
List<LackDetailsDTO> detailsDTOS = baseMapper.queryLackByFlowCard(flowCardId);
+ return detailsDTOS.stream().collect(Collectors.groupingBy(item -> item.getLayer()));
+ }
+
+ @Override
+ public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCardByERP(String flowCardId) {
+ List<ProcessCardReport> processCardReports = ordersService.queryLackByERP(flowCardId);
+ if (CollectionUtil.isEmpty(processCardReports)) {
+ return null;
+ }
+ List<HollowBigStorageCageDetails> hollowBigStorageCageDetails = hollowBigStorageCageDetailsService.list(
+ new LambdaQueryWrapper<HollowBigStorageCageDetails>()
+ .eq(HollowBigStorageCageDetails::getFlowCardId, flowCardId)
+ .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL)
+ );
+ // 1. 缁熻姣忎釜 (glassType, layer) 缁勫悎鐨勫嚭鐜版鏁�
+ Map<String, Long> typeLayerCountMap = hollowBigStorageCageDetails.stream()
+ .map(detail -> detail.getGlassType() + "_" + detail.getLayer())
+ .collect(Collectors.groupingBy(
+ key -> key, // 浠ュ鍚堥敭涓哄垎缁勪緷鎹�
+ Collectors.counting() // 缁熻姣忎釜閿殑鍑虹幇娆℃暟
+ ));
+ // 2. 閬嶅巻骞舵寜娆℃暟鍑� quantity锛堥伩鍏嶈礋鏁帮級
+ processCardReports.forEach(report -> {
+ String reportPair = report.getOrderNumber() + "_" + report.getTechnologyNumber();
+ Long count = typeLayerCountMap.getOrDefault(reportPair, 0L);
+ if (count > 0) {
+ int newQuantity = Math.max(0, report.getLackQuantity() - count.intValue());
+ report.setLackQuantity(newQuantity);
+ }
+ });
+ List<LackDetailsDTO> detailsDTOS = baseMapper.queryLackByFlowCardByERP(processCardReports);
+ List<Damage> damages = damageService.queryUnTempByFlowCardId(flowCardId);
+// 1. 鎸�(orderNumber+layer)鍒嗙粍锛屽悓鏃剁紦瀛楧TO鐨勫叾浠栧瓧娈典綔涓烘ā鏉�
+ Map<String, List<Damage>> damageMap = new HashMap<>();
+ Map<String, LackDetailsDTO> dtoTemplateMap = new HashMap<>(); // 瀛樺偍鍒嗙粍瀵瑰簲鐨凞TO妯℃澘
+
+// 1.1 鍒濆鍖杁amage鍒嗙粍鍜孌TO妯℃澘
+ damages.forEach(damage -> {
+ if (damage.getOrderNumber() == null || damage.getTechnologyNumber() == null) {
+ return;
+ }
+ String key = damage.getOrderNumber() + "_" + damage.getTechnologyNumber();
+ damageMap.computeIfAbsent(key, k -> new ArrayList<>()).add(damage);
+ });
+
+ detailsDTOS.forEach(dto -> {
+ if (dto.getGlassType() == null || dto.getLayer() == null) {
+ return;
+ }
+ String key = dto.getGlassType() + "_" + dto.getLayer();
+ // 缂撳瓨绗竴涓狣TO浣滀负妯℃澘锛堝寘鍚叾浠栧瓧娈靛�硷級
+ dtoTemplateMap.putIfAbsent(key, dto);
+ });
+
+// 2. 鍖归厤骞舵洿鏂板師濮婦TO
+ detailsDTOS.forEach(dto -> {
+ if (dto.getGlassType() == null || dto.getLayer() == null) {
+ return;
+ }
+ String key = dto.getGlassType() + "_" + dto.getLayer();
+ List<Damage> damagess = damageMap.get(key);
+ if (damagess != null && !damagess.isEmpty()) {
+ Damage damage = damagess.remove(0);
+ dto.setGlassId(damage.getGlassId());
+ dto.setWorkingProcedure(damage.getWorkingProcedure());
+ }
+ });
+
+// 3. 澶勭悊鍓╀綑damage锛氬鐢ㄥ悓缁凞TO妯℃澘鐨勫叾浠栧瓧娈�
+ damageMap.values().forEach(damagess -> damagess.forEach(damage -> {
+ String key = damage.getOrderNumber() + "_" + damage.getTechnologyNumber();
+ LackDetailsDTO template = dtoTemplateMap.get(key); // 鑾峰彇鍚岀粍妯℃澘
+ if (template == null) return; // 鏃犳ā鏉垮垯璺宠繃锛堢悊璁轰笂涓嶄細鍑虹幇锛�
+
+ LackDetailsDTO newDto = new LackDetailsDTO();
+ // 1. 澶嶅埗妯℃澘涓殑鍏朵粬瀛楁锛堥櫎浜唃lassId鍜寃orkproduce锛�
+ BeanUtils.copyProperties(template, newDto); // 鐢⊿pring鐨勫伐鍏风被澶嶅埗灞炴��
+ // 2. 瑕嗙洊glassId鍜寃orkproduce涓哄綋鍓峝amage鐨勫��
+ newDto.setGlassId(damage.getGlassId());
+ newDto.setWorkingProcedure("鏈煡");
+ detailsDTOS.add(newDto);
+ }));
return detailsDTOS.stream().collect(Collectors.groupingBy(item -> item.getLayer()));
}
@@ -429,7 +537,9 @@
List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getFlowCardId, request.getFlowCardId())
.eq(GlassInfo::getLayer, request.getLayer())
- .eq(GlassInfo::getGlassType, request.getGlassType()));
+ .eq(GlassInfo::getGlassType, request.getGlassType())
+ .eq(request.getGlassId() != null, GlassInfo::getGlassId, request.getGlassId())
+ );
for (GlassInfo glassInfo : glassInfos) {
//鎺扮墖鎶ョ牬鎹�
damageService.autoSubmitReport(glassInfo.getGlassId(), request.getLine(), request.getWorkingProcedure(), request.getRemark(), request.getState());
@@ -438,8 +548,13 @@
}
@Override
+ 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;
}
@@ -448,23 +563,23 @@
private void sortFlowCardIdList(List<HollowAllFlowCardVO> list) {
- Pattern pattern = Pattern.compile("^NG(\\d+)([A-Za-z]+)(\\d+)$");
+ Pattern pattern = Pattern.compile("^(NG|R)(\\d+)([A-Za-z]+)(\\d+)$");
list.sort((v1, v2) -> {
Matcher m1 = pattern.matcher(v1.getFlowCardId());
Matcher m2 = pattern.matcher(v2.getFlowCardId());
if (!m1.find() || !m2.find()) {
- throw new IllegalArgumentException("鑾峰彇鍒扮殑娴佺▼鍗′笉绗﹀悎鏍￠獙瑙勫垯");
+ log.info("鑾峰彇鍒扮殑娴佺▼鍗′笉绗﹀悎鏍￠獙瑙勫垯:娴佺▼鍗锛歿}锛屾祦绋嬪崱B锛歿}", v1.getFlowCardId(), v2.getFlowCardId());
+ return -1;
}
-
// 鎻愬彇閮ㄥ垎
- BigInteger order1 = new BigInteger(m1.group(1));
- BigInteger order2 = new BigInteger(m2.group(1));
- String layer1 = m1.group(2);
- String layer2 = m2.group(2);
- BigInteger seq1 = new BigInteger(m1.group(3));
- BigInteger seq2 = new BigInteger(m2.group(3));
+ BigInteger order1 = new BigInteger(m1.group(2));
+ BigInteger order2 = new BigInteger(m2.group(2));
+ String layer1 = m1.group(3);
+ String layer2 = m2.group(3);
+ BigInteger seq1 = new BigInteger(m1.group(4));
+ BigInteger seq2 = new BigInteger(m2.group(4));
// 浼樺厛绾ф帓搴�
int cmp = order1.compareTo(order2);
--
Gitblit v1.8.0