Merge remote-tracking branch 'origin/jx-gt-crn-wcs' into jx-gt-crn-wcs

zjj

9 天以前 da4f2304da2646aa0336b492514655e7cc8a494a

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

@@ -233,7 +233,7 @@
                staProtocol.setRequestIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 18));
                staProtocol.setTrayIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 20));
                staProtocol.setLocIo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 22));
                staProtocol.setBarcode(siemensS7Net.getByteTransform().TransString(result.Content,i*66 + 24,16, "UTF-8"));
                staProtocol.setBarcode(siemensS7Net.getByteTransform().TransString(result.Content,i*66 + 24,16, "UTF-8").trim());
//                staProtocol.setWeightIo(siemensS7Net.getByteTransform().TransDouble(result.Content,i*66 + 40));
                staProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result.Content, i*66 + 44));