`1、卧理正常第一版本代码提交 2、大理片笼正常版本提交

zhoushihao

2024-11-22 6bf911a38f75341dd5d2b86dad58fa313584a981

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java

@@ -7,7 +7,6 @@
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
@@ -56,16 +55,15 @@
    @Override
    public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
        LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId())
                .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
                .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
        wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId());
//                .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
//                .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());

        return this.list(wrapper);
        //你
    }

    @Override
    @DS("pp")  //這裡只傳了工程號
    @DS("pp")
    public List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId) {

        List<OptimizeUpPattenUsage> upPattenUsageList = null;
@@ -119,11 +117,11 @@
    }

    @Override
    public UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell) {
    public UpPattenUsage selectedEngineering(String engineerId) {
        QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
        wrapper.eq("engineering_id", engineerId)
                .eq("station_cell", stationCell)
                .eq("film_remove", filmRemove)
//                .eq("station_cell", stationCell)
//                .eq("film_remove", filmRemove)
                .last("limit 1");
        log.info("查询预览参数");
        log.info("查询预览参数{}", this.getOne(wrapper));
@@ -158,6 +156,10 @@
    }

    @Override
    public List<Engineering> setRawGlassTaskRequest(Engineering request) {
        return null;
    }

    public Object Engineering(Engineering request) {
        return null;
    }