联调修改

zhoushihao

2024-05-07 ac84757be7543e3094f0c4fb882c0ffcbbc2e378

联调修改

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/S7control.java

@@ -273,21 +273,18 @@

        return result;
    }

    //读取字符串
    public String readString(String address) {
        if (s7PLC == null) {
            return null;
        }
        try {
            byte[] bytes = s7PLC.readByte(address, 14);
            if (bytes != null) {
                return new String(bytes, StandardCharsets.UTF_8);
            }
            return s7PLC.readString(address);
        } catch (Exception e) {
            System.out.println("读取 " + address + " 失败：" + e.getMessage());
            return null;
        }
        return null;
    }


@@ -346,6 +343,21 @@
        return data;
    }

    //读取单个word
    public Short readWord(String address) {
        if (s7PLC == null) {
            return null;
        }
        try {
            // 单个地址
            return s7PLC.readInt16(address);
        } catch (Exception e) {
            System.out.println("读取 " + address + " 失败：" + e.getMessage());

        }
        return -1;
    }

    //读取时间
    public Long readtime(String address) {
        if (s7PLC == null) {

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcHomeEdg.java

@@ -1,7 +1,7 @@
package com.mes.common;

import cn.hutool.core.date.DateTime;
import cn.hutool.json.JSONObject;
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
@@ -11,7 +11,6 @@
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +26,6 @@
public class PlcHomeEdg extends Thread {



    @Autowired
    TaskCacheService taskCacheService;
    @Autowired
@@ -41,19 +39,26 @@

    private Map<String,String> mapParameter=new HashMap<String,String>();
    private Map<String,String> mapValue=new HashMap<String,String>();
    private Map<String, String> mapType = new HashMap<String, String>();
    private Map<String,Object> mapSettings=new HashMap<String,Object>();


    private void initialize(){
        mapParameter.put("A06_request_word","DB11.0");
        mapParameter.put("A06_request_word", "DB11.0");   //work
        mapParameter.put("A05_scanning_ID","DB11.2");
        mapParameter.put("MES_confirmation_word","DB11.40");
        mapParameter.put("A09_glass_status","DB11.70");
        mapParameter.put("A10_glass_status","DB11.72");
        //mapParameter.put("A10_glass_status", "DB11.72");
        mapParameter.put("A09_prohibit_film_production","DB11.74");
        mapParameter.put("A10_prohibit_film_production","DB11.76");
        mapSettings.put("territoryPoor",3);

        mapType.put("A06_request_word", "Word");
        mapType.put("A05_scanning_ID", "String");
        mapType.put("MES_confirmation_word", "Word");
        mapType.put("A09_glass_status", "Word");
        //mapType.put("A10_glass_status", "Word");
        mapType.put("A09_prohibit_film_production", "Word");
        mapType.put("A10_prohibit_film_production", "Word");
//        mapValue.put("A06_request_word","1");//请求字
//        mapValue.put("A05_scanning_ID","7");//请求ID
//        mapValue.put("MES_confirmation_word","0");//MES发送字
@@ -61,11 +66,9 @@
//        mapValue.put("A10_glass_status","0");//A09玻璃状态
//        mapValue.put("A09_prohibit_film_production","0");//A9禁止出片
//        mapValue.put("A10_prohibit_film_production","0");//A10禁止出片
        for (String key:mapParameter.keySet()){
            String value=S7object.getinstance().plccontrol.readString(mapParameter.get(key));
            mapValue.put(key,value);

        }
    }

    private void inTo(){
        List<GlassInfo> glassInfos=glassInfoService.selectId(mapValue.get("A05_scanning_ID"));
        if(glassInfos.size()<1){
@@ -97,6 +100,7 @@
            log.info("此玻璃编号存在多个");
        }
    }

    private void outTo(int line){
        int endcell=0;
        EdgStorageCageDetails outEdgStorageCageDetails=new EdgStorageCageDetails();
@@ -128,83 +132,52 @@
        }




    }

    @Override
    public void run() {
        boolean start=true;
        initialize();
        log.info("当前参数值：{}", mapValue);
        while (this != null&&start) {
            JSONObject jsonObject = new JSONObject();
            for (String key : mapParameter.keySet()) {
                String value = "";
                if ("String".equals(mapType.get(key))) {
                    value = S7object.getinstance().plccontrol.readString(mapParameter.get(key));
                } else {
                    value = S7object.getinstance().plccontrol.readWord(mapParameter.get(key)) + "";
                }
                mapValue.put(key, value);
            }
            try {
                Thread.sleep(1000);
                taskCacheService  = WebSocketServer.applicationContext.getBean(TaskCacheService.class);
                glassInfoService  = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
                edgStorageCageService  = WebSocketServer.applicationContext.getBean(EdgStorageCageService.class);
                edgStorageCageDetailsMapper  = WebSocketServer.applicationContext.getBean(EdgStorageCageDetailsMapper.class);
                initialize();//初始化数据
                log.info("当前参数值：{}",mapValue);
//                initialize();//初始化数据
                if("0".equals(mapValue.get("A06_request_word"))){
                    //清除
                    //S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"),(short) 0);
                    S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short) 0);
                }else if("1".equals(mapValue.get("A06_request_word"))&&
                         "0".equals(mapValue.get("MES_confirmation_word")))
                {
                        "0".equals(mapValue.get("MES_confirmation_word"))) {

                    inTo();
                }else if("2".equals(mapValue.get("A06_request_word"))&&
                         "0".equals(mapValue.get("MES_confirmation_word"))&&
                        (
                         "0".equals(mapValue.get("A09_glass_status"))||
                         "0".equals(mapValue.get("A10_glass_status"))
                        )
                ){

                    outTo(3);
                        "0".equals(mapValue.get("MES_confirmation_word")) && !"0".equals(mapValue.get("A09_glass_status"))) {
                    //09空闲 ：1      10空闲 ：2        都空闲：3    其他0
                    outTo(Integer.parseInt(mapValue.get("A09_glass_status")));
                }else if("3".equals(mapValue.get("A06_request_word"))&&
                         "0".equals(mapValue.get("MES_confirmation_word"))){

                    if("0".equals(mapValue.get("A09_glass_status"))||"0".equals(mapValue.get("A10_glass_status"))){
                        outTo(3);
                        outTo(Integer.parseInt(mapValue.get("A09_glass_status")));
                    }else{
                        inTo();
                    }
                }


//                List<String> address2=new ArrayList<String>();
//                address.add("");
//                List<String> list2= S7object.getinstance().plccontrol.readStrings(address);
//                PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//                log.info("plcmes:{}",plcmes);
//                S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);

//                taskCacheMapper  = WebSocketServer.applicationContext.getBean(TaskCacheMapper.class);
//                List<TaskCache> list=taskCacheMapper.selectList(null);
//                log.info("数据{}",list);
                // 注入mapper
//                HomeService  = WebSocketServer.applicationContext.getBean(HomeService.class);
//                QueueMapper  = WebSocketServer.applicationContext.getBean(QueueMapper.class);


//                //读取DB105区文件
//                PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//
//                String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//请求
//                String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//发送
//                double width=Double.valueOf(plcmes.getPlcParameter("width").getValue());//宽
//                double height=Double.valueOf(plcmes.getPlcParameter("Height").getValue());//高

                //获取测量的长，宽
                 boolean istest = true;
                // String PlcRequest = "1";
                // String MesSend = "0";
                // double width = 516;
                // double height = 507;
                //System.out.println(111);
                // //查询当前订单任务
                //List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
                //jsonObject.append("OrderTask", OrderTask);

            } catch (InterruptedException e) {
                e.printStackTrace();