hou 1 viikko sitten
commit
41aad1df9f
100 muutettua tiedostoa jossa 5102 lisäystä ja 0 poistoa
  1. 25 0
      .classpath
  2. 7 0
      .gitignore
  3. 0 0
      .lock
  4. 28 0
      .project
  5. 823 0
      hs_err_pid16812.log
  6. 2 0
      image/.gitignore
  7. BIN
      image/background.png
  8. BIN
      image/bg/a_side.png
  9. BIN
      image/bg/b_side.png
  10. BIN
      image/bg/bar_add.png
  11. BIN
      image/bg/bar_bookmark.png
  12. BIN
      image/bg/bar_cmd_go.png
  13. BIN
      image/bg/bar_edit.png
  14. BIN
      image/bg/bar_pause.png
  15. BIN
      image/bg/bar_sampling.png
  16. BIN
      image/bg/bar_setting.png
  17. BIN
      image/bg/bar_stop.png
  18. BIN
      image/bg/close_bt.png
  19. BIN
      image/bg/company_setting_logo.png
  20. BIN
      image/bg/delete.png
  21. BIN
      image/bg/department_setting_logo.png
  22. BIN
      image/bg/download.png
  23. BIN
      image/bg/equipment_setting_logo.png
  24. BIN
      image/bg/gj_001_1_20.png
  25. BIN
      image/bg/gj_001_21_40.png
  26. BIN
      image/bg/gj_001_41_60.png
  27. BIN
      image/bg/green_dot.png
  28. BIN
      image/bg/grey_dot.png
  29. BIN
      image/bg/icon.png
  30. BIN
      image/bg/inductance_logo.png
  31. BIN
      image/bg/insulation_logo.png
  32. BIN
      image/bg/login.png
  33. BIN
      image/bg/logo.png
  34. BIN
      image/bg/logoff.png
  35. BIN
      image/bg/menu_data_analysis.png
  36. BIN
      image/bg/menu_data_preprocess.png
  37. BIN
      image/bg/menu_file.png
  38. BIN
      image/bg/menu_setting.png
  39. BIN
      image/bg/min_bt.png
  40. BIN
      image/bg/ng_bg.png
  41. BIN
      image/bg/ok_bg.png
  42. BIN
      image/bg/open_file.png
  43. BIN
      image/bg/refresh.png
  44. BIN
      image/bg/reset_logo.png
  45. BIN
      image/bg/resistance_logo.png
  46. BIN
      image/bg/save_bg.png
  47. BIN
      image/bg/scan_barcode.png
  48. BIN
      image/bg/tree_folder_icon.png
  49. BIN
      image/bg/tree_leaf_icon.png
  50. BIN
      image/bg/user.png
  51. BIN
      image/bg/vertical_line.png
  52. BIN
      image/bg/zoom_in.png
  53. BIN
      image/bg/zoom_out.png
  54. BIN
      image/close_bt.png
  55. 0 0
      image/cmd.txt
  56. BIN
      image/icon.ico
  57. BIN
      image/info_bt.png
  58. BIN
      image/min_bt.png
  59. BIN
      lib/commons-codec-1.15.jar
  60. BIN
      lib/fastjson2-2.0.16.jar
  61. BIN
      lib/gson-2.10.jar
  62. BIN
      lib/iot-communication-1.4.4.jar
  63. BIN
      lib/j2mod-2.7.0.jar
  64. BIN
      lib/jSerialComm-2.6.2.jar
  65. BIN
      lib/jfreechart-1.5.4.jar
  66. BIN
      lib/jshortcut-0.4-oberzalek.jar
  67. BIN
      lib/kotlin-stdlib-1.8.10.jar
  68. BIN
      lib/logback-classic-1.2.13.jar
  69. BIN
      lib/logback-core-1.2.13.jar
  70. BIN
      lib/netty-all-4.1.48.Final.jar
  71. BIN
      lib/okhttp-4.10.0.jar
  72. BIN
      lib/okio-jvm-3.3.0.jar
  73. BIN
      lib/s7connector-2.1.jar
  74. BIN
      lib/slf4j-api-1.7.36.jar
  75. BIN
      lib/sqlite-jdbc-3.36.0.3.jar
  76. 3 0
      src/META-INF/MANIFEST.MF
  77. 10 0
      src/com/mes/component/CallFromJs.java
  78. 249 0
      src/com/mes/component/ConfigPanel.java
  79. 57 0
      src/com/mes/component/MesRadio.java
  80. 44 0
      src/com/mes/component/MesWebView.java
  81. 30 0
      src/com/mes/component/MyDialog.java
  82. 190 0
      src/com/mes/component/ProdReq.java
  83. 90 0
      src/com/mes/netty/MesMsgUtils.java
  84. 63 0
      src/com/mes/netty/NettyClient.java
  85. 82 0
      src/com/mes/netty/NettyClientHandler.java
  86. 73 0
      src/com/mes/netty/ProtocolParam.java
  87. 168 0
      src/com/mes/netty/XDecoder.java
  88. 58 0
      src/com/mes/ui/BindMaterialResp.java
  89. 321 0
      src/com/mes/ui/DataUtil.java
  90. 53 0
      src/com/mes/ui/ErrorMsg.java
  91. 85 0
      src/com/mes/ui/LockUtil.java
  92. 206 0
      src/com/mes/ui/LoginFarme.java
  93. 1385 0
      src/com/mes/ui/MesClient.java
  94. 142 0
      src/com/mes/ui/MesRevice.java
  95. 217 0
      src/com/mes/ui/ModbusUtil.java
  96. 53 0
      src/com/mes/ui/OprnoUtil.java
  97. 447 0
      src/com/mes/ui/PlcUtil.java
  98. 148 0
      src/com/mes/ui/ProdReq.java
  99. 43 0
      src/com/mes/ui/TableCellEditorButton.java
  100. 0 0
      src/com/mes/ui/TableCellRendererButton.java

+ 25 - 0
.classpath

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+    <classpathentry kind="src" path="image"/>
+	<classpathentry excluding="resources/" kind="src" path="src"/>
+	<classpathentry kind="src" path="src/resources"/>
+	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="lib" path="lib/s7connector-2.1.jar"/>
+	<classpathentry kind="lib" path="lib/slf4j-api-2.0.6.jar"/>
+	<classpathentry kind="lib" path="lib/okhttp-4.10.0.jar"/>
+	<classpathentry kind="lib" path="lib/kotlin-stdlib-1.8.10.jar"/>
+	<classpathentry kind="lib" path="lib/okio-jvm-3.3.0.jar"/>
+	<classpathentry kind="lib" path="lib/gson-2.10.jar"/>
+	<classpathentry kind="lib" path="lib/jfreechart-1.5.4.jar"/>
+	<classpathentry kind="lib" path="lib/jshortcut-0.4-oberzalek.jar"/>
+	<classpathentry kind="lib" path="lib/netty-all-4.1.48.Final.jar"/>
+	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.36.0.3.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.15.jar"/>
+	<classpathentry kind="lib" path="lib/fastjson2-2.0.16.jar"/>
+	<classpathentry kind="lib" path="lib/iot-communication-1.4.4.jar"/>
+</classpath>

+ 7 - 0
.gitignore

@@ -0,0 +1,7 @@
+.idea
+.settings
+classes
+bin
+out
+*.db
+*.iml

+ 0 - 0
.lock


+ 28 - 0
.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>mesclient-op220</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1765091501343</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>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 823 - 0
hs_err_pid16812.log


+ 2 - 0
image/.gitignore

@@ -0,0 +1,2 @@
+META-INF
+_system~.ini

BIN
image/background.png


BIN
image/bg/a_side.png


BIN
image/bg/b_side.png


BIN
image/bg/bar_add.png


BIN
image/bg/bar_bookmark.png


BIN
image/bg/bar_cmd_go.png


BIN
image/bg/bar_edit.png


BIN
image/bg/bar_pause.png


BIN
image/bg/bar_sampling.png


BIN
image/bg/bar_setting.png


BIN
image/bg/bar_stop.png


BIN
image/bg/close_bt.png


BIN
image/bg/company_setting_logo.png


BIN
image/bg/delete.png


BIN
image/bg/department_setting_logo.png


BIN
image/bg/download.png


BIN
image/bg/equipment_setting_logo.png


BIN
image/bg/gj_001_1_20.png


BIN
image/bg/gj_001_21_40.png


BIN
image/bg/gj_001_41_60.png


BIN
image/bg/green_dot.png


BIN
image/bg/grey_dot.png


BIN
image/bg/icon.png


BIN
image/bg/inductance_logo.png


BIN
image/bg/insulation_logo.png


BIN
image/bg/login.png


BIN
image/bg/logo.png


BIN
image/bg/logoff.png


BIN
image/bg/menu_data_analysis.png


BIN
image/bg/menu_data_preprocess.png


BIN
image/bg/menu_file.png


BIN
image/bg/menu_setting.png


BIN
image/bg/min_bt.png


BIN
image/bg/ng_bg.png


BIN
image/bg/ok_bg.png


BIN
image/bg/open_file.png


BIN
image/bg/refresh.png


BIN
image/bg/reset_logo.png


BIN
image/bg/resistance_logo.png


BIN
image/bg/save_bg.png


BIN
image/bg/scan_barcode.png


BIN
image/bg/tree_folder_icon.png


BIN
image/bg/tree_leaf_icon.png


BIN
image/bg/user.png


BIN
image/bg/vertical_line.png


BIN
image/bg/zoom_in.png


BIN
image/bg/zoom_out.png


BIN
image/close_bt.png


+ 0 - 0
image/cmd.txt


BIN
image/icon.ico


BIN
image/info_bt.png


BIN
image/min_bt.png


BIN
lib/commons-codec-1.15.jar


BIN
lib/fastjson2-2.0.16.jar


BIN
lib/gson-2.10.jar


BIN
lib/iot-communication-1.4.4.jar


BIN
lib/j2mod-2.7.0.jar


BIN
lib/jSerialComm-2.6.2.jar


BIN
lib/jfreechart-1.5.4.jar


BIN
lib/jshortcut-0.4-oberzalek.jar


BIN
lib/kotlin-stdlib-1.8.10.jar


BIN
lib/logback-classic-1.2.13.jar


BIN
lib/logback-core-1.2.13.jar


BIN
lib/netty-all-4.1.48.Final.jar


BIN
lib/okhttp-4.10.0.jar


BIN
lib/okio-jvm-3.3.0.jar


BIN
lib/s7connector-2.1.jar


BIN
lib/slf4j-api-1.7.36.jar


BIN
lib/sqlite-jdbc-3.36.0.3.jar


+ 3 - 0
src/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.mes.ui.MesClient
+

+ 10 - 0
src/com/mes/component/CallFromJs.java

@@ -0,0 +1,10 @@
+package com.mes.component;
+
+import com.mes.ui.MesClient;
+
+public class CallFromJs {
+    public String callFromJs(String info){
+        System.out.print("ss:"+info);
+        return MesClient.sessionid+":java:" + info;
+    }
+}

+ 249 - 0
src/com/mes/component/ConfigPanel.java

@@ -0,0 +1,249 @@
+package com.mes.component;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.mes.ui.MesClient;
+import com.mes.util.JdbcUtils;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+import java.awt.*;
+
+/**
+ * 设备管理配置面板 - 优化版
+ */
+public class ConfigPanel extends JPanel {
+
+    private JTextField deviceIp;
+    private JTextField gunA_name, gunA_max, gunA_type;
+//    private JTextField gunB_name, gunB_max, gunB_type; // B枪已停用
+    private JTextField station_gw, station_gw_des;
+
+    private Font labelFont = new Font("微软雅黑", Font.BOLD, 18);
+    private Font inputFont = new Font("微软雅黑", Font.PLAIN, 18);
+    private Font titleFont = new Font("微软雅黑", Font.BOLD, 20);
+
+    public ConfigPanel() {
+        setLayout(new BorderLayout());
+        setBackground(Color.WHITE);
+        
+        JPanel mainPanel = new JPanel();
+        mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+        mainPanel.setBorder(new EmptyBorder(30, 30, 30, 30));
+        mainPanel.setBackground(Color.WHITE);
+
+        // 1. 工位基础配置
+        JPanel stationPanel = new JPanel(new GridLayout(1, 2, 40, 15));
+        stationPanel.setBackground(Color.WHITE);
+        TitledBorder sBorder = BorderFactory.createTitledBorder("工位基础配置 (Station Config)");
+        sBorder.setTitleFont(titleFont);
+        stationPanel.setBorder(sBorder);
+        
+        JPanel sGroup1 = new JPanel(new BorderLayout(5, 5));
+        sGroup1.setOpaque(false);
+        sGroup1.add(createLabel("工位编号 (GW):"), BorderLayout.NORTH);
+        station_gw = createTextField();
+        sGroup1.add(station_gw, BorderLayout.CENTER);
+        stationPanel.add(sGroup1);
+
+        JPanel sGroup2 = new JPanel(new BorderLayout(5, 5));
+        sGroup2.setOpaque(false);
+        sGroup2.add(createLabel("工位名称 (GW_DES):"), BorderLayout.NORTH);
+        station_gw_des = createTextField();
+        sGroup2.add(station_gw_des, BorderLayout.CENTER);
+        stationPanel.add(sGroup2);
+
+        mainPanel.add(stationPanel);
+        mainPanel.add(Box.createVerticalStrut(20));
+
+        // 2. IP 配置 (共用)
+        JPanel ipPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 15, 10));
+        ipPanel.setBackground(Color.WHITE);
+        TitledBorder ipBorder = BorderFactory.createTitledBorder("控制器连接配置 (单IP控制A枪)");
+        ipBorder.setTitleFont(titleFont);
+        ipPanel.setBorder(ipBorder);
+        
+        JLabel lblIp = new JLabel("设备 IP 地址:");
+        lblIp.setFont(labelFont);
+        ipPanel.add(lblIp);
+        
+        deviceIp = new JTextField(15);
+        deviceIp.setFont(inputFont);
+        deviceIp.setPreferredSize(new Dimension(250, 40));
+        ipPanel.add(deviceIp);
+        
+        mainPanel.add(ipPanel);
+        mainPanel.add(Box.createVerticalStrut(20));
+
+        // 2. A 枪配置
+        JPanel panelA = new JPanel(new GridLayout(3, 2, 20, 15));
+        panelA.setBackground(Color.WHITE);
+        TitledBorder borderA = BorderFactory.createTitledBorder("拉铆枪 A 配置");
+        borderA.setTitleFont(titleFont);
+        panelA.setBorder(borderA);
+        
+        panelA.add(createLabel("设备名称:"));
+        gunA_name = createTextField();
+        panelA.add(gunA_name);
+        
+        panelA.add(createLabel("预设数量:"));
+        gunA_max = createTextField();
+        panelA.add(gunA_max);
+        
+        panelA.add(createLabel("螺栓类型 (如M6):"));
+        gunA_type = createTextField();
+        panelA.add(gunA_type);
+        
+        mainPanel.add(panelA);
+        mainPanel.add(Box.createVerticalStrut(20));
+
+//        // 3. B 枪配置(已停用)
+//        JPanel panelB = new JPanel(new GridLayout(3, 2, 20, 15));
+//        panelB.setBackground(Color.WHITE);
+//        TitledBorder borderB = BorderFactory.createTitledBorder("拉铆枪 B 配置");
+//        borderB.setTitleFont(titleFont);
+//        panelB.setBorder(borderB);
+//        panelB.add(createLabel("设备名称:"));
+//        gunB_name = createTextField();
+//        panelB.add(gunB_name);
+//        panelB.add(createLabel("预设数量:"));
+//        gunB_max = createTextField();
+//        panelB.add(gunB_max);
+//        panelB.add(createLabel("螺栓类型 (如M8):"));
+//        gunB_type = createTextField();
+//        panelB.add(gunB_type);
+//        mainPanel.add(panelB);
+
+        JScrollPane scrollPane = new JScrollPane(mainPanel);
+        scrollPane.setBorder(null);
+        add(scrollPane, BorderLayout.CENTER);
+
+        // 底部按钮
+        JPanel btnPanel = new JPanel();
+        btnPanel.setBackground(Color.WHITE);
+        btnPanel.setBorder(new EmptyBorder(10, 0, 20, 0));
+        
+        JButton saveBtn = new JButton(" 保 存 配 置 ");
+        saveBtn.setFont(new Font("微软雅黑", Font.BOLD, 22));
+        saveBtn.setPreferredSize(new Dimension(200, 50));
+        saveBtn.setBackground(new Color(0, 123, 255));
+        saveBtn.setForeground(Color.WHITE);
+        saveBtn.setFocusPainted(false);
+        saveBtn.addActionListener(e -> saveConfigs());
+        btnPanel.add(saveBtn);
+        add(btnPanel, BorderLayout.SOUTH);
+
+        loadConfigs();
+    }
+
+    private JLabel createLabel(String text) {
+        JLabel label = new JLabel(text);
+        label.setFont(labelFont);
+        return label;
+    }
+
+    private JTextField createTextField() {
+        JTextField textField = new JTextField();
+        textField.setFont(inputFont);
+        textField.setPreferredSize(new Dimension(200, 40));
+        return textField;
+    }
+
+    /**
+     * 加载本地数据库配置
+     */
+    private void loadConfigs() {
+        JSONObject configS = JdbcUtils.getStationConfig();
+        if (configS != null) {
+            station_gw.setText(configS.getString("mes_gw"));
+            station_gw_des.setText(configS.getString("mes_gw_des"));
+        } else {
+            station_gw.setText(MesClient.mes_gw);
+            station_gw_des.setText(MesClient.mes_gw_des);
+        }
+
+        JSONObject configA = JdbcUtils.getGunConfig("gunA");
+        if (configA != null) {
+            deviceIp.setText(configA.getString("ip"));
+            gunA_name.setText(configA.getString("device_name"));
+            gunA_max.setText(configA.getString("preset_count"));
+            gunA_type.setText(configA.getString("bolt_type"));
+        } else {
+            // 数据库没有数据,回显程序当前的默认值
+            deviceIp.setText(MesClient.plcA_ip);
+            gunA_name.setText("拉铆枪A");
+            gunA_max.setText(String.valueOf(MesClient.maxa));
+            gunA_type.setText(MesClient.namea);
+        }
+
+//        JSONObject configB = JdbcUtils.getGunConfig("gunB");
+//        if (configB != null) {
+//            gunB_name.setText(configB.getString("device_name"));
+//            gunB_max.setText(configB.getString("preset_count"));
+//            gunB_type.setText(configB.getString("bolt_type"));
+//        } else {
+//            gunB_name.setText("拉铆枪B");
+//            gunB_max.setText(String.valueOf(MesClient.maxb));
+//            gunB_type.setText(MesClient.nameb);
+//        }
+    }
+
+    /**
+     * 保存配置到本地数据库并同步到内存
+     */
+    private void saveConfigs() {
+        try {
+            String ip = deviceIp.getText().trim();
+            String nameA = gunA_name.getText().trim();
+            int maxA = Integer.parseInt(gunA_max.getText().trim());
+            String typeA = gunA_type.getText().trim();
+
+//            String nameB = gunB_name.getText().trim();
+//            int maxB = Integer.parseInt(gunB_max.getText().trim());
+//            String typeB = gunB_type.getText().trim();
+
+            // 智能重连逻辑
+            boolean ipChanged = !ip.equals(MesClient.plcA_ip);
+
+            // 保存到数据库(B枪参数传 0)
+            JdbcUtils.updateConfig((short) maxA, (short) 0, ip, ip, typeA, "", station_gw.getText().trim(), station_gw_des.getText().trim());
+
+            // 同步到内存变量
+            MesClient.plcA_ip = ip;
+            MesClient.maxa = maxA;
+            MesClient.aMax = maxA;
+            MesClient.namea = typeA;
+//            MesClient.maxb = maxB;
+//            MesClient.bMax = maxB;
+//            MesClient.nameb = typeB;
+
+            MesClient.mes_gw = station_gw.getText().trim();
+            MesClient.mes_gw_des = station_gw_des.getText().trim();
+
+            // 更新 UI 上的螺栓类型显示
+            if (MesClient.lblA != null) MesClient.lblA.setText(typeA);
+//            if (MesClient.lblB != null) MesClient.lblB.setText(typeB);
+            if (MesClient.param1 != null) MesClient.param1.setText(String.valueOf(maxA));
+//            if (MesClient.param3 != null) MesClient.param3.setText(String.valueOf(maxB));
+            
+            // 更新标题
+            if (MesClient.mesClientFrame != null) {
+                MesClient.mesClientFrame.setTitle("MES系统客户端:" + MesClient.mes_gw + "- " + MesClient.mes_gw_des);
+            }
+
+            UIManager.put("OptionPane.messageFont", new Font("微软雅黑", Font.PLAIN, 18));
+            JOptionPane.showMessageDialog(this, "配置保存成功!" + (ipChanged ? "\nIP已更改,正在重连设备..." : ""));
+
+            if (ipChanged) {
+                new Thread(() -> MesClient.initPlcConnection()).start();
+            } else if (MesClient.plcA_connect_flag) {
+//                new Thread(() -> com.mes.ui.PlcUtil.setTask(MesClient.plcA, maxA, maxB)).start();
+            }
+
+        } catch (NumberFormatException ex) {
+            JOptionPane.showMessageDialog(this, "数量格式错误,请输入数字", "错误", JOptionPane.ERROR_MESSAGE);
+        } catch (Exception ex) {
+            JOptionPane.showMessageDialog(this, "保存失败: " + ex.getMessage(), "错误", JOptionPane.ERROR_MESSAGE);
+        }
+    }
+}

+ 57 - 0
src/com/mes/component/MesRadio.java

@@ -0,0 +1,57 @@
+package com.mes.component;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class MesRadio extends JPanel {
+
+    private String result = "";
+    private Integer i = 0;
+
+    public MesRadio(String[] radioTitles,String[] radioVals){
+        this.setLayout(new FlowLayout());
+        ButtonGroup group = new ButtonGroup();
+        i = 0;
+        for (String title:radioTitles){
+            JRadioButton radioButton = new JRadioButton(title);
+            radioButton.setFont(new Font("微软雅黑", Font.PLAIN, 28));
+
+            String val = radioVals[i];
+            radioButton.setName(val);
+
+            this.add(radioButton);
+            group.add(radioButton);
+
+            radioButton.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    result = val;
+                    System.out.println("选择:"+result);
+                }
+            });
+            i++;
+        }
+    }
+
+    public void setResult(String ret){
+        this.result = "";
+        Component[] components = this.getComponents();
+        for (Component jRadioButton:components){
+            if(jRadioButton instanceof JRadioButton){
+                JRadioButton jRadioButtonParam = (JRadioButton)jRadioButton;
+                if(ret.equals(jRadioButtonParam.getName())){
+                    jRadioButtonParam.setSelected(true);
+                    this.result = jRadioButtonParam.getName();
+                }else{
+                    jRadioButtonParam.setSelected(false);
+                }
+            }
+        }
+    }
+
+    public String getResult(){
+        return this.result;
+    }
+}

+ 44 - 0
src/com/mes/component/MesWebView.java

@@ -0,0 +1,44 @@
+package com.mes.component;
+
+import javafx.application.Platform;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Worker;
+import javafx.embed.swing.JFXPanel;
+import javafx.scene.Scene;
+import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebView;
+import netscape.javascript.JSObject;
+
+import java.util.Date;
+
+public class MesWebView extends JFXPanel {
+
+    public static WebEngine engine = null;
+
+    public MesWebView(String url){
+
+        Platform.runLater(() -> {
+            WebView webView = new WebView();
+            setScene(new Scene(webView));
+            Date date = new Date();
+//            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesQuality/check?__sid="+sessionid+"&oprno="+mes_gw+"&t="+date.getTime();
+            System.out.print(url);
+            engine = webView.getEngine();
+            CallFromJs bridge = new CallFromJs();
+            engine.getLoadWorker().stateProperty().addListener(
+                    (ObservableValue<? extends Worker.State> ov, Worker.State oldState, Worker.State newState) -> {
+                        if (newState == Worker.State.SUCCEEDED) {
+                            JSObject window = (JSObject) engine.executeScript("window");
+                            window.setMember("apps", bridge);
+                            window.setMember("sout", System.out);
+                        }
+                    }
+            );
+            engine.load(url);
+        });
+    }
+
+    public void reloadWeb(){
+        engine.reload();
+    }
+}

+ 30 - 0
src/com/mes/component/MyDialog.java

@@ -0,0 +1,30 @@
+package com.mes.component;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class MyDialog extends JDialog {
+
+    public MyDialog(Frame owner, String title, String msg){
+        super(owner, title);
+        init(msg);
+    }
+
+    private void init(String msg){
+        Container container = this.getContentPane();
+        container.setLayout(null);
+        container.setBackground(Color.BLACK);
+        this.setSize(800,220);
+        this.setLocationRelativeTo(null);
+
+        JLabel tslabel = new JLabel(msg);
+        tslabel.setHorizontalAlignment(SwingConstants.CENTER);
+        tslabel.setForeground(Color.RED);
+        tslabel.setFont(new Font("微软雅黑", Font.PLAIN,48));
+        tslabel.setBounds(0,30,800,100);
+
+        container.add(tslabel);
+        this.setModal(true);
+        this.setVisible(true);
+    }
+}

+ 190 - 0
src/com/mes/component/ProdReq.java

@@ -0,0 +1,190 @@
+package com.mes.component;
+
+/**
+ * 拉铆数据实体类
+ */
+public class ProdReq {
+    // id
+    private Integer id;
+    // 工位
+    private String gw;
+    // 线体
+    private String lineSn;
+    // 类型
+    private String type;
+    // 工件号
+    private String sn;
+    // 拉力
+    private String fout;
+    // 位移
+    private String sout;
+    // 拉力下偏差
+    private String fmin;
+    // 位移下偏差
+    private String smin;
+    // 拉力上限
+    private String fmax;
+    // 位移上限
+    private String smax;
+    //
+    private String qty;
+    //
+    private String serialNumber;
+    //
+    private Integer sync;
+    //
+    private String recordTime;
+    //
+    private String ucode;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getGw() {
+        return gw;
+    }
+
+    public void setGw(String gw) {
+        this.gw = gw;
+    }
+
+    public String getLineSn() {
+        return lineSn;
+    }
+
+    public void setLineSn(String lineSn) {
+        this.lineSn = lineSn;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getSn() {
+        return sn;
+    }
+
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    public String getFout() {
+        return fout;
+    }
+
+    public void setFout(String fout) {
+        this.fout = fout;
+    }
+
+    public String getSout() {
+        return sout;
+    }
+
+    public void setSout(String sout) {
+        this.sout = sout;
+    }
+
+    public String getFmin() {
+        return fmin;
+    }
+
+    public void setFmin(String fmin) {
+        this.fmin = fmin;
+    }
+
+    public String getSmin() {
+        return smin;
+    }
+
+    public void setSmin(String smin) {
+        this.smin = smin;
+    }
+
+    public String getFmax() {
+        return fmax;
+    }
+
+    public void setFmax(String fmax) {
+        this.fmax = fmax;
+    }
+
+    public String getSmax() {
+        return smax;
+    }
+
+    public void setSmax(String smax) {
+        this.smax = smax;
+    }
+
+    public String getQty() {
+        return qty;
+    }
+
+    public void setQty(String qty) {
+        this.qty = qty;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public Integer getSync() {
+        return sync;
+    }
+
+    public void setSync(Integer sync) {
+        this.sync = sync;
+    }
+
+    public String getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(String recordTime) {
+        this.recordTime = recordTime;
+    }
+
+    public String getUcode() {
+        return ucode;
+    }
+
+    public void setUcode(String ucode) {
+        this.ucode = ucode;
+    }
+
+    @Override
+    public String toString() {
+        return "ProdReq{" +
+                "id=" + id +
+                ", gw='" + gw + '\'' +
+                ", lineSn='" + lineSn + '\'' +
+                ", type='" + type + '\'' +
+                ", sn='" + sn + '\'' +
+                ", fout='" + fout + '\'' +
+                ", sout='" + sout + '\'' +
+                ", fmin='" + fmin + '\'' +
+                ", smin='" + smin + '\'' +
+                ", fmax='" + fmax + '\'' +
+                ", smax='" + smax + '\'' +
+                ", qty='" + qty + '\'' +
+                ", serialNumber='" + serialNumber + '\'' +
+                ", sync=" + sync +
+                ", recordTime='" + recordTime + '\'' +
+                ", ucode='" + ucode + '\'' +
+                '}';
+    }
+}

+ 90 - 0
src/com/mes/netty/MesMsgUtils.java

@@ -0,0 +1,90 @@
+package com.mes.netty;
+
+public class MesMsgUtils {
+
+    public static int SYNR_LEN = 46;
+    public static int AXTW_LEN = 46;
+    public static int ACLW_LEN = 46;
+    public static int MCJW_LEN = 96;
+    public static int AQDW_LEN = 96;
+    public static int MBDW_LEN = 96;
+    public static int MJBW_LEN = 96;
+    public static int MQDW_LEN = 96;
+    public static int MKSW_LEN = 96;
+    public static int MSBW_LEN = 96;
+    public static int MCSW_LEN = 96;
+    public static int AQRW_LEN = 96;
+
+    public static String MSG_TYPE[] = {
+        "SYNR",
+        "AXTW",
+        "ACLW",
+        "MCJW",
+        "AQDW",
+        "MBDW",
+        "MJBW",
+        "MQDW",
+        "MKSW",
+        "MSBW",
+        "MCSW",
+        "AQRW",
+    };
+
+    public static int isMsgContentOK(String msg, String msg_type) {
+        //ret=0OK,1 空内容,2 长度不符
+        int ret = 0;
+        if(msg==null||msg.equalsIgnoreCase("")) {
+            ret = 1;
+            return ret;
+        }
+
+        int len = msg.length();
+        //System.out.println("len="+len);
+        switch(msg_type) {
+            case "SYNR":
+            case "AXTW":
+            case "ACLW":
+                if(len==SYNR_LEN) {
+                    ret = 0;
+                }else {
+                    ret = 2;
+                }
+                break;
+            default:
+                if(len==AQDW_LEN) {
+                    ret = 0;
+                }else {
+                    ret = 2;
+                }
+                break;
+        }
+        return ret;
+    }
+
+    // 判断报文类型是否在清单里
+    public static boolean isMsgTypeOk(String msg_type) {
+        for (String str : MSG_TYPE) {
+            if (str.equals(msg_type)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // 处理报文数据
+    public static String processMsg(String msg, String msg_type) {
+        String processMsgRet = "";
+        if(msg_type.equalsIgnoreCase("SYNR")) {
+
+        }else if(msg_type.equalsIgnoreCase("AXTW")) {
+
+        }else if(msg_type.equalsIgnoreCase("ACLW")) {
+
+        }else{
+            processMsgRet = ProtocolParam.getResult(msg);
+        }
+        return processMsgRet;
+    }
+
+
+}

+ 63 - 0
src/com/mes/netty/NettyClient.java

@@ -0,0 +1,63 @@
+package com.mes.netty;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.string.StringEncoder;
+import java.util.concurrent.TimeUnit;
+
+import com.mes.ui.MesClient;
+
+public class NettyClient {
+    public SocketChannel socketChannel;
+    public static ChannelFuture future;
+
+    public  void run(Object msg){
+        //配置线程组
+        EventLoopGroup group = new NioEventLoopGroup();
+        //创建服务启动器
+        Bootstrap bootstrap = new Bootstrap();
+
+        //配置参数
+        bootstrap.group(group)
+                .channel(NioSocketChannel.class)
+                .option(ChannelOption.TCP_NODELAY,true)
+                .handler(new ChannelInitializer<SocketChannel>() {
+                    protected void initChannel(SocketChannel socketChannel) throws Exception {
+                        socketChannel.pipeline()
+                                .addLast(new XDecoder())
+                                .addLast(new StringEncoder())
+//                                    .addLast(new StringDecoder())
+                                .addLast(new NettyClientHandler());
+                    }
+                })
+                .remoteAddress(MesClient.mes_server_ip,MesClient.mes_tcp_port);
+
+        //连接
+        future = bootstrap.connect();
+        System.out.println("客户端正在连接服务端...");
+        //客户端断线重连逻辑
+        future.addListener((ChannelFutureListener) future1 -> {
+            if (future1.isSuccess()) {
+                //tcp连接成功
+                MesClient.tcp_connect_flag = true;
+                //设置TCP请求状态
+                MesClient.connect_request_flag = false;
+                System.out.println("连接Netty服务端成功");
+                future.channel().writeAndFlush(msg);
+            } else {
+                //tcp连接失败
+                MesClient.tcp_connect_flag = false;
+                MesClient.connect_request_flag = true;
+                System.out.println("连接失败,进行断线重连");
+                future1.channel().eventLoop().schedule(() -> run(msg), 10, TimeUnit.SECONDS);
+            }
+            //设置tcp连接状态
+            MesClient.setTcpStatus();
+        });
+        socketChannel = (SocketChannel) future.channel();
+
+    }
+}

+ 82 - 0
src/com/mes/netty/NettyClientHandler.java

@@ -0,0 +1,82 @@
+package com.mes.netty;
+
+import com.mes.ui.MesClient;
+import com.mes.ui.MesRevice;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class NettyClientHandler extends ChannelInboundHandlerAdapter {
+
+    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    public static byte[] responseByte;
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        System.out.println("mes connecting:" + sdf.format(new Date()));
+    }
+
+    @Override
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+        Channel channel = ctx.channel();
+        System.err.println("close tcp, ip:" + channel.remoteAddress());
+        MesClient.tcp_connect_flag = false;
+        MesClient.setTcpStatus();
+        // 关闭通道
+        channel.close();
+    }
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        System.out.println("msg:"+msg);
+
+        String mes_msg = formatResult(msg.toString());
+        if(mes_msg == null || mes_msg.isEmpty()){ // error msg
+            return;
+        }
+
+        String msg_type = ProtocolParam.getMsgType(mes_msg);
+        System.out.println("msg_type="+msg_type);
+
+        String processMsgRet = MesMsgUtils.processMsg(mes_msg, msg_type);
+        System.out.println("processMsgRet="+processMsgRet);
+        switch(msg_type) {
+            case "AQDW": // 查询质量
+                MesRevice.checkQualityRevice(processMsgRet,mes_msg);
+                break;
+            case "MKSW":
+                MesRevice.startRevice(processMsgRet,mes_msg);
+                break;
+            case "MBDW":
+                MesRevice.bindRevice(processMsgRet,mes_msg);
+                break;
+            case "MJBW":
+                MesRevice.unbindRevice(processMsgRet,mes_msg);
+                break;
+            case "MQDW":
+                MesRevice.updateResultRevice(processMsgRet,mes_msg);
+                break;
+        }
+
+
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        ctx.close();
+    }
+
+    private String formatResult(String msg){
+        System.err.println("length:" + msg.length() + " content:" + msg);
+        String msgType = msg.substring(0,2).trim();
+        if(msgType.equals("OK")){
+            return msg.substring(3,msg.length());
+        }else{
+            return "";
+        }
+    }
+
+}

+ 73 - 0
src/com/mes/netty/ProtocolParam.java

@@ -0,0 +1,73 @@
+package com.mes.netty;
+
+
+// 固定格式报文各参数获取方法
+public class ProtocolParam {
+    // bbbbfffffARWAQDWGWOP100 GY100000ID151245P00000106200123062900001      RSOKDA2023-09-07ZT10:16:58
+    public static Integer fixedLength = 96; // 固定长度
+
+    // 获取消息类型  所有报文都可使用
+    public static String getMsgType(String msg){
+        System.out.print(msg);
+        if(msg.length() < 16){
+            return "";
+        }
+        return msg.substring(12,16);
+    }
+
+    // 获取工位号
+    public static String getOprno(String msg){
+        if(msg.length() < 24){
+            return "";
+        }
+        return msg.substring(18,24);
+    }
+
+    // 获取工艺号
+    public static String getCraft(String msg){
+        if(msg.length() < 32){
+            return "";
+        }
+        return msg.substring(26,32);
+    }
+
+    // 获取镭雕码或设备报警故障代码
+    public static String getSn(String msg){
+        if(msg.length() < 70){
+            return "";
+        }
+        return msg.substring(34,70);
+    }
+
+    public static String getLx(String msg){
+        if(msg.length() < 72){
+            return "";
+        }
+        return msg.substring(70,72);
+    }
+
+    // 获取结果
+    public static String getResult(String msg){
+        if(msg.length() < 74){
+            return "";
+        }
+        return msg.substring(72,74);
+    }
+
+    // 获取日期
+    public static String getDay(String msg){
+        if(msg.length() < 86){
+            return "";
+        }
+        return msg.substring(76,86);
+    }
+
+    // 获取时间
+    public static String getTime(String msg){
+        if(msg.length() < 96){
+            return "";
+        }
+        return msg.substring(88,96);
+    }
+
+}

+ 168 - 0
src/com/mes/netty/XDecoder.java

@@ -0,0 +1,168 @@
+package com.mes.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+
+import java.util.List;
+
+public class XDecoder extends ByteToMessageDecoder {
+    static final int PACKET_SIZE = 46; // 最短包长度
+    static final int PACKET_MAX_SIZE = 1000; // 最长包长度
+
+    // 用来临时保留没有处理过的请求报文
+    ByteBuf tempMsg = Unpooled.buffer();
+
+    /**
+     * @param ctx
+     * @param in 请求的数据
+     * @param out 将粘在一起的报文拆分后的结果保留起来
+     * @throws Exception
+     */
+    @Override
+    protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
+        System.out.println(Thread.currentThread() + "收到了一次数据包,长度是:" + in.readableBytes());
+        String content = hexStringToAscii(ByteBufUtil.hexDump(in));
+        System.out.println("接收包内容:" + hexStringToAscii(ByteBufUtil.hexDump(in)));
+
+        // 合并报文
+        ByteBuf message = null;
+        int tmpMsgSize = tempMsg.readableBytes();
+        // 如果暂存有上一次余下的请求报文,则合并
+        if (tmpMsgSize > 0) {
+            message = Unpooled.buffer();
+            message.writeBytes(tempMsg);
+            message.writeBytes(in);
+            System.out.println("合并:上一数据包余下的长度为:" + tmpMsgSize + ",合并后长度为:" + message.readableBytes());
+            System.out.println("合并后包内容:" + hexStringToAscii(ByteBufUtil.hexDump(message)));
+        } else {
+            message = in;
+        }
+
+//        System.out.println(Thread.currentThread() + "收到了一次数据包,长度是:" + message.readableBytes());
+        int size = 0;
+        String split = "bbbbfffffARW";
+
+        while (true){
+            size = message.readableBytes();
+            if(size >= PACKET_SIZE){
+                String retType = "NG:";
+                int qcsize = 0;
+                String str = hexStringToAscii(ByteBufUtil.hexDump(message));
+                String[] lists = str.split(split);
+
+                if(lists.length == 1 && size > PACKET_MAX_SIZE){ // 大于最大包长度
+                    byte[] request = new byte[size - PACKET_MAX_SIZE];
+                    // 每次从总的消息中读取n个字节的数据
+                    message.readBytes(request);
+                    // 将拆分后的结果放入out列表中,交由后面的业务逻辑去处理
+                    out.add(retType+hexStringToAscii(ByteBufUtil.hexDump(Unpooled.copiedBuffer(request))));
+                    break;
+                }
+
+                if(lists[0].length() > 0){
+                    byte[] request = new byte[lists[0].length()];
+                    // 每次从总的消息中读取n个字节的数据
+                    message.readBytes(request);
+                    // 将拆分后的结果放入out列表中,交由后面的业务逻辑去处理
+                    out.add(retType+hexStringToAscii(ByteBufUtil.hexDump(Unpooled.copiedBuffer(request))));
+                }else{
+                    if(lists.length > 1){
+                        String ss = lists[1];
+                        if(ss.length() <= 4){
+                            qcsize += ss.length();
+                        }else{
+                            String msgType = ProtocolParam.getMsgType(split+ss);
+                            if(!MesMsgUtils.isMsgTypeOk(msgType)){
+                                qcsize += split.length() + ss.length();
+                            }else{
+                                Integer ppsize = checkResultSize(ss,msgType,split);
+                                if(ppsize > 0){
+                                    qcsize = ppsize;
+                                    retType = "OK:";
+                                }else{
+                                    qcsize += split.length() + ss.length();
+                                }
+                            }
+                        }
+                    }
+                }
+
+
+                if(qcsize > 0){
+                    byte[] request = new byte[qcsize];
+                    // 每次从总的消息中读取n个字节的数据
+                    message.readBytes(request);
+                    // 将拆分后的结果放入out列表中,交由后面的业务逻辑去处理
+                    out.add(retType+hexStringToAscii(ByteBufUtil.hexDump(Unpooled.copiedBuffer(request))));
+                }
+            }else{
+                break;
+            }
+        }
+
+        // 多余的报文存起来
+        // 第一个报文: i+  暂存
+        // 第二个报文: 1 与第一次
+        size = message.readableBytes();
+        if (size != 0) {
+            System.out.println("多余的数据长度:" + size);
+            // 剩下来的数据放到tempMsg暂存
+            tempMsg.clear();
+            tempMsg.writeBytes(message.readBytes(size));
+        }
+    }
+
+    private Integer checkResultSize(String str, String msg_type, String split){
+        String oldstr = str;
+        str = split+str;
+        int tpsize = 0;
+        switch(msg_type) {
+            case "SYNR": // 同步
+                if(str.length() >= MesMsgUtils.SYNR_LEN){
+                    tpsize = MesMsgUtils.SYNR_LEN;
+                }
+                break;
+            case "AXTW": // 心跳
+                if(str.length() >= MesMsgUtils.AXTW_LEN){
+                    tpsize = MesMsgUtils.AXTW_LEN;
+                }
+                break;
+            case "ACLW": // 重连
+                if(str.length() >= MesMsgUtils.ACLW_LEN){
+                    tpsize = MesMsgUtils.ACLW_LEN;
+                }
+                break;
+            case "MCJW":
+            case "AQDW":
+            case "MBDW":
+            case "MJBW":
+            case "MQDW":
+            case "MKSW":
+            case "MSBW":
+            case "MCSW":
+            case "AQRW":
+            default: // 默认新报文
+                if(str.length() >= ProtocolParam.fixedLength){ // 大于固定长度
+                    tpsize = ProtocolParam.fixedLength;
+                }
+                break;
+        }
+
+        return tpsize;
+    }
+
+    // 16字符串转Ascii
+    private String hexStringToAscii(String hexString) {
+        StringBuilder sbuilder = new StringBuilder();
+        for (int i = 0; i < hexString.length(); i += 2) {
+            String hexByte = hexString.substring(i, i + 2);
+            int byteValue = Integer.parseInt(hexByte, 16);
+            char c = (char) byteValue;
+            sbuilder.append(c);
+        }
+        return sbuilder.toString();
+    }
+}

+ 58 - 0
src/com/mes/ui/BindMaterialResp.java

@@ -0,0 +1,58 @@
+package com.mes.ui;
+
+public class BindMaterialResp {
+    private String materialId;
+    private String materialTitle;
+    private String craft;
+    private String batchSn;
+    private String lastTimes;
+    private String type;
+
+    public String getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(String materialId) {
+        this.materialId = materialId;
+    }
+
+    public String getMaterialTitle() {
+        return materialTitle;
+    }
+
+    public void setMaterialTitle(String materialTitle) {
+        this.materialTitle = materialTitle;
+    }
+
+    public String getCraft() {
+        return craft;
+    }
+
+    public void setCraft(String craft) {
+        this.craft = craft;
+    }
+
+    public String getBatchSn() {
+        return batchSn;
+    }
+
+    public void setBatchSn(String batchSn) {
+        this.batchSn = batchSn;
+    }
+
+    public String getLastTimes() {
+        return lastTimes;
+    }
+
+    public void setLastTimes(String lastTimes) {
+        this.lastTimes = lastTimes;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

+ 321 - 0
src/com/mes/ui/DataUtil.java

@@ -0,0 +1,321 @@
+package com.mes.ui;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.mes.netty.NettyClient;
+import com.mes.util.DateLocalUtils;
+import com.mes.util.JdbcUtils;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
+
+public class DataUtil {
+
+    public static Boolean synrTcp(NettyClient nettyClient,String mes_gw){
+        try{
+            //TCP连接后,直接先发同步报文
+            String start = "aaaabbbbbABW";
+            String msgType = "SYNR";
+            String gw = "GW"+DataUtil.rightPad(mes_gw, 6);
+            String da = "DA" + DateLocalUtils.getCurrentDate();
+            String zt = "ZT" + DateLocalUtils.getCurrentTimeHMS();
+            String synr_str = start + msgType + gw + da + zt;
+            //插入报文本地数据
+            String gy = "";
+            String sn = "";
+            JdbcUtils.insertData(gw, gy, synr_str, msgType, sn);
+
+            nettyClient.run(synr_str);
+
+            return true;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static Boolean heartBeat(NettyClient nettyClient,String mes_gw){
+        try{
+            //TCP连接后,直接先发同步报文
+            String start = "aaaabbbbbABW";
+            String msgType = "AXTW";
+            String gw = "GW"+DataUtil.rightPad(mes_gw, 6);
+            String da = "DA" + DateLocalUtils.getCurrentDate();
+            String zt = "ZT" + DateLocalUtils.getCurrentTimeHMS();
+            String axtw_str = start + msgType + gw + da + zt;
+            //插入报文本地数据
+            String gy = "";
+            String sn = "";
+            JdbcUtils.insertData(gw, gy, axtw_str, msgType, sn);
+            nettyClient.future.channel().writeAndFlush(axtw_str);
+
+            return true;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static Boolean checkQuality(NettyClient nettyClient, String sn, String user){
+        try{
+            String msgType = "AQDW";
+            String gy = "100000";
+            Boolean aqdw_str = sendMessage(nettyClient,msgType,gy,"",sn,"",user,"00","");
+            return aqdw_str;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static Boolean startWork(NettyClient nettyClient,String sn,String user){
+        try{
+            String msgType = "MKSW";
+            String gy = "";
+            Boolean aqdw_str = sendMessage(nettyClient,msgType,gy,"",sn,"",user,"00","");
+            return aqdw_str;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static Boolean bindUser(NettyClient nettyClient,String sn,String user){
+        try{
+            String msgType = "MBDW";
+            String gy = "400001";
+            String param = rightPad(user, 36);
+            Boolean aqdw_str = sendMessage(nettyClient,msgType,gy,"",sn,"",user,"01",param);
+            return aqdw_str;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static Boolean bindWarehouse(NettyClient nettyClient,String sn,String wsn,String user,String craft){
+        try{
+            String msgType = "MBDW";
+            String param = rightPad(wsn, 36);
+            Boolean aqdw_str = sendMessage(nettyClient,msgType,craft,"",sn,"",user,"01",param);
+            return aqdw_str;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static Boolean unBindWarehouse(NettyClient nettyClient,String sn,String wsn,String user,String craft){
+        try{
+            String msgType = "MJBW";
+            String param = rightPad(wsn, 36);
+            Boolean aqdw_str = sendMessage(nettyClient,msgType,craft,"",sn,"",user,"01",param);
+            return aqdw_str;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static Boolean sendQuality(NettyClient nettyClient,String sn,String ret,String user){
+        try{
+            String msgType = "MQDW";
+            String gy = "100000";
+            String param = "";
+            Boolean aqdw_str = sendMessage(nettyClient,msgType,gy,"",sn,ret,user,"00",param);
+            return aqdw_str;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static Boolean sendMessage(NettyClient nettyClient,String msgType,String craft,String lx,String sn,String result,String user,String paramNums,String params){
+        try{
+            String enconding = "UTF-8";
+            InputStream is = ClassLoader.getSystemResourceAsStream("config/config.properties");
+            Properties pro = new Properties();
+            BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
+            pro.load(br);
+            String gw = "GW"+rightPad(MesClient.mes_gw, 6);
+            String start = "aaaabbbbbABW";
+            String gy = "GY" + rightPad(craft, 6);
+            String reslx = "LX" + rightPad(lx, 2);
+            String id = pro.getProperty("mes.line_sn") + rightPad(sn, 36);
+            String rs = "RS"+ rightPad(result, 2);
+            String da = "DA" + DateLocalUtils.getCurrentDate();
+            String zt = "ZT" + DateLocalUtils.getCurrentTimeHMS();
+            String yh = "YH" + rightPad(user, 20);
+            String aqdw_str = start + msgType + gw + gy + reslx + id + rs + da + zt + yh + paramNums + params;
+            System.out.println("message="+aqdw_str);
+            JdbcUtils.insertData(gw, gy, aqdw_str, msgType, sn);
+            nettyClient.future.channel().writeAndFlush(aqdw_str);
+            return true;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
+    public static String rightPad(final String str, final int size) {
+        if (str == null) {
+            return null;
+        }
+
+        String strret = str;
+        if(str.length() > size){
+            strret = str.substring(0,size);
+        }
+        return String.format("%-"+size+"s", strret);
+    }
+
+    public static JSONObject getBindMaterail() {
+        try{
+            String enconding = "UTF-8";
+            InputStream is = ClassLoader.getSystemResourceAsStream("config/config.properties");
+            Properties pro = new Properties();
+            BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
+            pro.load(br);
+            String mes_server_ip = pro.getProperty("mes.server_ip");
+            String oprno = pro.getProperty("mes.gw").trim();
+            String lineSn = pro.getProperty("mes.line_sn").trim();
+            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesLineProcessMaterial/materials";
+            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn;
+            System.out.println("params="+params);
+            String result = doPost(url,params);
+            System.out.println("result="+result);
+
+            if(result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    public static JSONObject saveBindMaterail(String batchSn,String craft,String materialId,String type) {
+        try{
+            String enconding = "UTF-8";
+            InputStream is = ClassLoader.getSystemResourceAsStream("config/config.properties");
+            Properties pro = new Properties();
+            BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
+            pro.load(br);
+            String mes_server_ip = pro.getProperty("mes.server_ip");
+            String oprno = pro.getProperty("mes.gw").trim();
+            String lineSn = pro.getProperty("mes.line_sn").trim();
+            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesMaterialPrebind/bind";
+            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&batchSn="+batchSn+"&craft="+craft+"&materialId="+materialId+"&type="+type;
+            System.out.println("params="+params);
+            String result = doPost(url,params);
+            System.out.println("result="+result);
+
+            if(result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    public static JSONObject upParams(String upparams) {
+        try{
+            String mes_server_ip = MesClient.mes_server_ip;
+            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProductProd/batchsave";
+            String params = "__ajax=json&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn+"&params="+upparams;
+            System.out.println("params="+params);
+            String result = doPost(url,params);
+            System.out.println("result="+result);
+
+            if(result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    public static String doPost(String httpUrl, String param) {
+        HttpURLConnection connection = null;
+        InputStream is = null;
+        OutputStream os = null;
+        BufferedReader br = null;
+        String result = null;
+        try {
+            URL url = new URL(httpUrl);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setConnectTimeout(15000);
+            connection.setReadTimeout(60000);
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            connection.setRequestProperty("Authorization", "Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0");
+            os = connection.getOutputStream();
+            os.write(param.getBytes());
+            if (connection.getResponseCode() == 200) {
+                is = connection.getInputStream();
+                br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+                StringBuffer sbf = new StringBuffer();
+                String temp = null;
+                while ((temp = br.readLine()) != null) {
+                    sbf.append(temp);
+                    sbf.append("\r\n");
+                }
+                result = sbf.toString();
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (null != br) {
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != os) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != is) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            connection.disconnect();
+        }
+        return result;
+    }
+
+    public static JSONObject upAlarm(String sn,String ucode) {
+        try{
+            String enconding = "UTF-8";
+            InputStream is = ClassLoader.getSystemResourceAsStream("config/config.properties");
+            Properties pro = new Properties();
+            BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
+            pro.load(br);
+            String mes_server_ip = pro.getProperty("mes.server_ip");
+            String oprno = pro.getProperty("mes.gw").trim();
+            String lineSn = pro.getProperty("mes.line_sn").trim();
+            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProcessAlarm/add";
+            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&sn="+sn+"&ucode="+ucode;
+            System.out.println("params="+params);
+            String result = doPost(url,params);
+            System.out.println("result="+result);
+
+            if(result.equalsIgnoreCase("false")) {
+                return null;
+            }else {
+                return JSONObject.parseObject(result);
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
+}

+ 53 - 0
src/com/mes/ui/ErrorMsg.java

@@ -0,0 +1,53 @@
+package com.mes.ui;
+
+import com.mes.netty.MesMsgUtils;
+import com.mes.netty.ProtocolParam;
+
+public class ErrorMsg {
+    public static void setErrorMsg(String mes_msg){
+        try{
+            String msg_type = ProtocolParam.getMsgType(mes_msg);
+            String processMsgRet = MesMsgUtils.processMsg(mes_msg, msg_type);
+            String lmsg = "该工件本工位不可加工";
+            if(processMsgRet.equalsIgnoreCase("OK")||processMsgRet.equalsIgnoreCase("NG")) {
+                lmsg = "该工件本工位已加工,结果:"+processMsgRet;
+            }else if(processMsgRet.equalsIgnoreCase("NE")) {
+                lmsg = "该工件未录入系统";
+            }else if(processMsgRet.equalsIgnoreCase("NN")) {
+                lmsg = "该工件跳过该工位";
+            }else if(processMsgRet.equalsIgnoreCase("QN")) {
+                lmsg = "该工件OP"+ ProtocolParam.getLx(mes_msg)+"0加工NG";
+            }else if(processMsgRet.equalsIgnoreCase("QD")) {
+                lmsg = "该工件OP"+ ProtocolParam.getLx(mes_msg)+"0未加工";
+            }else if(processMsgRet.equalsIgnoreCase("NF")) {
+                lmsg = "该工件已合格下线";
+            }else if(processMsgRet.equalsIgnoreCase("NR")) {
+                lmsg = "该工件离线返修中";
+            }else if(processMsgRet.equalsIgnoreCase("NB")) {
+                lmsg = "该工件已报废";
+            }else if(processMsgRet.equalsIgnoreCase("ND")) {
+                lmsg = "该工件NG待处理";
+            }else if(processMsgRet.equalsIgnoreCase("FN")) {
+                lmsg = "首件检查工件不合格停机";
+            }else if(processMsgRet.equalsIgnoreCase("GN")) {
+                lmsg = "更换配件首件检查不合格停机";
+            }else if(processMsgRet.equalsIgnoreCase("DJ")) {
+                lmsg = "未进行开班点检";
+            }else if(processMsgRet.equalsIgnoreCase("BM")) {
+                lmsg = "未绑定物料";
+            }else if(processMsgRet.equalsIgnoreCase("PL")) {
+                lmsg = "配件寿命不足";
+            }else if(processMsgRet.equalsIgnoreCase("QM")) {
+                lmsg = "两次气密必须间隔15分钟";
+            }else if(processMsgRet.equalsIgnoreCase("GS")) {
+                lmsg = "工件码格式不正确";
+            }else if(processMsgRet.equalsIgnoreCase("CF")) {
+                lmsg = "工件码重复";
+            }
+
+            MesClient.setMenuStatus(lmsg,-1);
+        }catch (Exception e){
+            MesClient.setMenuStatus("未知错误",-1);
+        }
+    }
+}

+ 85 - 0
src/com/mes/ui/LockUtil.java

@@ -0,0 +1,85 @@
+package com.mes.ui;
+
+import java.io.File;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.OverlappingFileLockException;
+
+public class LockUtil {
+    private FileChannel channel;
+
+    private FileLock lock;
+
+    private File file;
+
+    private static LockUtil instance = null;
+
+    /**
+     * 获取唯一进程限制的实例
+     * @Title: getInstance
+     * @return  唯一进程实例
+     */
+    public static LockUtil getInstance(){
+        if(instance == null){
+            instance = new LockUtil();
+        }
+        return instance;
+    }
+
+    /**
+     * 进程是否正在运行
+     * @Title: isAppActive
+     * @return  运行与否
+     */
+    public boolean isAppActive() {
+        File file = new File(".lock");
+        try {
+            channel = new RandomAccessFile(file, "rw").getChannel();
+            try {
+                lock = channel.tryLock();
+
+            } catch (OverlappingFileLockException e) {
+                closeLock();
+                return true;
+            }
+            if (lock == null) {
+                closeLock();
+                return true;
+            }
+            Runtime.getRuntime().addShutdownHook(new Thread() {
+                public void run() {
+                    closeLock();
+                    deleteFile();
+                }
+            });
+            return false;
+        } catch (Exception e) {
+            closeLock();
+            return true;
+        }
+    }
+
+    protected void deleteFile() {
+        try {
+            file.delete();
+        } catch (Exception e) {
+
+        }
+
+    }
+
+    private void closeLock() {
+        try {
+            lock.release();
+        } catch (Exception e) {
+
+        }
+
+        try {
+            channel.close();
+        } catch (Exception e) {
+
+        }
+    }
+}

+ 206 - 0
src/com/mes/ui/LoginFarme.java

@@ -0,0 +1,206 @@
+package com.mes.ui;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.mes.component.MesRadio;
+import com.mes.component.MesWebView;
+import com.mes.util.Base64Utils;
+import com.mes.util.HttpUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class LoginFarme extends JFrame {
+    //登录模块组件
+    static JLabel userNameLabel= new JLabel("<html><body>用户名:</body></html>",JLabel.LEFT);//用户名
+    static JLabel userPasswordLabel= new JLabel("<html><body>密码:</body></html>",JLabel.LEFT);//用户名
+    public static JTextField userNameTxt;
+    public static JPasswordField userPasswordTxt;
+    static JButton loginButton = new JButton("用户密码登录");
+    static JButton scanLoginButton = new JButton("扫  码  登  录");
+
+    public LoginFarme(){
+        setTitle("MES系统客户端:"+MesClient.mes_gw+" - "+MesClient.mes_gw_des);
+
+        ImageIcon bg = new ImageIcon(MesClient.class.getResource("/background.png"));
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        JLabel imgLabel = new JLabel(bg);//将背景图放在标签里。
+        getLayeredPane().add(imgLabel, new Integer(Integer.MIN_VALUE));//注意这里是关键,将背景标签添加到jfram的LayeredPane面板里。
+        imgLabel.setBounds(0,0,bg.getIconWidth(), bg.getIconHeight());//设置背景标签的位置
+        Container contentPane=getContentPane();
+        contentPane.setLayout(null);//布局,很重要
+        JPanel welcomePanel = new JPanel();
+        //welcomePanel.setLayout(new GridLayout(3, 1));
+        welcomePanel.setLayout(null);
+        //welcomeLable.setBounds(10, 5, 700, 100);
+        welcomePanel.setBounds(30, 330, 890, 300);
+        welcomePanel.setOpaque(false);//背景透明
+        contentPane.add(welcomePanel);
+
+        //登录页面
+        userNameLabel.setBounds(300, 100, 120, 40);
+        userNameLabel.setFont(new java.awt.Font("Dialog",   1,   16));
+        userPasswordLabel.setBounds(300, 150, 120, 40);
+        userPasswordLabel.setFont(new java.awt.Font("Dialog",   1,   16));
+        userNameTxt = new JTextField(20);
+        userNameTxt.setText("system");
+        userNameTxt.setBounds(400, 105, 150, 30);
+        userPasswordTxt = new JPasswordField(20);
+        userPasswordTxt.setBounds(400, 155, 150, 30);
+        userPasswordTxt.setText("Aa111111");
+        loginButton.setFont(new java.awt.Font("Dialog",   1,   16));
+        loginButton.setBounds(300, 200, 255, 40);
+        loginButton.setIcon(new ImageIcon(MesClient.class.getResource("/bg/user.png")));
+
+//        scanLoginButton.setVisible(false);
+        scanLoginButton.setFont(new java.awt.Font("Dialog",   1,   16));
+        scanLoginButton.setBounds(300, 250, 255, 40);
+        scanLoginButton.setIcon(new ImageIcon(MesClient.class.getResource("/bg/scan_barcode.png")));
+
+        welcomePanel.add(userNameLabel);
+        welcomePanel.add(userPasswordLabel);
+        welcomePanel.add(userNameTxt);
+        welcomePanel.add(userPasswordTxt);
+        welcomePanel.add(loginButton);
+        welcomePanel.add(scanLoginButton);
+        loginButton.addActionListener(new ActionListener(){
+            public void actionPerformed(ActionEvent e) {
+                login();
+            }
+        });
+        scanLoginButton.addActionListener(new ActionListener(){
+            public void actionPerformed(ActionEvent e) {
+                scanLogin();
+            }
+        });
+
+        ((JPanel)contentPane).setOpaque(false); //注意这里,将内容面板设为透明。这样LayeredPane面板中的背景才能显示出来。
+        //welcomeWin.setSize(902,678);
+        setResizable(false);//禁止最大化
+        setIconImage(Toolkit.getDefaultToolkit().getImage(MesClient.class.getResource("/bg/logo.png")));
+
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        int width = 902;
+        int height = 678;
+        setBounds((d.width-width)/2, (d.height-height)/2-(d.height-height)/4, width, height);
+        /*****正常模式******/
+        setVisible(true);
+    }
+
+    //登录
+    public static void login() {
+        String user_str = userNameTxt.getText().toString();
+        String password_str = userPasswordTxt.getText().toString();
+        if(user_str.equalsIgnoreCase("")||password_str.equalsIgnoreCase("")) {
+            JOptionPane.showMessageDialog(MesClient.mesClientFrame,"用户名或密码不能为空","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+            return;
+        }
+        String username = Base64Utils.getBase64(user_str);
+        String password = Base64Utils.getBase64(password_str);
+        System.out.println("&username=" + username + "&password=" + password);
+        String url = "http://"+MesClient.mes_server_ip+":8980/js/a/login?__ajax=json&username="+username+"&password="+password+"&validCode=&__sid=";
+        String loginResult = HttpUtils.sendRequest(url);
+        if(loginResult.equalsIgnoreCase("false")) {
+            JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录异常,请检查网络或联系网络管理员","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+            return;
+        }else {
+            JSONObject retObj = JSONObject.parseObject(loginResult);
+            if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                //检查用户权限是否可登录界面
+                checkUserAuthority(retObj);
+            }else {
+                //ret = "msg save error";
+                //ret = false;
+                JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录失败,用户名或密码错误","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                return;
+            }
+        }
+    }
+    //扫码登录
+    public static void scanLogin() {
+        //userNameTxt.setText("");
+        //userPasswordTxt.setText("");
+        String scanContent = JOptionPane.showInputDialog(null, "请扫码工牌二维码");
+        System.out.println("scanContent="+scanContent);
+        if(scanContent!=null&&!scanContent.equalsIgnoreCase("")) {
+            String url = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesLogin/login?__login=true&__ajax=json&username="+scanContent;
+            String loginResult = HttpUtils.sendRequest(url);
+            System.out.println("loginResult="+loginResult);
+            if(loginResult.equalsIgnoreCase("false")) {
+                JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录异常,请检查网络或联系网络管理员","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                return;
+            }else {
+                JSONObject retObj = JSONObject.parseObject(loginResult);
+                if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                    //检查用户权限是否可登录界面
+                    checkUserAuthority(retObj);
+                }else {
+                    JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录失败,用户名或密码错误","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                    return;
+                }
+            }
+        }else {
+            JOptionPane.showMessageDialog(MesClient.mesClientFrame,"扫码内容错误","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+            return;
+        }
+    }
+
+    //检查用户权限是否可登录界面
+    public static void checkUserAuthority(JSONObject retObj) {
+        //设置登录用户名
+        JSONObject userObj = JSONObject.parseObject(retObj.get("user").toString());
+        String user_id = userObj.getString("id").toString();
+
+        //获取sessionid,判断权限
+        MesClient.sessionid = retObj.get("sessionid").toString();
+        if(MesClient.sessionid!=null&&!MesClient.sessionid.equalsIgnoreCase("")) {
+            //请求权限
+            String url_authority = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesLineProcess/userAuth?__ajax=json&type=0&__sid="+MesClient.sessionid+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
+            String authorityResult = HttpUtils.sendRequest(url_authority);
+            System.out.println("authorityResult="+authorityResult);
+            JSONObject authorityObj = JSONObject.parseObject(authorityResult);
+            if(authorityObj.get("result")!=null&&authorityObj.get("result").toString().equalsIgnoreCase("true")) {
+                JSONObject authObjTmp = JSONObject.parseObject(authorityObj.get("data").toString());
+                MesClient.mes_auth = Integer.parseInt(authObjTmp.getString("auth").toString());
+                if(MesClient.mes_auth==0) {
+                    //无权限登录
+                    JOptionPane.showMessageDialog(MesClient.mesClientFrame,"您无权登录该工位","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                    return;
+                }else if(MesClient.mes_auth==1||MesClient.mes_auth==2) {
+                    //初始化tcp连接,发送同步报文
+                    MesClient.initTcpConnection();
+                    //启动timer心跳包
+                    MesClient.startHeartBeatTimer();
+
+                    //1操作工人,2管理员
+                    //登录成功
+                    MesClient.user_menu.setText(user_id);
+                    MesClient.welcomeWin.setVisible(false);
+                    MesClient.mesClientFrame.setVisible(true);
+
+                    if(MesClient.jfxPanel == null){
+                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProductRecord/work?__sid="+MesClient.sessionid+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
+                        MesClient.jfxPanel = new MesWebView(url);
+                        MesClient.jfxPanel.setSize(990, 550);
+                        MesClient.indexPanelB.add(MesClient.jfxPanel);
+                    }
+
+                    if(MesClient.jfxPanel2 == null){
+                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProcessCheckRecord/ulist?__sid="+MesClient.sessionid+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
+                        MesClient.jfxPanel2 = new MesWebView(url);
+                        MesClient.jfxPanel2.setSize(990, 550);
+                        MesClient.indexPanelC.add(MesClient.jfxPanel2);
+                    }
+
+                    MesClient.initWarehouseData();
+                }
+
+            }
+
+        }else {
+            JOptionPane.showMessageDialog(MesClient.mesClientFrame,"登录失败,用户名或密码错误","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+            return;
+        }
+    }
+}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1385 - 0
src/com/mes/ui/MesClient.java


+ 142 - 0
src/com/mes/ui/MesRevice.java

@@ -0,0 +1,142 @@
+package com.mes.ui;

+

+import com.mes.netty.ProtocolParam;

+

+import java.awt.*;

+

+public class MesRevice {

+

+    private static boolean isColdPlateCraft(String craft) {

+        return "400006".equals(craft != null ? craft.trim() : "");

+    }

+

+    private static boolean isUnbindSuccess(String processMsgRet) {

+        if (processMsgRet == null) {

+            return false;

+        }

+        String ret = processMsgRet.trim();

+        return ret.equalsIgnoreCase("OK")

+                || ret.equalsIgnoreCase("UD")

+                || ret.equalsIgnoreCase("UF")

+                || ret.equalsIgnoreCase("UDF");

+    }

+

+    // 质量查询

+    public static void checkQualityRevice(String processMsgRet, String mes_msg) {

+        try {

+            String sn = ProtocolParam.getSn(mes_msg).trim();

+            MesClient.checkSnType(sn);

+

+            if (processMsgRet.equalsIgnoreCase("UD")) {

+                MesClient.status_menu.setForeground(Color.GREEN);

+                MesClient.check_quality_result = true;

+                MesClient.setMenuStatus("该工件可以加工", 0);

+

+                if (MesClient.work_status == 0) {

+                    String barcode36 = MesClient.getBarcode(MesClient.product_sn.getText());

+                    MesClient.getUser();

+                    DataUtil.startWork(MesClient.nettyClient, barcode36, MesClient.user20);

+                }

+            } else {

+                MesClient.check_quality_result = false;

+                ErrorMsg.setErrorMsg(mes_msg);

+            }

+

+            if (MesClient.check_quality_result) {

+                if (MesClient.work_status == 0) {

+                    MesClient.finish_ok_bt.setEnabled(false);

+                    MesClient.finish_ng_bt.setEnabled(false);

+                } else {

+                    MesClient.finish_ok_bt.setEnabled(true);

+                    MesClient.finish_ng_bt.setEnabled(true);

+                }

+            } else {

+                MesClient.finish_ok_bt.setEnabled(false);

+                MesClient.finish_ng_bt.setEnabled(false);

+            }

+        } catch (Exception e) {

+            e.printStackTrace();

+        }

+    }

+

+    // 开始回复处理

+    public static void startRevice(String processMsgRet, String mes_msg) {

+        try {

+            if (processMsgRet.equalsIgnoreCase("OK")) {

+                MesClient.work_status = 1;

+                MesClient.f_scan_data_bt_1.setEnabled(false);

+                MesClient.tjStatus = 0;

+                MesClient.work_status_jqb = 2;

+

+                MesClient.f_scan_data_bt_2.setEnabled(true);

+                MesClient.setMenuStatus("请扫描冷板码", 0);

+            }

+        } catch (Exception e) {

+            e.printStackTrace();

+        }

+    }

+

+    // 绑定

+    public static void bindRevice(String processMsgRet, String mes_msg) {

+        try {

+            String craft = ProtocolParam.getCraft(mes_msg);

+            if (processMsgRet.equalsIgnoreCase("OK")) {

+                if (isColdPlateCraft(craft)) {

+                    MesClient.setMenuStatus("绑定成功!", 0);

+                    MesClient.btnUnbindLb.setEnabled(true);

+                    MesClient.bindLbStatus = true;

+                    MesClient.f_scan_data_bt_2.setEnabled(false);

+

+                    MesClient.sortA = 0;

+                    MesClient.aFinish = 0;

+                    MesClient.param2.setText("0");

+                    MesClient.work_status_jqb = 3;

+                }

+            } else if (isColdPlateCraft(craft) && processMsgRet.equalsIgnoreCase("PZ")) {

+                MesClient.setMenuStatus("请先上传密封圈照片,再绑定冷板!", -1);

+            }

+        } catch (Exception e) {

+            e.printStackTrace();

+        }

+    }

+

+    // 解绑

+    public static void unbindRevice(String processMsgRet, String mes_msg) {

+        try {

+            String craft = ProtocolParam.getCraft(mes_msg);

+            if (isUnbindSuccess(processMsgRet) && isColdPlateCraft(craft)) {

+                MesClient.setMenuStatus("解绑成功!", 0);

+                MesClient.clearLbBindUi();

+                MesClient.sortA = 0;

+                MesClient.aFinish = 0;

+                MesClient.param2.setText("0");

+            } else if (isColdPlateCraft(craft)) {

+                MesClient.setMenuStatus("解绑失败!", -1);

+            }

+        } catch (Exception e) {

+            e.printStackTrace();

+        }

+    }

+

+    // 上传质量

+    public static void updateResultRevice(String processMsgRet, String mes_msg) {

+        try {

+            if (processMsgRet.equalsIgnoreCase("OK")) {

+                try {

+                    MesClient.s7PLC.writeBoolean("DB32.0.7", true);

+                } catch (Exception e) {

+                    e.printStackTrace();

+                }

+                MesClient.resetScanA();

+                MesClient.setMenuStatus("结果提交成功,请扫下一件", 0);

+            } else {

+                MesClient.tjStatus = 1;

+                MesClient.finish_ok_bt.setEnabled(true);

+                MesClient.finish_ng_bt.setEnabled(true);

+                MesClient.setMenuStatus("结果提交失败,请重试", -1);

+            }

+        } catch (Exception e) {

+            e.printStackTrace();

+        }

+    }

+}


+ 217 - 0
src/com/mes/ui/ModbusUtil.java

@@ -0,0 +1,217 @@
+package com.mes.ui;
+
+import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
+import com.mes.util.JdbcUtils;
+
+import java.nio.charset.Charset;
+
+public class ModbusUtil {
+
+    public static void getDataA(ModbusTcp plc){
+
+        // 说明
+        //预设数量有变化不能修改
+        // 打钉数应按实际监听数算
+
+        // 41065=F-out  41066=S-out
+        // 41069=F-min  41071=S-min 41070=F-max  41072=S-max
+        // 预设数量=41129  完成数=41137
+
+        Short cur = plc.readInt16(1136);
+//        System.out.println("F-out:"+plc.readInt16(1064));
+//        System.out.println("S-out:"+plc.readInt16(1065));
+//        System.out.println("F-min:"+plc.readInt16(1068));
+//        System.out.println("S-min:"+plc.readInt16(1070));
+//        System.out.println("F-max:"+plc.readInt16(1069));
+//        System.out.println("S-max:"+plc.readInt16(1071));
+//        System.out.println("预设数量:"+plc.readInt16(1128));
+        //System.out.println("当前数量:"+cur);
+        if(MesClient.aMax <= 0){
+            MesClient.aMax = plc.readInt16(1128); // 任务数量
+            MesClient.param1.setText(String.valueOf(MesClient.aMax));
+        }
+
+        if(MesClient.sortA == cur - 1){
+            MesClient.sortA = cur;
+            MesClient.aFinish = plc.readInt16(1138);
+            String fout = plc.readInt16(1064)+"";
+            String sout = (float)plc.readInt16(1065)/1000+"";
+
+            String fmin = plc.readInt16(1068)+"";
+            String smin = (float)plc.readInt16(1070)/1000+"";
+
+            String fmax = plc.readInt16(1069)+"";
+            String smax = (float)plc.readInt16(1071)/1000+"";
+
+            MesClient.param2.setText(cur+"");
+            System.out.println("cur:"+cur);
+            if(!MesClient.product_sn.getText().isEmpty()){
+                JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",fout,sout,fmin,smin,fmax,smax,"1",cur+"", MesClient.user_menu.getText());
+            }
+        }
+
+        upResult();
+    }
+
+    // B枪已停用
+    public static void getDataB(ModbusTcp plc){
+//        Short cur = plc.readInt16(1136);
+//        if(MesClient.bMax <= 0){
+//            MesClient.bMax = plc.readInt16(1128);
+//            MesClient.param3.setText(String.valueOf(MesClient.bMax));
+//        }
+//        if(MesClient.sortB == cur - 1){
+//            MesClient.sortB = cur;
+//            String fout = plc.readInt16(1064)+"";
+//            String sout = (float)plc.readInt16(1065)/1000+"";
+//            String fmin = plc.readInt16(1068)+"";
+//            String smin = (float)plc.readInt16(1070)/1000+"";
+//            String fmax = plc.readInt16(1069)+"";
+//            String smax = (float)plc.readInt16(1071)/1000+"";
+//            MesClient.param4.setText(cur+"");
+//            if(!MesClient.product_sn.getText().isEmpty()){
+//               JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"B",fout,sout,fmin,smin,fmax,smax,"1",cur+"", MesClient.user_menu.getText());
+//            }
+//        }
+//        upResult();
+    }
+
+    // 上传总结果
+    public static void upResult(){
+        // 冷板绑定后且 A 枪完成才可提交
+        if(MesClient.bindLbStatus && !MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA){
+//        if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA && MesClient.bMax > 0 && MesClient.bMax == MesClient.sortB){
+            MesClient.finish_ok_bt.setEnabled(true);
+            MesClient.finish_ng_bt.setEnabled(true);
+
+            if(MesClient.tjStatus == 0 && MesClient.check_quality_result){
+                MesClient.tjStatus = 1;
+                MesClient.getUser();
+                String retf = "OK";
+                if(MesClient.aFinish != MesClient.aMax){
+                    retf = "NG";
+                }
+                Boolean ret = DataUtil.sendQuality(MesClient.nettyClient, MesClient.product_sn.getText(),retf, MesClient.user20);
+                if(!ret){
+                    MesClient.setMenuStatus(MesClient.tjFlagTextErr,-1);
+                }
+            }
+
+        }
+    }
+
+    // 获取控制模式
+    public static short getControlModel(ModbusTcp plc){
+        short control = 0;
+        try{
+            control = plc.readInt16(1090);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        return control;
+    }
+
+    // 获取二维码
+    public static String getSn(ModbusTcp plc){
+        String sn = "";
+        try{
+            sn = plc.readString(1216,40, Charset.forName("UTF8"));
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        return splitIntoChunks(sn,2);
+    }
+
+    // 每两个字符分割,并反转
+    private static String splitIntoChunks(String str, int chunkSize) {
+        if (str == null || str.isEmpty() || chunkSize <= 0) {
+            return "";
+        }
+
+        int length = str.length();
+        int arraySize = (length + chunkSize - 1) / chunkSize;
+        String[] result = new String[arraySize];
+
+        for (int i = 0, j = 0; i < length; i += chunkSize, j++) {
+            int endIndex = Math.min(i + chunkSize, length);
+            String sttr = str.substring(i, endIndex);
+            StringBuilder sb = new StringBuilder(sttr);
+            String reversedStr = sb.reverse().toString(); // 字符串反转
+            result[j] = reversedStr;
+        }
+
+        return String.join("",result);
+    }
+
+    // 远程开机
+    public static Boolean setPowerOn(ModbusTcp plc){
+        Boolean ret = false;
+        try{
+            plc.writeCoil(3128,true);
+//            plc.writeCoil(3079,false);
+//            plc.writeCoil(3328,true); // 必须选关掉关机,开机才起左右
+            ret = true;
+        }catch (Exception e){
+            e.printStackTrace();
+            ret = false;
+        }
+
+        return ret;
+    }
+
+    // 远程关机
+    public static Boolean setPowerOff(ModbusTcp plc){
+        Boolean ret = false;
+        try{
+            plc.writeCoil(3128,false);
+//            plc.writeCoil(3328,false);
+//            plc.writeCoil(3079,true); // 关机
+            // 必须选关掉关机,开机才起左右
+            ret = true;
+        }catch (Exception e){
+            e.printStackTrace();
+            ret = false;
+        }
+
+        return ret;
+    }
+
+    // 重置任务
+    public static void setTask(ModbusTcp plc,Short setNum){
+        try{
+            // 设置模式 1=标记铆接模式
+            plc.writeInt16(1092,(short) 1);
+            // 设置任务
+            plc.writeInt16(1128,setNum);
+            plc.writeInt16(1136,(short) 0);
+            plc.writeInt16(1138,(short) 0);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
+//        A枪说明 192.168.1.7
+//        plc.writeCoil(3079,false);
+//        plc.writeCoil(3328,true); // 必须选关掉关机,开机才起左右
+////        plc.writeCoil(3128,false);
+//        System.out.println("控制模式:"+plc.readInt16(1090)); // 1091 控制模式
+//        System.out.println("系统运行中:"+plc.readCoil(3128,1)); // 3129 系统运行中
+//        System.out.println("结束暂停:"+plc.readCoil(3132,1)); // 3133 系统运行中
+//        System.out.println("远程开机:"+plc.readCoil(3328,1)); // 3329 远程开机
+//        System.out.println("远程关机:"+plc.readCoil(3079,1)); // 3080 远程关机
+//        System.out.println("作业模式:"+plc.readInt16(1092)); // 1093 作业模式
+//        System.out.println("最大拉力:"+plc.readInt16(1064)); // 1065 最大拉力
+//        System.out.println("对应位移:"+plc.readInt16(1065)); // 1066 对应位移
+//        System.out.println("任务数量:"+plc.readInt16(1128)); // 1129 任务数量
+//        System.out.println("合格数量:"+plc.readInt16(1138)); // 1139 合格数量
+//        System.out.println("质量状态:"+plc.readInt16(1072)); // 1073 质量状态
+//        System.out.println("F-out:"+plc.readInt16(1064));
+//        System.out.println("S-out:"+plc.readInt16(1065));
+//        System.out.println("F-min:"+plc.readInt16(1068));
+//        System.out.println("S-min:"+plc.readInt16(1070));
+//        System.out.println("F-max:"+plc.readInt16(1069));
+//        System.out.println("S-max:"+plc.readInt16(1071));
+}

+ 53 - 0
src/com/mes/ui/OprnoUtil.java

@@ -0,0 +1,53 @@
+package com.mes.ui;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class OprnoUtil {
+    public static String[] xtoprnos = new String[]{
+            "OP162"
+    };
+    public static String[] xtoprnodes = new String[]{
+            "框架总成7-装配"
+    };
+    public static String[] lboprnos = new String[]{};
+    public static String[] lboprnodes = new String[]{};
+    public static String getGwDes(String lineSn,String oprno){
+        String des = "";
+        oprno = formatOprno(oprno);
+        if(lineSn.equals("XT")){
+            int i = 0;
+            for (String gw:xtoprnos){
+                if(gw.equals(oprno)){
+                    des = xtoprnodes[i];
+                    break;
+                }
+                i++;
+            }
+        }else if(lineSn.equals("LB")){
+            int i = 0;
+            for (String gw:lboprnos){
+                if(gw.equals(oprno)){
+                    des = lboprnodes[i];
+                    break;
+                }
+                i++;
+            }
+        }
+        return des;
+    }
+
+    public static String formatOprno(String oprno){
+        List<String> lists = new ArrayList<>();
+
+        if(oprno.length() == 6){
+            String ysoprno = oprno.substring(0,5).trim();
+            if(!lists.contains(ysoprno)){
+                oprno = ysoprno;
+            }
+        }
+
+        return  oprno;
+    }
+}

+ 447 - 0
src/com/mes/ui/PlcUtil.java

@@ -0,0 +1,447 @@
+package com.mes.ui;
+
+import com.ghgande.j2mod.modbus.io.ModbusTCPTransaction;
+import com.ghgande.j2mod.modbus.msg.ReadMultipleRegistersRequest;
+import com.ghgande.j2mod.modbus.msg.ReadMultipleRegistersResponse;
+import com.ghgande.j2mod.modbus.net.TCPMasterConnection;
+import com.ghgande.j2mod.modbus.procimg.Register;
+import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
+import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
+import com.mes.util.HcPlcPointUtilA;
+//import com.mes.util.HcPlcPointUtilB; // B枪已停用
+import com.mes.util.JdbcUtils;
+
+import java.nio.charset.Charset;
+import java.text.DecimalFormat;
+
+public class PlcUtil {
+
+    public static void getDataA(TCPMasterConnection connection){
+        if (!MesClient.bindLbStatus) {
+            return;
+        }
+        try {
+            // 1. 构造读取请求(功能码 03,从 D100 开始读 120 个寄存器,覆盖 D100~D219)
+            ReadMultipleRegistersRequest request = new ReadMultipleRegistersRequest(100, 120);
+            request.setUnitID(1);
+
+            // 2. 发送请求并获取响应
+            ModbusTCPTransaction transaction = new ModbusTCPTransaction(connection);
+            transaction.setRequest(request);
+            transaction.execute();
+            ReadMultipleRegistersResponse response = (ReadMultipleRegistersResponse) transaction.getResponse();
+
+            // 3. 提取数据并映射到 dRegs 数组
+            Register[] registers = response.getRegisters();
+            short[] dRegs = new short[300];
+            for (int i = 0; i < registers.length; i++) {
+                dRegs[100 + i] = registers[i].toShort();
+            }
+
+            // 4. 解析数据
+            HcPlcPointUtilA.PlcMesData mesData = HcPlcPointUtilA.readAllPoint(dRegs);
+
+            MesClient.maxa = mesData.setQty;
+            MesClient.param1.setText(String.valueOf(mesData.setQty));
+            String name = mesData.modelName;
+            MesClient.lblA.setText("拉铆枪A("+name+")");
+
+            if (MesClient.maxa <= 0){
+                MesClient.maxa = mesData.setQty;
+                MesClient.param1.setText(String.valueOf(mesData.setQty));
+            }
+
+            MesClient.param2.setText(String.valueOf(MesClient.sortA));
+            int currentOk = mesData.okQty;
+            if (currentOk == MesClient.sortA + 1){
+                // 更新计数
+                MesClient.sortA = currentOk;
+                MesClient.aFinish = currentOk;
+                MesClient.param2.setText(String.valueOf(currentOk));
+
+                // 采集实时结果(对应旧逻辑的 F-out, S-out, F-min/max, S-min/max)
+                String fout = String.valueOf(mesData.tensionResult);   // 拉力
+                String sout = String.valueOf(mesData.dispResult);      // 位移
+                String fmin = String.valueOf(mesData.tensionMin);
+                String smin = String.valueOf(mesData.dispMin);
+                String fmax = String.valueOf(mesData.tensionMax);
+                String smax = String.valueOf(mesData.dispMax);
+                name = mesData.modelName;
+                MesClient.lblA.setText("拉铆枪A("+name+")");
+
+                System.out.println("cur:" + currentOk);
+                // 只有条码存在时才写入数据库
+                if (!MesClient.product_sn.getText().isEmpty()) {
+                    JdbcUtils.insertProdData(
+                            MesClient.mes_gw,
+                            MesClient.mes_line_sn,
+                            MesClient.product_sn.getText(),
+                            "A",
+                            fout, sout, fmin, smin, fmax, smax,
+                            "OK".equals(mesData.procDesc)?"1":"2",                               // 质量结果 OK
+                            String.valueOf(currentOk),
+                            MesClient.user_menu.getText()
+                    );
+                }
+            }
+
+            // 6. 更新产品条码
+            if (mesData.barcode != null && !mesData.barcode.isEmpty()) {
+                MesClient.product_sn.setText(mesData.barcode);
+            }
+
+            // 7. 上传结果(旧逻辑中有 upResult())
+            upResult();
+
+
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+//        int cur = plc.readInt32("DB41.32.0");
+////        int cur = 3;
+////        if(MesClient.aMax <= 0){
+////            MesClient.aMax = plc.readInt32("DB1.38.0");
+//            MesClient.param1.setText(String.valueOf(MesClient.aMax));
+////        }
+//
+//        if(MesClient.sortA < cur){
+//            MesClient.sortA = cur;
+//            if (cur == 9){
+//                plc.writeUInt16("DB40.2",2);
+//            }
+//            int fout = plc.readInt32("DB41.24.0");
+//            Float sout = plc.readFloat32("DB41.28.0");
+//
+//            int fmin = plc.readInt32("DB41.0.0") - plc.readInt32("DB41.8.0");
+//            Float smin = plc.readFloat32("DB41.12.0") - plc.readFloat32("DB41.20.0");
+//
+//            int fmax = plc.readInt32("DB41.0.0") + plc.readInt32("DB41.4.0");
+//            Float smax = plc.readInt32("DB41.12.0") + plc.readFloat32("DB41.16.0");
+//
+////            String fret = "NG";
+////            if(fout >= fmin && fout <= fmax){
+////                fret = "OK";
+////            }
+////            String sret = "NG";
+////            if(sout >= smin && sout <= smax){
+////                sret = "OK";
+////            }
+//
+//            String qty = "0";
+//            if(getResultDingA(plc).equals("OK")){
+//                MesClient.aFinish++;
+//                qty = "1";
+//            }
+//
+//            DecimalFormat decimalFormat = new DecimalFormat("#.###");
+//            String soutstr = decimalFormat.format(sout);
+//            String sminstr = decimalFormat.format(smin);
+//            String smaxstr = decimalFormat.format(smax);
+//            String foutstr = fout+"";
+//            String fminstr = fmin+"";
+//            String fmaxstr = fmax+"";
+//
+//            MesClient.param2.setText(cur+"");
+//            System.out.println("cur:"+cur);
+//            if(!MesClient.product_sn.getText().isEmpty()){
+//                JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"A",foutstr,soutstr,fminstr,sminstr,fmaxstr,smaxstr,qty,cur+"", MesClient.user_menu.getText());
+//            }
+//        }
+//
+//        if (cur == MesClient.aMax){
+//            setPowerOffA(plc);
+//        }
+//
+//        upResult();
+    }
+
+    // B枪已停用
+    public static void getDataB(TCPMasterConnection connection){
+//        try{
+//            ReadMultipleRegistersRequest request = new ReadMultipleRegistersRequest(100, 120);
+//            request.setUnitID(1);
+//            ModbusTCPTransaction transaction = new ModbusTCPTransaction(connection);
+//            transaction.setRequest(request);
+//            transaction.execute();
+//            ReadMultipleRegistersResponse response = (ReadMultipleRegistersResponse) transaction.getResponse();
+//            Register[] registers = response.getRegisters();
+//            short[] dRegs = new short[300];
+//            for (int i = 0; i < registers.length; i++) {
+//                dRegs[100 + i] = registers[i].toShort();
+//            }
+//            HcPlcPointUtilB.PlcMesData mesData = HcPlcPointUtilB.readAllPoint(dRegs);
+//            MesClient.maxb = mesData.setQty;
+//            MesClient.param3.setText(String.valueOf(mesData.setQty));
+//            String name = mesData.modelName;
+//            MesClient.lblB.setText("拉铆枪B("+name+")");
+//            if (MesClient.maxb <= 0){
+//                MesClient.maxb = mesData.setQty;
+//                MesClient.param3.setText(String.valueOf(mesData.setQty));
+//            }
+//            MesClient.param4.setText(String.valueOf(MesClient.sortB));
+//            int currentOk = mesData.okQty;
+//            if (currentOk == MesClient.sortB + 1){
+//                MesClient.sortB = currentOk;
+//                MesClient.bFinish = currentOk;
+//                MesClient.param2.setText(String.valueOf(currentOk));
+//                String fout = String.valueOf(mesData.tensionResult);
+//                String sout = String.valueOf(mesData.dispResult);
+//                String fmin = String.valueOf(mesData.tensionMin);
+//                String smin = String.valueOf(mesData.dispMin);
+//                String fmax = String.valueOf(mesData.tensionMax);
+//                String smax = String.valueOf(mesData.dispMax);
+//                name = mesData.modelName;
+//                MesClient.lblB.setText("拉铆枪B("+name+")");
+//                if (!MesClient.product_sn.getText().isEmpty()) {
+//                    JdbcUtils.insertProdData(
+//                            MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),
+//                            "B", fout, sout, fmin, smin, fmax, smax,
+//                            "OK".equals(mesData.procDesc)?"1":"2",
+//                            String.valueOf(currentOk), MesClient.user_menu.getText()
+//                    );
+//                }
+//            }
+//            if (mesData.barcode != null && !mesData.barcode.isEmpty()) {
+//                MesClient.product_sn.setText(mesData.barcode);
+//            }
+//            upResult();
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
+
+//
+//        int cur = plc.readInt32("DB51.32.0");
+//
+////        int cur = 9;
+////        if(MesClient.bMax <= 0){
+////            MesClient.bMax = plc.readInt32("DB1.568.0");
+//            MesClient.param3.setText(String.valueOf(MesClient.bMax));
+////        }
+//
+//        if(MesClient.sortB < cur){
+//            MesClient.sortB = cur;
+//
+//
+//            int fout = plc.readInt32("DB51.24.0");
+//            Float sout = plc.readFloat32("DB51.28.0");
+//
+//            int fmin = plc.readInt32("DB51.0.0") - plc.readInt32("DB51.8.0");
+//            Float smin = plc.readFloat32("DB51.12.0") - plc.readFloat32("DB51.20.0");
+//
+//            int fmax = plc.readInt32("DB51.0.0") + plc.readInt32("DB51.4.0");
+//            Float smax = plc.readFloat32("DB51.12.0") + plc.readFloat32("DB51.16.0");
+//
+////            String fret = "NG";
+////            if(fout >= fmin && fout <= fmax){
+////                fret = "OK";
+////            }
+////            String sret = "NG";
+////            if(sout >= smin && sout <= smax){
+////                sret = "OK";
+////            }
+//
+//            String qty = "0";
+//            if(getResultDingB(plc).equals("OK")){
+//                MesClient.bFinish++;
+//                qty = "1";
+//            }
+//
+//            DecimalFormat decimalFormat = new DecimalFormat("#.###");
+//            String soutstr = decimalFormat.format(sout);
+//            String sminstr = decimalFormat.format(smin);
+//            String smaxstr = decimalFormat.format(smax);
+//            String foutstr = fout+"";
+//            String fminstr = fmin+"";
+//            String fmaxstr = fmax+"";
+//
+//            MesClient.param4.setText(cur+"");
+//            System.out.println("cur:"+cur);
+//            if(!MesClient.product_sn.getText().isEmpty()){
+//                JdbcUtils.insertProdData(MesClient.mes_gw, MesClient.mes_line_sn, MesClient.product_sn.getText(),"B",foutstr,soutstr,fminstr,sminstr,fmaxstr,smaxstr,qty,cur+"", MesClient.user_menu.getText());
+//            }
+//        }
+//        if (cur == MesClient.bMax){
+//            PlcUtil.setPowerOffB(plc);
+//        }
+//
+//        upResult();
+
+    }
+
+    // 上传总结果
+    public static void upResult(){
+        // 冷板绑定后且 A 枪完成才可提交
+        if(MesClient.bindLbStatus && !MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA){
+//        if(!MesClient.curSn.isEmpty() && MesClient.aMax > 0 && MesClient.aMax == MesClient.sortA && MesClient.bMax > 0 && MesClient.bMax == MesClient.sortB){
+            MesClient.finish_ok_bt.setEnabled(true);
+            MesClient.finish_ng_bt.setEnabled(true);
+
+            if(MesClient.tjStatus == 0 && MesClient.check_quality_result){
+                MesClient.tjStatus = 1;
+                MesClient.getUser();
+                String retf = "OK";
+                if(MesClient.aFinish != MesClient.aMax){
+                    retf = "NG";
+                }
+                Boolean ret = DataUtil.sendQuality(MesClient.nettyClient, MesClient.product_sn.getText(),retf, MesClient.user20);
+                if(!ret){
+                    MesClient.setMenuStatus(MesClient.tjFlagTextErr,-1);
+                }
+            }
+
+        }
+    }
+
+    // 获取控制模式
+    public static short getControlModel(S7PLC plc){
+        short control = 0;
+//        try{
+//            control = plc.read(1090);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
+
+        return control;
+    }
+
+    // 每两个字符分割,并反转
+    private static String splitIntoChunks(String str, int chunkSize) {
+        if (str == null || str.isEmpty() || chunkSize <= 0) {
+            return "";
+        }
+
+        int length = str.length();
+        int arraySize = (length + chunkSize - 1) / chunkSize;
+        String[] result = new String[arraySize];
+
+        for (int i = 0, j = 0; i < length; i += chunkSize, j++) {
+            int endIndex = Math.min(i + chunkSize, length);
+            String sttr = str.substring(i, endIndex);
+            StringBuilder sb = new StringBuilder(sttr);
+            String reversedStr = sb.reverse().toString(); // 字符串反转
+            result[j] = reversedStr;
+        }
+
+        return String.join("",result);
+    }
+
+    // 远程开机待定
+    public static Boolean setPowerOn(S7PLC plc){
+        Boolean ret = false;
+        try{
+            plc.writeBoolean("DB40.0.0",true);
+//            plc.writeBoolean("DB50.0.0",true); // B枪已停用
+//            plc.writeBoolean("DB14.0.1",false);
+            ret = true;
+        }catch (Exception e){
+            e.printStackTrace();
+            ret = false;
+        }
+
+        return ret;
+    }
+
+    // 远程关机
+    public static Boolean setPowerOff(S7PLC plc){
+        Boolean ret = false;
+        try{
+            plc.writeBoolean("DB40.0.0",false);
+//            plc.writeBoolean("DB50.0.0",false); // B枪已停用
+//            plc.writeBoolean("DB14.0.1",true);
+            ret = true;
+        }catch (Exception e){
+            e.printStackTrace();
+            ret = false;
+        }
+
+        return ret;
+    }
+
+    // 远程关机
+    public static Boolean setPowerOffA(S7PLC plc){
+        Boolean ret = false;
+        try{
+            plc.writeBoolean("DB40.0.0",false);
+//            plc.writeBoolean("DB14.0.1",true);
+            ret = true;
+        }catch (Exception e){
+            e.printStackTrace();
+            ret = false;
+        }
+
+        return ret;
+    }
+
+    // B枪已停用
+    public static Boolean setPowerOffB(S7PLC plc){
+//        Boolean ret = false;
+//        try{
+//            plc.writeBoolean("DB50.0.0",false);
+//            ret = true;
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            ret = false;
+//        }
+//        return ret;
+        return false;
+    }
+
+    // 重置任务
+    public static void setTask(S7PLC plc,int setNumA,int setNumB){
+        try{
+/*            // 设置任务 A
+//            plc.writeInt32("DB1.38.0",setNumA);
+            plc.writeUInt16("DB1.DBW54",1);
+            plc.writeUInt16("DB1.DBW584",1);
+            plc.writeInt32("DB1.184.0",0);
+
+            // 设置任务 B
+//            plc.writeInt32("DB1.568.0",setNumB);
+            plc.writeInt32("DB1.714.0",0);*/
+            plc.writeUInt16("DB40.2",1);
+            plc.writeUInt16("DB40.4",setNumA);
+            plc.writeInt32("DB41.32.0",0);
+
+//            plc.writeUInt16("DB50.2",1); // B枪已停用
+//            plc.writeUInt16("DB50.4",setNumB);
+//            plc.writeInt32("DB51.32.0",0);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    public static String getResultDingA(S7PLC plc){
+        String ret = "OK";
+        try{
+
+          /*  boolean retang = plc.readBoolean("DB1.314.1");
+            boolean retang2 = plc.readBoolean("DB1.314.3");*/
+            byte retang = plc.readByte("DB41.26");
+            int rent = (int) retang;
+            if(rent == 0){
+                ret = "NG";
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            ret = "NG";
+        }
+        return ret;
+    }
+
+    // B枪已停用
+    public static String getResultDingB(S7PLC plc){
+//        String ret = "OK";
+//        try{
+//            byte retang = plc.readByte("DB51.26");
+//            int rent = (int) retang;
+//            if(rent == 0){
+//                ret = "NG";
+//            }
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            ret = "NG";
+//        }
+//        return ret;
+        return "OK";
+    }
+}

+ 148 - 0
src/com/mes/ui/ProdReq.java

@@ -0,0 +1,148 @@
+package com.mes.ui;
+
+public class ProdReq {
+    private Integer id;
+    private String gw;
+    private String lineSn;
+    private String type;
+    private String sn;
+    private String fout;
+    private String sout;
+    private String fmin;
+    private String smin;
+    private String fmax;
+    private String smax;
+    private String qty;
+    private String serialNumber;
+    private Integer sync;
+    private String recordTime;
+    private String ucode;
+
+    public String getUcode() {
+        return ucode;
+    }
+
+    public void setUcode(String ucode) {
+        this.ucode = ucode;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getGw() {
+        return gw;
+    }
+
+    public void setGw(String gw) {
+        this.gw = gw;
+    }
+
+    public String getLineSn() {
+        return lineSn;
+    }
+
+    public void setLineSn(String lineSn) {
+        this.lineSn = lineSn;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getSn() {
+        return sn;
+    }
+
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    public String getFout() {
+        return fout;
+    }
+
+    public void setFout(String fout) {
+        this.fout = fout;
+    }
+
+    public String getSout() {
+        return sout;
+    }
+
+    public void setSout(String sout) {
+        this.sout = sout;
+    }
+
+    public String getFmin() {
+        return fmin;
+    }
+
+    public void setFmin(String fmin) {
+        this.fmin = fmin;
+    }
+
+    public String getSmin() {
+        return smin;
+    }
+
+    public void setSmin(String smin) {
+        this.smin = smin;
+    }
+
+    public String getFmax() {
+        return fmax;
+    }
+
+    public void setFmax(String fmax) {
+        this.fmax = fmax;
+    }
+
+    public String getSmax() {
+        return smax;
+    }
+
+    public void setSmax(String smax) {
+        this.smax = smax;
+    }
+
+    public String getQty() {
+        return qty;
+    }
+
+    public void setQty(String qty) {
+        this.qty = qty;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public Integer getSync() {
+        return sync;
+    }
+
+    public void setSync(Integer sync) {
+        this.sync = sync;
+    }
+
+    public String getRecordTime() {
+        return recordTime;
+    }
+
+    public void setRecordTime(String recordTime) {
+        this.recordTime = recordTime;
+    }
+}

+ 43 - 0
src/com/mes/ui/TableCellEditorButton.java

@@ -0,0 +1,43 @@
+package com.mes.ui;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class TableCellEditorButton extends DefaultCellEditor {
+    private JButton btn;
+    public TableCellEditorButton() {
+        super(new JTextField());
+        //设置点击一次就激活,否则默认好像是点击2次激活。
+        this.setClickCountToStart(1);
+        btn = new JButton("扫码");
+        btn.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                System.out.println("按钮事件触发----");
+                int selectedRow = MesClient.table.getSelectedRow();//获得选中行的索引
+//                MesClient.rowData[selectedRow][1] = (new Date()).getTime();
+//                MesClient.table.repaint(); //重绘
+
+//                MesClient.scan_type = selectedRow + 4;
+                BindMaterialResp bindMaterialResp = new BindMaterialResp();
+                bindMaterialResp.setMaterialTitle(MesClient.rowData[selectedRow][0] + "");
+                bindMaterialResp.setBatchSn(MesClient.rowData[selectedRow][1] + "");
+                bindMaterialResp.setLastTimes(MesClient.rowData[selectedRow][2] + "");
+                bindMaterialResp.setCraft(MesClient.rowData[selectedRow][4] + "");
+                bindMaterialResp.setMaterialId(MesClient.rowData[selectedRow][5] + "");
+                bindMaterialResp.setType(MesClient.rowData[selectedRow][6] + "");
+
+                MesClient.scanBatchSn(bindMaterialResp);
+            }
+        });
+
+    }
+    @Override
+    public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+
+        return btn;
+    }
+}

+ 0 - 0
src/com/mes/ui/TableCellRendererButton.java


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä