wangxichen пре 1 дан
родитељ
комит
809a029476

+ 4 - 2
src/com/mes/ui/MesClient.java

@@ -109,7 +109,7 @@ public class MesClient extends JFrame {
 
 
     public static String namea = "A"; // A枪名称 M5
-    public static Integer maxa = 12; // A枪任务数  360=12 290=89
+    public static Integer maxa = 100; // A枪任务数  360=12 290=89
     public static Integer cura = 0; // A枪当前数
     public static Integer resulta = 0; // A枪结果 0=NG 1=OK
     public static List<String> atids = new ArrayList<>();
@@ -507,7 +507,9 @@ public class MesClient extends JFrame {
         }
 
         YgslUtil.disableTool(ygslClient);
-        YgslUtil2.disableTool(ygslClient2);
+        if(ygslNum == 2){ // 单枪模式下 ygslClient2 为空,跳过避免刷空指针日志
+            YgslUtil2.disableTool(ygslClient2);
+        }
 
         updateMaterailData();
         shiftUserCheck();

+ 1 - 1
src/com/mes/ygsl/YgslClient.java

@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
 public class YgslClient {
     public SocketChannel socketChannel;
     public static ChannelFuture future;
-    public static String serverIp = "192.168.5.100"; // M6
+    public static String serverIp = "192.168.5.61"; // OP285 拉铆枪 SR26F21516 (INSIGHTqcx)
 
     public  void run(){
         //配置线程组

+ 1 - 1
src/resources/config/config.properties

@@ -1,4 +1,4 @@
-mes.gw=OP285A
+mes.gw=OP285B
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.110.99
 mes.tcp_port=3000