义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zhoushihao
2024-06-14 5da408483c7fadb2678422c255e48b4fd2973254 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java


@@ -1,20 +1,24 @@


package com.mes.glassinfo.service.impl;




import com.baomidou.dynamic.datasource.annotation.DS;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.github.yulichang.base.MPJBaseServiceImpl;


import com.github.yulichang.query.MPJQueryWrapper;


import com.github.yulichang.toolkit.JoinWrappers;


import com.mes.glassinfo.entity.GlassInfo;


import com.mes.glassinfo.entity.OptimizeGlassinfo;


import com.mes.glassinfo.mapper.GlassInfoMapper;


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.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




import java.util.ArrayList;


import java.util.List;


import java.util.Map;




/**


 * <p>


@@ -37,7 +41,7 @@


            optimizeGlassinfos = optimizeProjectMapper.selectJoinList(OptimizeGlassinfo.class, new MPJQueryWrapper<OptimizeProject>()


                    .select("b.process_id,t.type,b.width,b.height,t.glass_thickness,t.glass_type,b.p_width,b.p_height,b.layer, b.total_layer, b.stock_id,b.heat_layout_id,b.heat_layout_sort,b.x_axis,b.y_axis,b.project_no,b.glass_id")


                    .leftJoin("optimize_detail b on t.project_no=b.project_no")


                    .eq("t.state",100)


                    //.eq("t.state",100)


                    .eq("t.project_no", engineeringId));


        }




@@ -80,4 +84,37 @@


    public void saveGlassInfo(List<GlassInfo> glassinfo) {


        this.saveBatch(glassinfo);


    }














    @Override


    public int getGlassInfoCountByFlowCardId(String flowCardId) {


        return baseMapper.selectCount(new QueryWrapper<GlassInfo>().lambda()


                .eq(GlassInfo::getFlowCardId, flowCardId));


    }








    @Override


    public List<Map<String, Object>> getFlowCardId() {


        return baseMapper.selectJoinMaps(JoinWrappers.lambda(GlassInfo.class)


                .select(GlassInfo::getFlowCardId)


                .leftJoin(UpPattenUsage.class, on -> on


                        .eq(OptimizeProject::getProjectNo, GlassInfo::getEngineerId)


                        .ne(OptimizeProject::getState, 300)


                )


                .groupBy(GlassInfo::getFlowCardId)


        );


    }


















}