| | |
|---|
| | | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|---|
| | | import com.github.yulichang.base.MPJBaseServiceImpl; |
|---|
| | | import com.github.yulichang.query.MPJQueryWrapper; |
|---|
| | | import com.mes.engineering.entity.Engineering; |
|---|
| | | import com.mes.glassinfo.entity.GlassInfo; |
|---|
| | | import com.mes.glassinfo.entity.OptimizeGlassinfo; |
|---|
| | | import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO; |
|---|
| | |
|---|
| | | 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; |
|---|
| | | |
|---|
| | | import javax.annotation.Resource; |
|---|
| | | import java.util.ArrayList; |
|---|
| | | import java.util.HashMap; |
|---|
| | | import java.util.List; |
|---|
| | | import java.util.Map; |
|---|
| | | import java.util.*; |
|---|
| | | import java.util.stream.Collectors; |
|---|
| | | |
|---|
| | | /** |
|---|
| | |
|---|
| | | 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") |
|---|
| | | .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 ") |
|---|
| | |
|---|
| | | glassInfo.setAngle(map.getRotateAngle()); |
|---|
| | | glassInfo.setGlassId(map.getGlassId()); |
|---|
| | | glassInfo.setCombine(map.getCombine()); |
|---|
| | | glassInfo.setMarkIcon(map.getMarkIcon()); |
|---|
| | | // 将映射后的对象添加到结果列表中 |
|---|
| | | resultList.add(glassInfo); |
|---|
| | | } |
|---|
| | |
|---|
| | | return baseMapper.listBySize(engineerId); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public void deleteTask(String engineerId) { |
|---|
| | | QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>(); |
|---|
| | | queryWrapper.eq("engineer_id", engineerId); |
|---|
| | | baseMapper.delete(queryWrapper); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public List<GlassInfo> selectEdgGlassInfo(String engineeringId) { |
|---|
| | | List<GlassInfo> glassInfos = null; |
|---|
| | | if (engineeringId != null) { |
|---|
| | | glassInfos = baseMapper.selectJoinList(GlassInfo.class, new MPJQueryWrapper<GlassInfo>() |
|---|
| | | .select("t.*") |
|---|
| | | .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)); |
|---|
| | | } |
|---|
| | | return glassInfos; |
|---|
| | | } |
|---|
| | | |
|---|
| | | |
|---|
| | | } |
|---|
