#

zjj

2024-12-06 c055f092fd989a009e93e7b7b4ccceb6eaaead38

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

@@ -394,7 +394,9 @@
            //报警信息
            Thread.sleep(200);
            OperateResultExOne<byte[]> result3 = null;
            OperateResultExOne<byte[]> result37new = null;
            result3 = siemensS7Net.Read("DB101.96.0", (short) (getErrorStaNo().size() * 4));
            result37new = siemensS7Net.Read("DB101.120", (short) 8);
            if (result3.IsSuccess) {
                for (int i = 0; i < getErrorStaNo().size(); i++) {
                    Integer siteId = getErrorStaNo().get(i); // 站点编号
@@ -410,6 +412,19 @@
                    staProtocol.setBarcodeErr(status[6]);
                }

            }
            if (result37new.IsSuccess) {
                StaProtocol staProtocol11 = station.get(3011);
                StaProtocol staProtocol06 = station.get(3006);
                short a11171 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 0);
                short a11172 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 2);

                short a11173 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 4);
                short a11174 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 6);
                staProtocol11.setStaNoEnd(a11173);
                staProtocol11.setBan(a11171==1);
                staProtocol06.setStaNoEnd(a11174);
                staProtocol06.setBan(a11172==1);
            }
        }

@@ -645,6 +660,8 @@
                staProtocol.setTongType(tongType);
                staProtocol.setBatch(batch);
                staProtocol.setAmount(amount);
                staProtocol.setAnfme(Double.valueOf(amount));
                staProtocol.setAnfme2(Double.valueOf(amount));
                int i1 = w1 / 100;
                staProtocol.setWeight1((double) i1);
//                staProtocol.setWeight2(w2);