初始化

.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>780466544745</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

src/com/mes/ui/OprnoUtil.java

@@ -6,14 +6,22 @@ import java.util.Map;
 
 public class OprnoUtil {
     public static String[] xtoprnos = new String[]{
-            "OP060","OP090","OP100","OP130","OP140","OP170","OP180",
-            "OP190","OP210","OP220","OP230","OP240","OP250","OP290",
-            "OP300", "OP320","OP350","OP360","OP390","OP400"
+            "OP10", "OP20", "OP30", "OP40", "OP51", "OP52", "OP60", "OP70",
+            "OP80", "OP90", "OP100", "OP110", "OP120", "OP130", "OP140", "OP150",
+            "OP160", "OP170", "OP180", "OP190", "OP200", "OP210", "OP220", "OP230",
+            "OP240", "OP250", "OP260", "OP270", "OP281", "OP282", "OP283", "OP284",
+            "OP290", "OP300", "OP310", "OP320", "OP330", "OP340", "OP350", "OP360",
+            "OP370", "OP380", "OP390", "OP400", "OP410", "OP420", "OP430", "OP440",
+            "OP450", "OP460", "OP470", "OP480", "OP490"
     };
     public static String[] xtoprnodes = new String[]{
-            "后梁FSW","后梁找漏","后梁CNC","框架CMT焊接","人工补焊","框架气密检测","CNC总成正面加工",
-            "CNC总成反面加工","总成压套筒","正面拉铆安装","框架涂胶","FDS","反面拉铆安装","半成品气密",
-            "底护板安装","总成气密+冷板气密", "拉铆装配","总成检具","CCD检测","GP12"
+            "进料检", "入库", "领料", "镭雕二维码", "前后梁压铆", "前后梁压铆螺母柱-涂胶", "左/右前边框与封堵片焊接", "Flyback固定支架安装钢丝牙套",
+            "小总成焊接", "框架CMT焊接", "人工正面补焊", "人工反面补焊", "焊缝铣削打磨", "焊道检验", "框架CNC反面加工", "框架反面清洁去毛刺",
+            "框架找漏", "框架清洁", "框架终检", "液冷板安装", "冷板激光焊", "液冷板FSW", "水嘴、匙孔焊接", "CNC加工箱体正面",
+            "箱体正反面清洁", "封堵片焊接", "总成反面装螺套", "总成反面拉铆", "总成正面装配", "总成正面装配", "总成正面装配", "总成正面拉铆",
+            "安装中吊点", "型腔封堵", "箱体静置", "箱体气密", "液冷板气密检测", "粘贴MPP泡棉", "底护板气密", "底护板安装",
+            "底护板螺栓复拧", "反面终检", "粘贴陶瓷胶带", "总成清洁", "蓝光检测", "总成检具检验", "正面终检", "CCD错漏检",
+            "绝缘耐压检测", "接地点检测", "GP12", "下线拍照", "称重+包装"
     };
     public static String[] lboprnos = new String[]{
 

src/com/mes/util/SerialPortUtils.java

@@ -122,7 +122,7 @@ public class SerialPortUtils {
                                                         MesClient.param2.setText(lists[2]);
 //
                                                     }
-                                                } else if (data.length() == 97) {//检测结束
+                                                } else if (data.length() == 97 || data.length() == 98) {//检测结束
                                                     log.info("检测结束");
                                                     //结果
                                                     String result = null;
@@ -131,13 +131,13 @@ public class SerialPortUtils {
                                                     String leakRate = null;
                                                     String leakRateUnit = null;
                                                     try {
-                                                        result = data.substring(86, 97).trim();
-                                                        yaLi = data.substring(35, 43).trim();
-                                                        String yaLiUnit = data.substring(45, 49).trim();
-                                                        yaJiang = data.substring(51, 59).trim();
-                                                        String yaJiangUnit = data.substring(61, 65).trim();
-                                                        leakRate = data.substring(67, 75).trim();
-                                                        leakRateUnit = data.substring(77, 84).trim();
+                                                        result = data.substring(86, 98).trim();          // "PNE"（包含末尾的 E）
+                                                        yaLi = data.substring(35, 43).trim();            // "+ 224.58"（不变，已完整）
+                                                        String yaLiUnit = data.substring(45, 49).trim(); // "kPa"（不变）
+                                                        yaJiang = data.substring(51, 60).trim();         // "+ 0.00"（原缺最后一个 0，end+1）
+                                                        String yaJiangUnit = data.substring(61, 65).trim(); // "Pa"（不变）
+                                                        leakRate = data.substring(67, 76).trim();        // "+ 0.00"（原缺最后一个 0，end+1）
+                                                        leakRateUnit = data.substring(77, 85).trim();    // "ml/min"（原缺 n，end+1）
 
                                                         MesClient.tjFlag = 3;
 //                                                    MesClient.setMenuStatus(MesClient.tjFlagText3,0);

src/com/mes/util/SerialPortUtils2.java

@@ -122,7 +122,7 @@ public class SerialPortUtils2 {
                                                         MesClient.param4.setText(lists[2]);
 //
                                                     }
-                                                } else if (data.length() == 97) {//检测结束
+                                                } else if (data.length() == 97 || data.length() == 98) {//检测结束
                                                     log.info("检测结束");
                                                     //结果
                                                     String result = null;
@@ -131,13 +131,13 @@ public class SerialPortUtils2 {
                                                     String leakRate = null;
                                                     String leakRateUnit = null;
                                                     try {
-                                                        result = data.substring(86, 97).trim();
-                                                        yaLi = data.substring(35, 43).trim();
-                                                        String yaLiUnit = data.substring(45, 49).trim();
-                                                        yaJiang = data.substring(51, 59).trim();
-                                                        String yaJiangUnit = data.substring(61, 65).trim();
-                                                        leakRate = data.substring(67, 75).trim();
-                                                        leakRateUnit = data.substring(77, 84).trim();
+                                                        result = data.substring(86, 98).trim();          // "PNE"（包含末尾的 E）
+                                                        yaLi = data.substring(35, 43).trim();            // "+ 224.58"（不变，已完整）
+                                                        String yaLiUnit = data.substring(45, 49).trim(); // "kPa"（不变）
+                                                        yaJiang = data.substring(51, 60).trim();         // "+ 0.00"（原缺最后一个 0，end+1）
+                                                        String yaJiangUnit = data.substring(61, 65).trim(); // "Pa"（不变）
+                                                        leakRate = data.substring(67, 76).trim();        // "+ 0.00"（原缺最后一个 0，end+1）
+                                                        leakRateUnit = data.substring(77, 85).trim();    // "ml/min"（原缺 n，end+1）
 
                                                         MesClient.tjFlag2 = 3;
 //                                                    MesClient.setMenuStatus(MesClient.tjFlagText3,0);

src/resources/config/config.properties

@@ -1,6 +1,6 @@
-mes.gw=OP380A
+mes.gw=OP330A
 mes.server_ip=127.0.0.1
-#mes.server_ip=192.168.20.99
+#mes.server_ip=192.168.15.99
 mes.tcp_port=3000
 
 mes.heart_beat_cycle=60