上片新增页面及逻辑，后端接口

wangfei

2024-12-18 2bdb422792a2c71e86fa19f4fdd2efda13ccbc62

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

@@ -1,5 +1,6 @@
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;
@@ -19,6 +20,7 @@
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
@@ -44,18 +46,35 @@
        //log.info("将参数传入到查询类里{}",engineering);
        if(engineering!=null){
            LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
            wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
            return this.list(wrapper);
        }else {
            return  null;
        } else {
            return null;
        }

    }

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

@@ -66,7 +85,7 @@
        List<OptimizeUpPattenUsage> upPattenUsageList = null;
        if (engineeringId != null) {
            upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>()
                    .select("t.project_no,t.glass_type,b.realwidth as width,b.realheight as height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.count as stockId")
                    .select("t.project_no,t.glass_type,b.realwidth as width,b.realheight as height ,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.stock_id")
                    .leftJoin("optimize_layout b on t.project_no=b.project_no")
                    .eq("b.project_no", engineeringId));
        }
@@ -96,25 +115,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() {
@@ -138,10 +182,19 @@
    @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 List<Engineering> setRawGlassTaskRequest(Engineering request) {
        return null;
    }

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


}