From 06194b3e0d44516b00540e517d58ecfaa286c59d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 10 十月 2025 08:12:22 +0800
Subject: [PATCH] 1、结束功能从删除工程表信息改为将工程状态修改为6 2、中空大理片笼界面破损详情添加每片玻璃的破损
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 b8d6dfd..0ed57fb 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
@@ -430,7 +430,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,6 +440,11 @@
return Boolean.TRUE;
}
+ @Override
+ public List<GlassInfo> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query) {
+ return baseMapper.queryLackGlassByFlowCard(query.getFlowCardId(), query.getOrderSort(), query.getLayer());
+ }
+
private void sortFlowCardIdList(List<HollowAllFlowCardVO> list) {
Pattern pattern = Pattern.compile("^NG(\\d+)([A-Za-z]+)(\\d+)$");
--
Gitblit v1.8.0