Merge remote-tracking branch 'origin/ahyxwcs' into ahyxwcs

lsh

2024-07-11 ec82df0c678e39f7a85776b760c88f0aaf9d5847

Merge remote-tracking branch 'origin/ahyxwcs' into ahyxwcs

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

@@ -351,13 +351,14 @@

        //条码扫描器
        Thread.sleep(200);
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.1440",(short)(barcodeSize*8));
        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2440",(short)(barcodeSize*8));
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {  //1:281  2:292  3:174 4:214  5:120
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
                    System.out.println(barcode+"读取到条码："+i);
                }
            }
        }