#

yxFwq

2025-05-10 3b604eb218a3b167144cc6e5d9c86cd95e16157c

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

@@ -47,6 +47,8 @@
    private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
    public boolean charge0;     //请求充电
    public boolean charge1;     //请求充电
    private short weight464;
    private String matnr464;
    private short heartBeatVal = 1;
    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
        add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);
@@ -357,19 +359,19 @@
                int bigEmpty = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 2);// 大料空托
                int smallTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 4);// 小料翻转
                int bigTurn = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 6);// 大料翻转
                int LineUp131 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 8);// 131排队
                int LineUp126 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 10);// 126排队
                int LineUp312 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 12);// 312排队
                int LineUp310 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 14);// 310排队
//                int LineUp131 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 8);// 131排队
//                int LineUp126 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 10);// 126排队
//                int LineUp312 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 12);// 312排队
//                int LineUp310 = siemensS7Net.getByteTransform().TransInt16(resultSignOne.Content, 14);// 310排队

                updateRgvOneSign("smallEmpty",smallEmpty);
                updateRgvOneSign("bigEmpty",bigEmpty);
                updateRgvOneSign("smallTurn",smallTurn);
                updateRgvOneSign("bigTurn",bigTurn);
                updateRgvOneSign("LineUp131",LineUp131);
                updateRgvOneSign("LineUp126",LineUp126);
                updateRgvOneSign("LineUp312",LineUp312);
                updateRgvOneSign("LineUp310",LineUp310);
//                updateRgvOneSign("LineUp131",LineUp131);
//                updateRgvOneSign("LineUp126",LineUp126);
//                updateRgvOneSign("LineUp312",LineUp312);
//                updateRgvOneSign("LineUp310",LineUp310);

            } catch (Exception e){
                log.error("读取输送线数量标记出现异常："+e);
@@ -415,6 +417,18 @@
                    }
                }
            }

            try{
                OperateResultExOne<byte[]> resultW464 = siemensS7Net.Read("DB100.1874", (short) 2);
                weight464 = siemensS7Net.getByteTransform().TransInt16(resultW464.Content, 0);// 重量464
                OperateResultExOne<byte[]> resultM464 = siemensS7Net.Read("DB100.1882", (short) 16);
                matnr464 = siemensS7Net.getByteTransform().TransString(resultM464.Content, 0,16, "UTF-8");
                matnr464 = matnr464.replaceAll("\\s+", "");
            } catch (Exception e){
                log.error("读取464站点信息失败");
                weight464 = 0;
                matnr464 = "";
            }
        }

//        //RGV小车
@@ -440,7 +454,14 @@
                List<BasDevp> basDevps = new ArrayList<>();
                for (Integer siteId : staNos) {
                    StaProtocol staProtocol = station.get(siteId);
                    basDevps.add(staProtocol.toSqlModel());
                    if (siteId == 464){
                        BasDevp basDevp = staProtocol.toSqlModel();
                        basDevp.setGrossWt(Double.valueOf(weight464));
                        basDevp.setDecDesc(matnr464);
                        basDevps.add(basDevp);
                    } else {
                        basDevps.add(staProtocol.toSqlModel());
                    }
                }

                try{
@@ -1011,7 +1032,7 @@
                    writeCount++;
                    continue;
                }
                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("resultV1", (short) 1);
                OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read("DB500.0", (byte) 1);
                if (resultRead1.IsSuccess) {
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
                    if (status[devNo-1]){