Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

ZengTao

2025-04-01 a52b87449e493d4312cc81c33a4169eb6be3c144

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

@@ -1,13 +1,15 @@
package com.mes.uppattenusage.service.impl;

import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
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;
@@ -15,6 +17,7 @@
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +41,10 @@
    OptimizeProjectMapper optimizeProjectMapper;
    @Autowired
    EngineeringService engineeringService;
    @Autowired
    DamageService damageService;
    @Autowired
    RedisUtil redisUtil;
    @Override
    public List<UpPattenUsage> prioritylist() {
        //获取正在上片的任务id
@@ -54,9 +61,29 @@
    }

    @Override
    public List<UpPattenUsage> selectLoadTask(Engineering cell) {
        //获取正在上片的任务id
        Engineering engineering = engineeringService.selectInitiates(1, cell.getStationCell());
        //log.info("将参数传入到查询类里{}",engineering);
        if(engineering!=null){
            LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
            if (cell.getState() != null) {
                wrapper.eq(UpPattenUsage::getState, cell.getState());
            }
            return this.list(wrapper);
        } else {
            return null;
        }
    }

    @Override
    public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
        LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId());
        wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId());
//                .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
//                .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());

        return this.list(wrapper);
    }

@@ -97,25 +124,50 @@

    @Override
    public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
        this.saveBatch(upPattenUsage);
        //保存原片使用详情表
        if (CollectionUtil.isEmpty(upPattenUsage)){
            return;
        }
        String engineerId = upPattenUsage.get(0).getEngineeringId();
        int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
        if (count <=0){
            //保存原片使用详情表
            this.saveBatch(upPattenUsage);
        }
    }

    @Override
    public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
        upPattenUsage.setState(state);
        boolean updateSuccess=this.updateById(upPattenUsage);
        log.info("更新状态{}",updateSuccess);
        boolean updateSuccess = this.updateById(upPattenUsage);
        log.info("更新状态{}", updateSuccess);
        //更新状态
    }

    @Override
    public UpPattenUsage selectedEngineering(String engineeringId) {
        QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
        wrapper.eq("engineering_id",engineeringId)
    public UpPattenUsage selectedTaskEngineering(String engineeringId) {
        return null;
    }

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

    @Override
    public void deleteTask(String engineerId) {
        QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
        wrapper.eq("engineering_id",engineerId);
        this.remove(wrapper);
    }



    @Override
    public UpPattenUsage selectOverTask() {
@@ -139,10 +191,42 @@
    @Override
    public Boolean updateGlassState(UpPattenUsage upPattenUsage) {
        UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id",upPattenUsage.getId())
                .set("state",upPattenUsage.getState());
        updateWrapper.eq("id", upPattenUsage.getId())
                .set("state", upPattenUsage.getState());
        return this.update(updateWrapper);
    }

    @Override
    public String setRawGlassTaskRequest(Engineering request) {
        // 调用 RedisUtil 保存 loadGlass
        if (request == null) {
            redisUtil.deleteObject("loadGlassRequestOne");
        } else {
            redisUtil.setCacheObject("loadGlassRequestOne", request);
        }
        return "success";
    }

    @Override
    public String setRawGlassTaskRequest2(Engineering request) {
        // 调用 RedisUtil 保存 loadGlass
        if (request == null) {
            redisUtil.deleteObject("loadGlassRequestTwo");
        } else {
            redisUtil.setCacheObject("loadGlassRequestTwo", request);
        }
        return "success";
    }


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

    @Override
    public String identControls(DamageRequest request) {
        //将识别破损的玻璃直接加入破损表
        damageService.autoSubmitReport(request.getGlassId(), request.getLine(), request.getWorkingProcedure(), "上片机", request.getState());
        return "success";
    }
}