#

whycq

2024-12-25 a08610b24b88e3e5cbf1e3e071d67c3818a440cf

#

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -79,6 +79,7 @@
        Map<Integer, Integer> rgv2Map = new HashMap<>();
        rgv2Map.put(4002,4001); rgv2Map.put(4011,4010);
        rgv2Map.put(2101,2102);rgv2Map.put(2001,2002);
        rgv2Map.put(2304,2301);
        Map<Integer, Integer> rgv3Map = new HashMap<>();
        rgv3Map.put(3007,3001);rgv3Map.put(3012,3001);
        rgv3Map.put(1022,2402);rgv3Map.put(1025,2402);

 src/main/java/com/zy/common/CodeBuilder.java

@@ -20,7 +20,7 @@
        generator.url="127.0.0.1:1433;databasename=mdqdasrs";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="man_matnr_code";
        generator.table="man_mat";
        generator.packagePath="com.zy.asrs";
        generator.html = false;
        generator.htmlDetail = false;

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

@@ -471,7 +471,7 @@
                }
                staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12));     // 工作号
                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*12 + 4 ));   // 目标站
                staProtocol.setMatnr(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 12 + 6));   // 目标站
                staProtocol.setMatnr(siemensS7Net.getByteTransform().TransString(result.Content, i * 12 + 6,20,"UTF-8"));   // 目标站
            }
        }
        Thread.sleep(200);
@@ -637,7 +637,7 @@
                Integer siteId = staNos.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
                Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 4);
                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 4,20, "UTF-8");
                short amount =  siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 8);
                String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+10, 20, "UTF-8");
                short staEnd = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 30);
@@ -718,7 +718,7 @@
                Integer siteId = staNos.get(i); // 站点编号
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
//                short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
                Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 2);
                String matnr = siemensS7Net.getByteTransform().TransString(result.Content, i * 4 + 2,20, "UTF-8");
                short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 6);
                String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+8, 20, "UTF-8");
                short ban = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 28);