From 30fd531c95ece1c0e7306cad138307dedd459d9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 二月 2025 08:49:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 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 45a3cf5..ae5354a 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
@@ -12,7 +12,6 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
-import com.mes.uppattenusage.entity.UpPattenUsage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -36,16 +35,18 @@
@Override
@DS("pp")
- public List<GlassInfo> selectGlassInfo(String engineeringId) {
+ public List<GlassInfo> selectGlassInfo(Engineering engineeringId) {
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,d.merge as combine ,b.mark_icon")
+ .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," +
+ "d.layers_number AS total_layer, b.stock_id,b.heat_layout_id,b.heat_layout_sort, b.x_axis,b.y_axis," +
+ "c.x_axis as x_axis_heat,c.y_axis as y_axis_heat,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));
+ .eq("t.project_no", engineeringId.getEngineerId()));
}
// 鍒涘缓涓�涓� List 鐢ㄤ簬淇濆瓨鏄犲皠鍚庣殑瀹炰綋瀵硅薄
List<GlassInfo> resultList = new ArrayList<>();
@@ -58,23 +59,31 @@
glassInfo.setEngineerId(map.getProjectNo());
glassInfo.setFlowCardId(map.getProcessId());
glassInfo.setFilmsid(map.getGlassType());
- glassInfo.setGlassType(map.getOrderSort());//璁㈠崟搴忓彿
- glassInfo.setWidth(map.getOWidth());//璁㈠崟瀹�
- glassInfo.setHeight(map.getOHeight());//璁㈠崟楂�
+ //璁㈠崟搴忓彿
+ glassInfo.setGlassType(map.getOrderSort());
+ //璁㈠崟瀹�
+ glassInfo.setWidth(map.getOWidth());
+ //璁㈠崟楂�
+ glassInfo.setHeight(map.getOHeight());
glassInfo.setEdgWidth(map.getPWidth());
- glassInfo.setLayer(map.getLayer());
- glassInfo.setTotalLayer(map.getTotalLayer());
glassInfo.setEdgHeight(map.getPHeight());
glassInfo.setThickness(map.getGlassThickness());
- glassInfo.setPatternSequence(map.getStockId());//
- glassInfo.setTemperingLayoutId(map.getHeatLayoutId());//閽㈠寲鐗堝浘id
- glassInfo.setTemperingFeedSequence(map.getHeatLayoutSort());//閽㈠寲鐗堝浘椤哄簭
- glassInfo.setXCoordinate(map.getXAxis());
- glassInfo.setYCoordinate(map.getYAxis());
+ glassInfo.setLayer(map.getLayer());
+ glassInfo.setTotalLayer(map.getTotalLayer());
+ glassInfo.setPatternSequence(map.getStockId());
+ glassInfo.setXAxis(map.getXAxis());
+ glassInfo.setYAxis(map.getYAxis());
+ //閽㈠寲鐗堝浘id
+ glassInfo.setTemperingLayoutId(map.getHeatLayoutId());
+ //閽㈠寲鐗堝浘椤哄簭
+ glassInfo.setTemperingFeedSequence(map.getHeatLayoutSort());
+ glassInfo.setXCoordinate(map.getXAxisHeat());
+ glassInfo.setYCoordinate(map.getYAxisHeat());
glassInfo.setAngle(map.getRotateAngle());
glassInfo.setGlassId(map.getGlassId());
glassInfo.setCombine(map.getCombine());
glassInfo.setMarkIcon(map.getMarkIcon());
+ glassInfo.setFilmRemove(engineeringId.getFilmRemove());
// 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
resultList.add(glassInfo);
}
@@ -154,7 +163,7 @@
List<GlassInfo> glassInfos = null;
if (engineeringId != null) {
glassInfos = baseMapper.selectJoinList(GlassInfo.class, new MPJQueryWrapper<GlassInfo>()
- .select("t.*")
+ .select("t.engineer_id,t.glass_id,t.tempering_layout_id,t.tempering_feed_sequence,t.width,t.height,t.thickness,t.filmsid,t.flow_card_id")
.leftJoin("edg_storage_cage_details b on t.engineer_id=b.engineer_id and t.glass_id=b.glass_id")
.isNull("b.glass_id")
.eq("t.engineer_id", engineeringId));
--
Gitblit v1.8.0