更改开始上片和暂停接口，选择工程增加信息预览

wu

2024-05-28 7f120fc7a05d560db1e47b3ef243fde19a0c56b4

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

@@ -1,9 +1,13 @@
package com.mes.job;

import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
import com.mes.common.WebSocketServer;
import com.mes.device.PlcParameterObject;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.workstation.entity.UpWorkstation;
@@ -12,6 +16,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

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

/**
 * @author SNG-010
@@ -26,6 +33,9 @@
    private EngineeringService engineeringService;
    @Autowired
    private UpPattenUsageService upPattenUsageService;
    @Autowired
    private OptimizeProjectService optimizeProjectService;


    PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;

@@ -34,11 +44,12 @@
     * fixedDelay : 上一个调用结束后再次调用的延时
     */

    @Scheduled(fixedDelay = 300)
    @Scheduled(fixedDelay = 30000000)
    public void plcLoadGlassTask() throws InterruptedException {
        try {
            //获取是否有上片请求
            String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
            String mesToPlc = plcParameterObject.getPlcParameter("MesToPlc").getValue();
            //判断开始上片的工程号
            Engineering engineering = engineeringService.selectInitiate(1);
            if ("1".equals(loadRequest) && engineering != null) {
@@ -59,7 +70,8 @@
                    upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);

                }
            }else {
            }
            if("1".equals(mesToPlc)&& "0".equals(loadRequest)){
                //请求字为零时，任务字清零
                S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
            }
@@ -70,31 +82,62 @@
        }
    }

    @Scheduled(fixedDelay = 300)
    @Scheduled(fixedDelay = 30000000)
    public void plcLoadGlassReport(){
        //获取是否有汇报
        String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
        if (loadStatus != null) {
            log.info(loadStatus);
            if ("1".equals(loadStatus)) {
                log.info("收到汇报任务完成");
                S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
            } else if ("2".equals(loadStatus)) {
                log.info("收到汇报未完成任务");
                //减少工位数量,恢复任务状态
                overTask(loadStatus,0);
            } else if ("3".equals(loadStatus)) {
                log.info("收到汇报玻璃破损");
                overTask(loadStatus,0);
            } else if("0".equals(loadStatus)){
                log.info("收到汇报清0状态");
                //减少工位数量,完成任务状态
                overTask(loadStatus,100);
            switch (loadStatus) {
                case "1":
                    log.info("收到汇报任务完成");
                    //减少工位数量,完成任务状态
                    overTask(loadStatus, 100);
                    break;
                case "2":
                    log.info("收到汇报未完成任务");
                    //减少工位数量,恢复任务状态
                    overTask(loadStatus, 0);
                    break;
                case "3":
                    log.info("收到汇报玻璃破损");
                    overTask(loadStatus, 0);
                    break;
                case "0":
                    S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
                    break;
            }
        }
    }

//    @Scheduled(fixedDelay = 300)
//    public void loadGlassHome(){
//        JSONObject jsonObject = new JSONObject();
//        //正在进行的任务
//        List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
//        jsonObject.append("prioritylist", upPattenUsages);
//        //工位信息
//        List<UpWorkstation> upWorkstations = upWorkstationService.list();
//        jsonObject.append("list", upWorkstations);
//        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("returns");
//        if (sendwServer != null) {
//            for (WebSocketServer webserver : sendwServer) {
//                if (webserver != null) {
//                    webserver.sendMessage(jsonObject.toString());
//                    List<String> messages = webserver.getMessages();
//                    if (!messages.isEmpty()) {
//                        // // 将最后一个消息转换为整数类型的列表
//                        webserver.clearMessages();
//                    }
//                } else {
//                    log.info("Home is closed");
//                }
//            }
//        }
//    }

    public void overTask(String loadStatus, int state)  {

        UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
        if (upPattenUsage != null) {
            log.info("收到汇报清{}状态", loadStatus);
@@ -102,8 +145,12 @@
            upWorkstationService.reduceWorkstationNumber(upPattenUsage.getState());
            //完成上片表状态
            upPattenUsageService.updateUpPattenUsageState(upPattenUsage, state);
            S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
            //判断是否是最后一块玻璃
            UpPattenUsage sequence=upPattenUsageService.selectSequence(upPattenUsage);
            //如果是最后一块时完成工程任务
            optimizeProjectService.overTask(sequence,300);
        }
        S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
    }

}