|
|
@@ -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();
|