*

lsh

2025-04-08 a5e366c9143ff99bc5f707048a73f93a8d444bb8

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -10,8 +10,11 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.mapper.RgvOneSignMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.DevpThread;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -44,6 +47,8 @@
    private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
    public boolean charge0;     //请求充电
    public boolean charge1;     //请求充电
    private short weight464;
    private String matnr464;
    private short heartBeatVal = 1;
    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
        add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);
@@ -206,6 +211,8 @@
                    case 11:
                        write11((StaProtocol)task.getData());
                        break;
                    case 99:
                        write99((Integer) task.getData());
                    default:
                        break;
                }
@@ -304,69 +311,139 @@
            int[] staNosRgv = {623,624,625,626};
            for (int i = 0; i < staNosRgv.length; i++) {
                OperateResultExOne<byte[]> resultRgv = siemensS7Net.Read("DB100."+(1800+i*6), (short) 5);
                OperateResultExOne<byte[]> resultRgv2 = siemensS7Net.Read("DB100."+(1824+i*10), (short) 8);
                OperateResultExOne<byte[]> resultRgv2 = siemensS7Net.Read("DB100."+(1824+i*12), (short) 8);
                if (resultRgv.IsSuccess) {
                    Integer siteId = staNosRgv[i]; // 站点编号
                    StaProtocol staProtocol = station.get(siteId);
                    if (null == staProtocol) {
                        staProtocol = new StaProtocol();
                        staProtocol.setSiteId(siteId);
                        station.put(siteId, staProtocol);
                        continue;
                    }
                    try{
                        staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0));     // 小车目标位

                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 0));   // 当前位置
                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));   // 当前位置
//                        staProtocol.setNowRow((short)2);   // 当前位置

                        boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
                        staProtocol.setRGV1(status[0]);  // 小车无货空闲
                        staProtocol.setRGV2(status[1]);  // 小车输送线取货到位
                        staProtocol.setRGV3(status[2]); // 小车运行中

//                        staProtocol.setRGV11(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));  // 小车无货空闲
//                        staProtocol.setRGV22(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));  // 小车输送线取货到位
//                        staProtocol.setRGV33(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2)); //小车运行中
//                        staProtocol.setRGV1(false);  // 小车无货空闲
//                        staProtocol.setRGV2(true);  // 小车输送线取货到位
//                        staProtocol.setRGV3(false); // 小车运行中

                        staProtocol.setRGV44(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 2));//小车改左侧货物目标站
                        staProtocol.setRGV55(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 4));  //小车改右侧货物目标站
                        staProtocol.setRGV66(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 6));  // 上位机清除平移车资料
//
//                        staProtocol.setRGV44((short) 0);//小车改左侧货物目标站
//                        staProtocol.setRGV55((short) 0);  //小车改右侧货物目标站
//                        staProtocol.setRGV66((short) 0);  // 上位机清除平移车资料

                        staProtocol.setRGV4(staProtocol.getRGV44() != 0 && staProtocol.getRGV44() != 2);//小车改左侧货物目标站
                        staProtocol.setRGV5(staProtocol.getRGV55() != 0 && staProtocol.getRGV55() != 2);  //小车改右侧货物目标站
                        staProtocol.setRGV6(staProtocol.getRGV66() != 0 && staProtocol.getRGV66() != 2);  // 上位机清除平移车资料


                    }catch (Exception e){
                        log.error("读取RGV信息失败"+e.getMessage());
                    }
                }
            }
        } else if (slave.getId()==1){
            try{
                OperateResultExOne<byte[]> resultSignOne = siemensS7Net.Read("DB293.106", (short) (16));

                int smallEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 0);// 小料空托
                int bigEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 2);// 大料空托
                int smallTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 4);// 小料翻转
                int bigTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 6);// 大料翻转
//                int LineUp131 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 8);// 131排队
//                int LineUp126 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 10);// 126排队
//                int LineUp312 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 12);// 312排队
//                int LineUp310 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 14);// 310排队

                updateRgvOneSign("smallEmpty",smallEmpty);
                updateRgvOneSign("bigEmpty",bigEmpty);
                updateRgvOneSign("smallTurn",smallTurn);
                updateRgvOneSign("bigTurn",bigTurn);
//                updateRgvOneSign("LineUp131",LineUp131);
//                updateRgvOneSign("LineUp126",LineUp126);
//                updateRgvOneSign("LineUp312",LineUp312);
//                updateRgvOneSign("LineUp310",LineUp310);

            } catch (Exception e){
                log.error("读取输送线数量标记出现异常："+e);
            }
        }


        //条码扫描器
        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2440",(short)(barcodeSize*8));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {  //1:217  2:221  3:null 4:215  5:219
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
            int[] staNosRgv = new int[]{281,292,173,214,120};
            if (slave.getId()==2){
                staNosRgv = new int[]{453,460,518,532,607};
            }
            for (int i = 0; i < barcodeSize; i++) {
                //1:281  2:292  3:174(173) 4:214  5:120
                //6:453  7:460  8:508 9:534  10:611
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, (i + 1+((slave.getId()-1)*5)));
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    Integer siteId = staNosRgv[i]; // 站点编号
                    StaProtocol staProtocol = station.get(siteId);
                    if (null == staProtocol) {
                        continue;
                    }
                    staProtocol.setBarcode(barcode);
                    barcodeThread.setBarcode(barcode);
                }
            }
        }

        //RGV小车
        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
        if (result3.IsSuccess) {
            Integer siteId = 2000;
            StaProtocol staProtocol = station.get(siteId);
            if (null == staProtocol) {
                staProtocol = new StaProtocol();
                staProtocol.setSiteId(siteId);
                station.put(siteId, staProtocol);
        if (slave.getId()==2){
            OperateResultExOne<byte[]> result464 = siemensS7Net.Read("DB101.3720",(short)(8));
            if (result464.IsSuccess) {
                String barcode = siemensS7Net.getByteTransform().TransString(result464.Content,0,8, "UTF-8");
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 11);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    StaProtocol staProtocol = station.get(464);
                    if (null != staProtocol) {
                        staProtocol.setBarcode(barcode);
                        barcodeThread.setBarcode(barcode);
                    }
                }
            }
            staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));

            try{
                OperateResultExOne<byte[]> resultW464 = siemensS7Net.Read("DB100.1874", (short) 2);
                weight464 = siemensS7Net.getByteTransform().TransInt16(resultW464.Content, 0);// 重量464
                OperateResultExOne<byte[]> resultM464 = siemensS7Net.Read("DB100.1882", (short) 16);
                matnr464 = siemensS7Net.getByteTransform().TransString(resultM464.Content, 0,16, "UTF-8");
                matnr464 = matnr464.replaceAll("\\s+", "");
            } catch (Exception e){
                log.error("读取464站点信息失败");
                weight464 = 0;
                matnr464 = "";
            }
        }

//        //RGV小车
//        Thread.sleep(200);
//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
//        if (result3.IsSuccess) {
//            Integer siteId = 2000;
//            StaProtocol staProtocol = station.get(siteId);
//            if (null == staProtocol) {
//                staProtocol = new StaProtocol();
//                staProtocol.setSiteId(siteId);
//                station.put(siteId, staProtocol);
//            }
//            staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
//        }

        if (result.IsSuccess) {

@@ -377,12 +454,23 @@
                List<BasDevp> basDevps = new ArrayList<>();
                for (Integer siteId : staNos) {
                    StaProtocol staProtocol = station.get(siteId);
                    basDevps.add(staProtocol.toSqlModel());
                    if (siteId == 464){
                        BasDevp basDevp = staProtocol.toSqlModel();
                        basDevp.setGrossWt(Double.valueOf(weight464));
                        basDevp.setDecDesc(matnr464);
                        basDevps.add(basDevp);
                    } else {
                        basDevps.add(staProtocol.toSqlModel());
                    }
                }

                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                    throw new Exception("更新数据库数据失败");
                try{
                    BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                    if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
                        throw new Exception("更新数据库数据失败");
                    }
                } catch (Exception e){
                    log.error("更新数据库数据失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
                }
            } catch (Exception e) {
                e.printStackTrace();
@@ -415,9 +503,9 @@
        //任务下发次数
        int writeCount = 0;
        do {
            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 工作号
            Thread.sleep(500);
            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 目标站
//            Thread.sleep(500);
            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 工作号
            if(write.IsSuccess || write1.IsSuccess){
                writeCount=6;
            }else {
@@ -450,26 +538,8 @@
        Integer siteId = staProtocol.getSiteId();
        Integer index =0;
        switch (siteId){
            case 118:
            case 607:
                index=0;
                break;
            case 119:
                index=1;
                break;
            case 120:
                index=2;
                break;
            case 121:
                index=3;
                break;
            case 131:
                index=4;
                break;
            case 135:
                index=5;
                break;
            case 147:
                index=6;
                break;
            default:
                return;
@@ -479,7 +549,7 @@
        //任务下发次数
        int writeCount = 0;
        do {
            write = siemensS7Net.Write("DB100.600." + index, true);    // 任务完成
            write = siemensS7Net.Write("DB100.1872", (short) 1);    // 任务完成
            if(write.IsSuccess){
                writeCount=6;
            }else {
@@ -508,26 +578,8 @@
        Integer siteId = staProtocol.getSiteId();
        Integer index =0;
        switch (siteId){
            case 118:
            case 607:
                index=0;
                break;
            case 119:
                index=1;
                break;
            case 120:
                index=2;
                break;
            case 121:
                index=3;
                break;
            case 131:
                index=4;
                break;
            case 135:
                index=5;
                break;
            case 147:
                index=6;
                break;
            default:
                return;
@@ -537,10 +589,10 @@
        //任务下发次数
        int writeCount = 0;
        do {
            write = siemensS7Net.Write("DB100.600." + index, false);    // 任务完成复位
            write = siemensS7Net.Write("DB100.1872", (short) 0);    // 任务完成复位
            if(write.IsSuccess){
                writeCount=6;
            }else {
            } else {
                writeCount++;
                log.error("写入输送线命令后读取失败。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
            }
@@ -555,7 +607,7 @@
            log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(staProtocol));
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
            log.info("输送线命令下发码垛完成  给输送复位 [id:{}] >>>>> 命令下发： {}",  slave.getId(), JSON.toJSON(staProtocol));
            log.info("输送线命令下发完成  给输送复位 [id:{}] >>>>> 命令下发： {}",  slave.getId(), JSON.toJSONString(staProtocol));
        }
    }

@@ -566,28 +618,42 @@
        if (null == staProtocol) {
            return;
        }
        News.error("RGV写入命令"+JSON.toJSONString(staProtocol));

        boolean rgv6 = staProtocol.isRGV6();
        OperateResult result1 = null;
        OperateResult result2 = null;
        String resultV1 = "";
        String resultV2 = "";
        String resultV3 = "";
        short resultS1 = 1;
        short resultS2 = 2;
        switch (staProtocol.getSiteId()){
            case 623:
                resultV1 = "DB100.1830";
                resultV2 = "DB100.1826";
                resultV3 = "DB100.1828";
                break;
            case 624:
                resultV1 = "DB100.1840";
                resultV1 = "DB100.1842";
                resultV2 = "DB100.1838";
                resultV3 = "DB100.1840";
                break;
            case 625:
                resultV1 = "DB100.1850";
                resultV1 = "DB100.1854";
                resultV2 = "DB100.1850";
                resultV3 = "DB100.1852";
                break;
            case 626:
                resultV1 = "DB100.1860";
                resultV1 = "DB100.1866";
                resultV2 = "DB100.1862";
                resultV3 = "DB100.1864";
                break;
            default:
                return;
        }
        siemensS7Net.Write(resultV2, (short) 0);
        siemensS7Net.Write(resultV3, (short) 0);
        result1 = siemensS7Net.Write(resultV1, resultS1);

        //硫化罐任务写入后，回读一次，看是否成功
@@ -601,7 +667,7 @@
        do {
            try{
                if(!result1.IsSuccess){
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务1  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result1 = siemensS7Net.Write(resultV1, resultS1);
                    Thread.sleep(100);
                    writeCount++;
@@ -613,14 +679,14 @@
                    if (status == 1){
                        break;
                    } else {
                        log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                        log.error("写入RGV数据失败，重新下发任务2  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                        result1 = siemensS7Net.Write(resultV1, resultS1);
                        Thread.sleep(100);
                        writeCount++;
                        continue;
                    }
                } else {
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务3  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result1 = siemensS7Net.Write(resultV1, resultS1);
                    Thread.sleep(100);
                    writeCount++;
@@ -645,7 +711,7 @@
        do {
            try{
                if(!result2.IsSuccess){
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务4  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result2 = siemensS7Net.Write(resultV1, resultS2);

                    Thread.sleep(100);
@@ -658,14 +724,14 @@
                    if (status == resultS2){
                        break;
                    } else {
                        log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                        log.error("写入RGV数据失败，重新下发任务5  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                        result2 = siemensS7Net.Write(resultV1, resultS2);
                        Thread.sleep(100);
                        writeCount++;
                        continue;
                    }
                } else {
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务6  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result2 = siemensS7Net.Write(resultV1, resultS2);
                    Thread.sleep(100);
                    writeCount++;
@@ -682,26 +748,33 @@
        if (null == staProtocol) {
            return;
        }
        News.error("RGV写入命令"+JSON.toJSONString(staProtocol));

        boolean rgv4 = staProtocol.isRGV4();
        boolean rgv5 = staProtocol.isRGV5();
        OperateResult result1 = null;
        OperateResult result2 = null;
        String resultV1 = "";
        String resultV2 = "";
        short resultS1 = 1;
        short resultS2 = 2;
        if (rgv4){
            switch (staProtocol.getSiteId()){
                case 623:
                    resultV1 = "DB100.1826";
                    resultV2 = "DB100.1830";
                    break;
                case 624:
                    resultV1 = "DB100.1836";
                    resultV1 = "DB100.1838";
                    resultV2 = "DB100.1842";
                    break;
                case 625:
                    resultV1 = "DB100.1846";
                    resultV1 = "DB100.1850";
                    resultV2 = "DB100.1854";
                    break;
                case 626:
                    resultV1 = "DB100.1856";
                    resultV1 = "DB100.1862";
                    resultV2 = "DB100.1866";
                    break;
                default:
                    return;
@@ -710,20 +783,25 @@
            switch (staProtocol.getSiteId()){
                case 623:
                    resultV1 = "DB100.1828";
                    resultV2 = "DB100.1830";
                    break;
                case 624:
                    resultV1 = "DB100.1838";
                    resultV1 = "DB100.1840";
                    resultV2 = "DB100.1842";
                    break;
                case 625:
                    resultV1 = "DB100.1848";
                    resultV1 = "DB100.1852";
                    resultV2 = "DB100.1854";
                    break;
                case 626:
                    resultV1 = "DB100.1858";
                    resultV1 = "DB100.1864";
                    resultV2 = "DB100.1866";
                    break;
                default:
                    return;
            }
        }
        siemensS7Net.Write(resultV2, (short) 0);
        result1 = siemensS7Net.Write(resultV1, resultS1);
        //硫化罐任务写入后，回读一次，看是否成功
        try {
@@ -735,7 +813,7 @@
        do {
            try{
                if(!result1.IsSuccess){
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务7  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result1 = siemensS7Net.Write(resultV1, resultS1);
                    Thread.sleep(100);
                    writeCount++;
@@ -748,14 +826,14 @@
                    if (statusR1 == resultS1){
                        break;
                    } else {
                        log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                        log.error("写入RGV数据失败，重新下发任务8  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                        result1 = siemensS7Net.Write(resultV1, resultS1);
                        Thread.sleep(100);
                        writeCount++;
                        continue;
                    }
                } else {
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务9  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result1 = siemensS7Net.Write(resultV1, resultS1);
                    Thread.sleep(100);
                    writeCount++;
@@ -774,7 +852,7 @@
        do {
            try{
                if(!result2.IsSuccess){
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务10  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result2 = siemensS7Net.Write(resultV1, resultS2);
                    Thread.sleep(100);
                    writeCount++;
@@ -787,7 +865,7 @@
                    if (statusR1 == resultS2){
                        break;
                    } else {
                        log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                        log.error("写入RGV数据失败，重新下发任务11  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                        result2 = siemensS7Net.Write(resultV1, resultS2);

                        Thread.sleep(100);
@@ -795,7 +873,7 @@
                        continue;
                    }
                } else {
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务12  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result2 = siemensS7Net.Write(resultV1, resultS2);
                    Thread.sleep(100);
                    writeCount++;
@@ -817,22 +895,24 @@
        OperateResult result2 = null;
        String resultV1 = "";
        String resultV2 = "";
        News.error("RGV写入命令"+JSON.toJSONString(staProtocol));

        switch (staProtocol.getSiteId()){
            case 623:
                resultV1 = "DB100.1824";
                resultV2 = "DB100.1828";
                resultV2 = "DB100.1848";
                break;
            case 624:
                resultV1 = "DB100.1828";
                resultV2 = "DB100.1824";
                resultV1 = "DB100.1836";
                resultV2 = "DB100.1860";
                break;
            case 625:
                resultV1 = "DB100.1832";
                resultV2 = "DB100.1836";
                resultV1 = "DB100.1848";
                resultV2 = "DB100.1824";
                break;
            case 626:
                resultV1 = "DB100.1836";
                resultV2 = "DB100.1832";
                resultV1 = "DB100.1860";
                resultV2 = "DB100.1836";
                break;
            default:
                return;
@@ -850,7 +930,7 @@
        do {
            try{
                if(!result1.IsSuccess){
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务13  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result1 = siemensS7Net.Write(resultV1, resultS1);
                    Thread.sleep(100);
                    writeCount++;
@@ -862,14 +942,14 @@
                    if (transInt16 == resultS1){
                        break;
                    } else {
                        log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                        log.error("写入RGV数据失败，重新下发任务14  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                        result1 = siemensS7Net.Write(resultV1, resultS1);
                        Thread.sleep(100);
                        writeCount++;
                        continue;
                    }
                } else {
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务15  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result1 = siemensS7Net.Write(resultV1, resultS1);
                    Thread.sleep(100);
                    writeCount++;
@@ -885,7 +965,7 @@
        do {
            try{
                if(!result2.IsSuccess){
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务16  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result2 = siemensS7Net.Write(resultV2, resultS1);
                    Thread.sleep(100);
                    writeCount++;
@@ -897,14 +977,14 @@
                    if (transInt16 == resultS1){
                        break;
                    } else {
                        log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                        log.error("写入RGV数据失败，重新下发任务17  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                        result2 = siemensS7Net.Write(resultV2, resultS1);
                        Thread.sleep(100);
                        writeCount++;
                        continue;
                    }
                } else {
                    log.error("写入RGV数据失败，重新下发任务  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
                    log.error("写入RGV数据失败，重新下发任务18  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(staProtocol),writeCount);
                    result2 = siemensS7Net.Write(resultV2, resultS1);
                    Thread.sleep(100);
                    writeCount++;
@@ -918,15 +998,68 @@

        if (!result1.IsSuccess) {
            staProtocol = station.get(staProtocol.getSiteId());
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSON(staProtocol)));
            log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSON(staProtocol));
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线站点数据失败。输送线plc编号={1}，站点数据={2}", slave.getId(), JSON.toJSONString(staProtocol)));
            log.error("写入输送线站点数据失败。输送线plc编号={}，站点数据={}", slave.getId(), JSON.toJSONString(staProtocol));
        } else {
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
            log.info("输送线命令下发码垛完成  给输送复位 [id:{}] >>>>> 命令下发： {}",  slave.getId(), JSON.toJSON(staProtocol));
            OutputQueue.DEVP.offer(MessageFormat.format("【{0}】 输送线命令下发 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(staProtocol)));
            log.info("输送线命令下发完成  给输送复位 [id:{}] >>>>> 命令下发： {}",  slave.getId(), JSON.toJSONString(staProtocol));
        }
    }

    // 更新入出库模式
    private void write99(Integer devNo) throws InterruptedException {
        String resultV1 = "";
        switch (devNo){
            case 1:
                resultV1 = "DB500.0.0";
                break;
            case 2:
                resultV1 = "DB500.0.1";
                break;
            case 3:
                resultV1 = "DB500.0.2";
                break;
            default:
                return;
        }
        OperateResult result = siemensS7Net.Write(resultV1, true);
        Integer writeCount = 0;
        do {
            try{
                if(!result.IsSuccess){
                    log.error("写入大料箱输送线顶升下降信号失败，重新下发任务19  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
                    result = siemensS7Net.Write(resultV1, true);
                    Thread.sleep(100);
                    writeCount++;
                    continue;
                }
                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("DB500.0", (byte) 1);
                if (resultRead1.IsSuccess) {
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
                    if (status[devNo-1]){
                        break;
                    } else {
                        log.error("写入大料箱输送线顶升下降信号失败，重新下发任务20  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
                        result = siemensS7Net.Write(resultV1, true);
                        Thread.sleep(100);
                        writeCount++;
                        continue;
                    }
                } else {
                    log.error("写入大料箱输送线顶升下降信号失败，重新下发任务21  写入直接失败 ===>> [id:{}],{},[写入次数:{}]", slave.getId(), JSON.toJSONString(devNo),writeCount);
                    result = siemensS7Net.Write(resultV1, true);
                    Thread.sleep(100);
                    writeCount++;
                    continue;
                }
            }catch (Exception e){
                log.error("写入大料箱输送线顶升下降信号回读出错,异常："+e);
            }
            writeCount++;
        } while (writeCount<6);
    }


        // 更新入出库模式
    private void updateIoMode() throws InterruptedException {
        if (this.ioModeOf2F != IoModeType.NONE) {
            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
@@ -955,13 +1088,32 @@
     * 设置入库标记
     */
    @Override
    public void setPakMk(Integer siteId, boolean pakMk) {
    public void setPakMk(Integer siteId, boolean pakMk,Integer i) {
        StaProtocol staProtocol = station.get(siteId);
        if (null != staProtocol) {
            log.info("锁定入库标记，站点号={};pakMk={};时间={};标记={}",siteId,pakMk,new Date(),i);
            staProtocol.setPakMk(pakMk);
        }
    }

    public void updateRgvOneSign(String signType,Integer oneSign){
        RgvOneSignMapper rgvOneSignMapper = SpringUtils.getBean(RgvOneSignMapper.class);

        try{
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
            if (!Cools.isEmpty(rgvOneSign)){
                rgvOneSign.setRgvOneSign(oneSign);
                rgvOneSignMapper.updateById(rgvOneSign);
            }
        } catch (Exception e){
            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign(signType);
            if (!Cools.isEmpty(rgvOneSign)){
                rgvOneSign.setRgvOneSign(999);
                rgvOneSignMapper.updateById(rgvOneSign);
            }
        }
    }

    @Override
    public void close() {
        siemensS7Net.ConnectClose();