Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs

tqs

2022-10-11 9ff1f1f221aeafc99653c846b2c2442f9c033ee5

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

@@ -53,10 +53,7 @@
    private int barcodeSize = 1;
    public IoModeType ioMode = IoModeType.NONE;

    public int startSignal1 = 0;
    public int startSignal2 = 0;
    public int startSignal3 = 0;
    public int startSignal4 = 0;
    public int[] startSignal = new int[48];

    public SiemensDevpThread(DevpSlave slave) {
        this.slave = slave;
@@ -84,7 +81,8 @@
                        break;
                    //复位测试信号
                    case 3:
                        siemensS7Net.Write("DB100." + (150 + (int)task.getData()), 0);
                        StaProtocol staProtocol = (StaProtocol)task.getData();
                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
                        break;
                    default:
                        break;
@@ -177,10 +175,11 @@
        }

        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*8));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*12));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*12,12, "UTF-8");
//                String barcode=new String(result2.Content,i*12,12);
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
@@ -189,12 +188,11 @@
        }

        Thread.sleep(200);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.150", (short) 8);
        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
        if(result3.IsSuccess) {
            startSignal1 = siemensS7Net.getByteTransform().TransInt16(result.Content, 0);
            startSignal2 = siemensS7Net.getByteTransform().TransInt16(result.Content, 2);
            startSignal3 = siemensS7Net.getByteTransform().TransInt16(result.Content, 4);
            startSignal4 = siemensS7Net.getByteTransform().TransInt16(result.Content, 6);
            for(int i=0; i<48; i++){
                startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
            }
        }
//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
//        if (result2.IsSuccess) {
@@ -237,7 +235,7 @@
            return;
        }
        int index = staNos.indexOf(staProtocol.getSiteId());
        short[] array = new short[10];
        short[] array = new short[2];
        array[0] = staProtocol.getWorkNo();
        array[1] = staProtocol.getStaNo();
        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);