From 1195e51e67436cf2b9513678b5e9d3f27a043de4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 十二月 2025 08:29:40 +0800
Subject: [PATCH] 1、中空选中除膜改为多选 2、流程卡报工情况查询添加工程号条件，添加线路，备注显示
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 591ee47..0747ca6 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
@@ -464,6 +464,9 @@
});
List<LackDetailsDTO> detailsDTOS = baseMapper.queryLackByFlowCardByERP(processCardReports);
List<Damage> damages = damageService.queryUnTempByFlowCardId(flowCardId);
+ damages = damages.stream()
+ .filter(damage -> damage.getType() != 8) // 鏍稿績锛氭帓闄ype=8鐨勫厓绱�
+ .collect(Collectors.toList());
// 1. 鎸�(orderNumber+layer)鍒嗙粍锛屽悓鏃剁紦瀛楧TO鐨勫叾浠栧瓧娈典綔涓烘ā鏉�
Map<String, List<Damage>> damageMap = new HashMap<>();
Map<String, LackDetailsDTO> dtoTemplateMap = new HashMap<>(); // 瀛樺偍鍒嗙粍瀵瑰簲鐨凞TO妯℃澘
@@ -563,23 +566,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