更改暂停数据更改逻辑，更改预览工程条件逻辑,增加新拿走破损方法

wu

2025-02-17 0b66b6df1df5118d1e31a3d9d33de344b2a6fafc

更改暂停数据更改逻辑，更改预览工程条件逻辑,增加新拿走破损方法

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

@@ -123,7 +123,7 @@
    public List<Engineering> selectTask() {
        //查询可开始任务的工程
        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
//        wrapper.eq("state", 0);
        wrapper.eq("state", 5);
        return engineeringMapper.selectList(wrapper);
    }

@@ -131,7 +131,7 @@
    public boolean pauseTask(String engineerId, Integer state) {
        //暂停正在进行工程
        LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
        pauseWrapper.set(Engineering::getState, state);
        pauseWrapper.set(Engineering::getState, 5);
        pauseWrapper.eq(Engineering::getEngineerId, engineerId);
        return pauseWrapper.update();
    }

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

@@ -3,6 +3,7 @@


import com.mes.damage.entity.Damage;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
@@ -15,6 +16,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;
@@ -41,6 +43,7 @@
    private OptimizeProjectService optimizeProjectService;
    @Autowired
    DamageService damageService;


    @ApiOperation("开始/暂停任务/传递工程号和状态,开始是1 暂停是0")
    @PostMapping("/pauseTask") //暂停上片任务
@@ -78,7 +81,7 @@
            boolean work = engineeringService.changeTasks(engineering);
            List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
            optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
            return Result.build(200, "已保存过", work);
            return Result.build(200, "开始上片", work);
        } else {
            List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
            log.info("将查询出的UpPattenUsage数据保存到数据库表里");
@@ -137,5 +140,11 @@
        return Result.build(200, "操作成功", null);
    }

    @ApiOperation("识别操作：   破损/拿走     参数（ID,功能[9：拿走，8:破损]）")
    @PostMapping("/identControls")
    public Result<String> identControls(@RequestBody @Validated DamageRequest request) {
        return Result.build(200, "成功", upPattenUsageService.identControls(request));
    }

}


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java

@@ -123,20 +123,18 @@
        if(upPattenUsages!=null){
            jsonObject.append("prioritylist", upPattenUsages);
        }
        //查询1、2号线的任务
        //查询1号线的任务
        List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
        jsonObject.append("loadTask1", upPattenUsages1);
        //查询1、2号线的任务
        //查询2号线的任务
        List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
        jsonObject.append("loadTask2", upPattenUsages2);

        //查询工位任务
        

        //工位信息
        List<UpWorkstation> upWorkstations = upWorkstationService.list();
        jsonObject.append("list", upWorkstations);
        //是否开始工程
        Engineering engineering = engineeringService.selectInitiate(1);
        jsonObject.append("engineering", engineering);

        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
        if (sendwServer != null) {

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

@@ -1,6 +1,7 @@
package com.mes.uppattenusage.service;

import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.engineering.entity.Engineering;
import com.mes.uppattenusage.entity.UpPattenUsage;

@@ -78,5 +79,13 @@

     List<UpPattenUsage> selectLoadTask(Integer i);

     /**
      * 拿走:9/破损:8
      *
      * @param request
      * @return
      */
     String identControls(DamageRequest request);

}


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

@@ -7,6 +7,8 @@
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.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
@@ -38,6 +40,8 @@
    OptimizeProjectMapper optimizeProjectMapper;
    @Autowired
    EngineeringService engineeringService;
    @Autowired
    DamageService damageService;
    @Override
    public List<UpPattenUsage> prioritylist() {
        //获取正在上片的任务id
@@ -195,5 +199,10 @@
        return null;
    }


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