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

tqs

2022-09-29 f2bcc69468fad1901486ab49a92dabdcdc89960f

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

@@ -181,6 +181,7 @@
        if (result2.IsSuccess) {
            for (int i = 0; i < barcodeSize; i++) {
                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);