增加上片防止重复保存

wu

2025-02-18 95088616493655e419469a7d1be7af7bb30ae8ab

增加上片防止重复保存

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.engineering.entity.Engineering;
import com.mes.glassinfo.entity.GlassInfo;

import java.util.List;

@@ -40,13 +41,19 @@
    Engineering selectInitiate(Integer state);
    Engineering selectInitiates(Integer state,Integer cell);
    /**
     * 查询是否有上片任务yw
     * 查询工程表是否已有工程号
     *
     * @return Engineering
     */
    Engineering selectUpInitiate(Integer state, Integer equipmentId);
    Engineering selectUpInitiate(String engineerId);

    /**
     * 查询小片表是否已有工程号
     *
     * @return Engineering
     */
    GlassInfo selectGlassinfoIsnull(String engineerId);
    /**
     * 查询上片任务
     *
     * @return Engineering

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java

@@ -7,6 +7,8 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,8 @@
    OptimizeProjectMapper optimizeProjectMapper;
    @Autowired
    private EngineeringMapper engineeringMapper;
    @Autowired
    private GlassInfoMapper glassInfoMapper;

    //开始/暂停任务
    @Override
@@ -114,8 +118,21 @@
    }

    @Override
    public Engineering selectUpInitiate(Integer state, Integer equipmentId) {
        return null;
    public Engineering selectUpInitiate(String engineerId) {
        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
        wrapper.eq("engineer_id", engineerId)
                .last("limit 1");
        return engineeringMapper.selectOne(wrapper);

    }

    @Override
    public GlassInfo selectGlassinfoIsnull(String engineerId) {
        QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
        wrapper.eq("engineer_id", engineerId)
                .last("limit 1");
        return glassInfoMapper.selectOne(wrapper);

    }

    @Override

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java

@@ -77,12 +77,14 @@
    public  Result <Boolean> changeTask(@RequestBody Engineering engineering) {
        log.info("engineeringId:{}", engineering);
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        if (upPattenUsage != null) {
        Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
        GlassInfo glassInfos = engineeringService.selectGlassinfoIsnull(engineering.getEngineerId());
        if (upPattenUsage != null && engineerings != null && glassInfos != null) {
            boolean work = engineeringService.changeTasks(engineering);
            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
            return Result.build(200, "开始上片", work);
        } else {
        } else if (upPattenUsage == null && engineerings == null && glassInfos == null) {
            List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
            log.info("将查询出的UpPattenUsage数据保存到数据库表里");
            upPattenUsageService.saveUpPattenUsage(upPattenUsages);
@@ -102,6 +104,11 @@
            }else {
                return Result.build(200, "保存失败"+engineering.getEngineerId(), false);
            }
        } else {
            upPattenUsageService.deleteTask(engineering.getEngineerId());
            engineeringService.deleteTask(engineering.getEngineerId());
            glassInfoService.deleteTask(engineering.getEngineerId());
            return Result.build(200, "请重新点击上片" + engineering.getEngineerId(), true);
        }

    }