#锁路径不锁当前位置

LSH

2024-04-08 fbb7c5966461c4458a3bcb0da709d33e67e51305

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

@@ -71,7 +71,7 @@
    /**
     * 条码数量
     */
    private int barcodeSize = 3;
    private int barcodeSize = 5;

    /**
     * 入出库模式
@@ -119,6 +119,10 @@
                        break;
                    // 写数据 ID+目标站
                    case 2:
//                        write3((StaProtocol)task.getData());
//                        Thread.sleep(400);
//                        write4((StaProtocol)task.getData());
//                        Thread.sleep(400);
                        write((StaProtocol)task.getData());
                        break;
                    // 写数据 ID+目标站 码垛完成  给输送线写任务完成
@@ -128,6 +132,13 @@
                    // 写数据 ID+目标站 码垛完成  给输送线写任务完成复位
                    case 4:
                        write4((StaProtocol)task.getData());
                        break;
                    case 5:
                        write3((StaProtocol)task.getData());
                        Thread.sleep(400);
                        write4((StaProtocol)task.getData());
                        Thread.sleep(400);
                        write((StaProtocol)task.getData());
                        break;
                    default:
                        break;
@@ -198,6 +209,29 @@
                }
            }
        }

        Thread.sleep(200);
        OperateResultExOne<byte[]> resultError = siemensS7Net.Read("DB101.800", (short) (8));
        if (resultError.IsSuccess && staNoSize==staNos2.size()) {
            ArrayList<Integer> staNoError = new ArrayList<Integer>() {{ add(217);add(221); }};
            for (int i = 0; i < staNoError.size(); i++) {
                Integer siteId = staNoError.get(i); // 站点编号
                StaProtocol staProtocol = station.get(siteId);
                if (null == staProtocol) {
                    staProtocol = new StaProtocol();
                    staProtocol.setSiteId(siteId);
                    station.put(siteId, staProtocol);
                }
                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i*4 + 2, 1);
                staProtocol.setFrontErr(status[0]);// 前超限
                staProtocol.setBackErr(status[1]);// 后超限
                staProtocol.setHighErr(status[2]);// 高超限
                staProtocol.setLeftErr(status[3]);// 左超限
                staProtocol.setRightErr(status[4]);// 右超限
                staProtocol.setWeightErr(status[5]); // 超重
                staProtocol.setBarcodeErr(status[6]);// 扫码失败
            }
        }
//        Thread.sleep(200);
//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
//        if (result0.IsSuccess) {
@@ -236,10 +270,10 @@

        //条码扫描器
        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.288",(short)(barcodeSize*10));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*10,6, "UTF-8");
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8));
        if (result2.IsSuccess && staNoSize==staNos2.size()) {
            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);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
@@ -250,8 +284,8 @@
        //RGV小车
        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
        if (result3.IsSuccess) {
            Integer siteId = 16;
        if (result3.IsSuccess && staNoSize==staNos2.size()) {
            Integer siteId = 2000;
            StaProtocol staProtocol = station.get(siteId);
            if (null == staProtocol) {
                staProtocol = new StaProtocol();
@@ -363,6 +397,9 @@
            case 135:
                index=5;
                break;
            case 147:
                index=6;
                break;
            default:
                return;
        }
@@ -373,7 +410,16 @@
        do {
            write = siemensS7Net.Write("DB100.600." + index, true);    // 任务完成
            if(write.IsSuccess){
                writeCount=6;
                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.600." + index, (short) 1);
                if(readResult.IsSuccess){
                    boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readResult.Content, 0, 1);
                    if (booleans[0]){
                        writeCount=6;
                    }else {
                        writeCount++;
                        log.error("写入输送线命令后读取失败。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                    }
                }
            }else {
                writeCount++;
                log.error("写入输送线命令后读取失败。输送线plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -418,6 +464,9 @@
            case 135:
                index=5;
                break;
            case 147:
                index=6;
                break;
            default:
                return;
        }