hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -149,5 +149,10 @@ * 打标属性 */ private String markIcon; /** * 除膜方式 */ private Integer filmRemove; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -4,7 +4,6 @@ import com.mes.engineering.entity.Engineering; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO; import com.mes.uppattenusage.entity.UpPattenUsage; import java.util.List; import java.util.Map; @@ -22,7 +21,7 @@ * 查询小片表 * @return List<GlassInfo> */ List<GlassInfo> selectGlassInfo(String engineeringId); List<GlassInfo> selectGlassInfo(Engineering engineeringId); /** * 保存小片表 */ 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,7 +35,7 @@ @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>() @@ -45,7 +44,7 @@ .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<>(); @@ -75,6 +74,7 @@ glassInfo.setGlassId(map.getGlassId()); glassInfo.setCombine(map.getCombine()); glassInfo.setMarkIcon(map.getMarkIcon()); glassInfo.setFilmRemove(engineeringId.getFilmRemove()); // 将映射后的对象添加到结果列表中 resultList.add(glassInfo); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -35,7 +35,6 @@ //将参数传入到查询类里,工程号做非空判断模糊查询 LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(OptimizeProject::getState,optimizeRequest.getState()) .or(qw -> qw.eq(OptimizeProject::getState, 200)) .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo()) //.groupBy(OptimizeProject::getProjectNo) ; hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -84,7 +84,7 @@ log.info("将查询出的UpPattenUsage数据保存到数据库表里"); upPattenUsageService.saveUpPattenUsage(upPattenUsages); log.info("从PP表查询glassinfo的数据并保存到表里"); List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering.getEngineerId()); List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering); glassInfoService.saveGlassInfo(glassinfo); log.info("从PP表查询engineering的数据并保存到表里"); List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId()); hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -1,6 +1,7 @@ package com.mes.engineering.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; @@ -37,10 +38,7 @@ */ private Integer stationCell; /** * 除膜方式 */ private Integer filmRemove; /** * 工程名称 @@ -107,4 +105,9 @@ */ private String notes; /** * 除膜方式 */ @TableField(exist = false) private Integer filmRemove; } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -154,10 +154,8 @@ LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper()); wrapper.set(Engineering::getState,engineering.getState()); wrapper.set(Engineering::getStationCell,engineering.getStationCell()); wrapper.set(Engineering::getFilmRemove,engineering.getFilmRemove()); wrapper.eq(Engineering::getEngineerId,engineering.getEngineerId()); boolean pause = wrapper.update(); return pause; return wrapper.update(); }
@@ -152,12 +152,7 @@ List<OptimizeProject> list=optimizeProjectService.getDoingTask(); System.out.println("获取正在进行的工程：" + list); } @Test public void test7() { //获取次破未补信息 List<GlassInfo> list=glassInfoService.selectGlassInfo("P24062706"); System.out.println("工程："+list); } @Test public void test8() { //获取次破未补信息
