From 26a385feec1f358a8b6ccb23290f8f7046303203 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 16 十二月 2024 16:54:42 +0800
Subject: [PATCH] 1、大理片笼详情表新增膜系字段 2、钢化查询接口改造：0非钢查询 1 钢化查询 3、指定钢化界面新增接口缺少详情接口：点击可查看当前工程+流程下缺失的玻璃信息 ，isdamage是否破损，当为1的时候无破损按钮 ，0时可以有破损按钮
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index 10ab730..60d1ae0 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -6,6 +6,7 @@
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.entity.OptimizeGlassinfo;
+import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.entity.OptimizeProject;
@@ -40,13 +41,13 @@
List<OptimizeGlassinfo> optimizeGlassinfos = null;
if (engineeringId != null) {
optimizeGlassinfos = optimizeProjectMapper.selectJoinList(OptimizeGlassinfo.class, new MPJQueryWrapper<OptimizeProject>()
- .select("b.process_id,t.glass_type,b.o_width,b.o_height,t.glass_thickness,b.order_sort,b.p_width,b.p_height,b.layer, b.total_layer, b.stock_id,b.heat_layout_id,b.heat_layout_sort,c.x_axis,c.y_axis,b.project_no,b.glass_id,c.rotate_angle")
+ .select("b.process_id,t.glass_type,b.o_width,b.o_height,t.glass_thickness,b.order_sort,b.p_width,b.p_height,b.layer, b.total_layer, b.stock_id,b.heat_layout_id,b.heat_layout_sort,c.x_axis,c.y_axis,b.project_no,b.glass_id,c.rotate_angle,d.merge as combine ,b.mark_icon")
.leftJoin("optimize_detail b on t.project_no=b.project_no")
.leftJoin("optimize_heat_detail c on c.project_no=t.project_no and b.heat_layout_id=c.layout_id and b.heat_layout_sort=c.sort")
+ .leftJoin("flow_card d on d.process_id=b.process_id and d.technology_number=b.layer and d.order_number=b.order_sort ")
//.eq("t.state",100)
.eq("t.project_no", engineeringId));
}
- //order_sort,o_width,o_height
// 鍒涘缓涓�涓� List 鐢ㄤ簬淇濆瓨鏄犲皠鍚庣殑瀹炰綋瀵硅薄
List<GlassInfo> resultList = new ArrayList<>();
@@ -73,6 +74,8 @@
glassInfo.setYCoordinate(map.getYAxis());
glassInfo.setAngle(map.getRotateAngle());
glassInfo.setGlassId(map.getGlassId());
+ glassInfo.setCombine(map.getCombine());
+ glassInfo.setMarkIcon(map.getMarkIcon());
// 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
resultList.add(glassInfo);
}
@@ -90,9 +93,14 @@
@Override
public int getGlassInfoCountByFlowCardId(String flowCardId, int layer) {
- return baseMapper.selectCount(new QueryWrapper<GlassInfo>().lambda()
- .eq(GlassInfo::getFlowCardId, flowCardId)
- .eq(GlassInfo::getLayer, layer));
+ if (layer == 0) {
+ return baseMapper.selectCount(new QueryWrapper<GlassInfo>().lambda()
+ .eq(GlassInfo::getFlowCardId, flowCardId));
+ } else {
+ return baseMapper.selectCount(new QueryWrapper<GlassInfo>().lambda()
+ .eq(GlassInfo::getFlowCardId, flowCardId)
+ .eq(GlassInfo::getLayer, layer));
+ }
}
@@ -130,8 +138,17 @@
return result;
}
+ @Override
+ public List<HollowGlassInfoDTO> listBySize(String engineerId) {
+ return baseMapper.listBySize(engineerId);
+ }
-
+ @Override
+ public void deleteTask(String engineerId) {
+ QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("engineer_id", engineerId);
+ baseMapper.delete(queryWrapper);
+ }
}
--
Gitblit v1.8.0