6
0

8 Коммиты 06561ada0f ... 48a057b0ce

Автор SHA1 Сообщение Дата
  hfy 48a057b0ce Merge remote-tracking branch 'origin/master' 2 месяцев назад
  hfy d221f0c105 修改默认值 2 месяцев назад
  hfy 4711222d5f 修改 2 месяцев назад
  hfy ef022effa1 修改 2 месяцев назад
  jingbo d3cca64d87 优化功能:报文接口化 2 месяцев назад
  jingbo 9d20a4659a 优化功能:pda扫码、行程管控 2 месяцев назад
  chefz ad2b2dd3d0 新增设备管理 4 месяцев назад
  jingbo 5f46f7ba9f 初始化 4 месяцев назад
2 измененных файлов с 6 добавлено и 6 удалено
  1. 5 5
      src/com/mes/ui/MesClient.java
  2. 1 1
      src/com/mes/util/JdbcUtils.java

+ 5 - 5
src/com/mes/ui/MesClient.java

@@ -75,9 +75,6 @@ public class MesClient extends JFrame {
 
     public static JFrame welcomeWin;
 
-    public static JPanel indexPanelB;
-    public static MesWebView jfxPanel = null;
-    public static JPanel indexPanelC;
     public static MesWebView jfxPanel2 = null;
     public static JPanel indexPanelD;
     public static MesRadio mesRadioHj;
@@ -106,18 +103,21 @@ public class MesClient extends JFrame {
     public static Timer cjTimer3;
 
     public static Short aSetNum = 41;
-//    public static Short aSetNum = 49;
+    //    public static Short aSetNum = 49;
     public static Short sortA = 0;
     public static Short aMax = 0;
     public static Short aFinish = 0;
     public static List<Map> alist = new ArrayList<>();
     public static Short bSetNum = 14;
-//    public static Short bSetNum = 27;
+    //    public static Short bSetNum = 27;
     public static Short sortB = 0;
     public static Short bMax = 0;
     public static List<Map> blist = new ArrayList<>();
     public static Short deviceControl = 0; // 0=本地 1=远程
     public static Integer tjStatus = 0; // 1=提交失败
+    public static JPanel indexPanelB;
+    public static MesWebView jfxPanel = null;
+    public static JPanel indexPanelC;
 
     // 铆接参数区间配置(内存缓存)
     public static List<RivetParamRange> rivetParamRangesA = new ArrayList<>();

+ 1 - 1
src/com/mes/util/JdbcUtils.java

@@ -100,7 +100,7 @@ public class JdbcUtils {
 		ResultSet rs = statement.executeQuery("SELECT count(*) FROM bw_config");
 		if (rs.next() && rs.getInt(1) == 0) {
 			statement.executeUpdate("INSERT INTO bw_config (a_set_num, b_set_num, plc_ip_a, plc_ip_b) "
-					+ "VALUES (40, 22, '192.168.1.7', '192.168.1.8')");
+					+ "VALUES (41, 14, '192.168.1.7', '192.168.1.8')");
 		}
 		rs.close();
 		System.out.println("表config创建并初始化成功!");