#

Junjie

2024-01-16 242bbccea6fd21c130f639cf7b9c6aa95d41fe44

 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;
@@ -236,10 +247,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,7 +261,7 @@
        //RGV小车
        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
        if (result3.IsSuccess) {
        if (result3.IsSuccess && staNoSize==staNos2.size()) {
            Integer siteId = 16;
            StaProtocol staProtocol = station.get(siteId);
            if (null == staProtocol) {