jingbo 4 日 前
コミット
f33474d6c7
100 ファイル変更3041 行追加0 行削除
  1. 24 0
      .classpath
  2. 7 0
      .gitignore
  3. 28 0
      .project
  4. 1 0
      README.md
  5. 2 0
      image/.gitignore
  6. BIN
      image/background.png
  7. BIN
      image/bg/a_side.png
  8. BIN
      image/bg/b_side.png
  9. BIN
      image/bg/bar_add.png
  10. BIN
      image/bg/bar_bookmark.png
  11. BIN
      image/bg/bar_cmd_go.png
  12. BIN
      image/bg/bar_edit.png
  13. BIN
      image/bg/bar_pause.png
  14. BIN
      image/bg/bar_sampling.png
  15. BIN
      image/bg/bar_setting.png
  16. BIN
      image/bg/bar_stop.png
  17. BIN
      image/bg/close_bt.png
  18. BIN
      image/bg/company_setting_logo.png
  19. BIN
      image/bg/delete.png
  20. BIN
      image/bg/department_setting_logo.png
  21. BIN
      image/bg/download.png
  22. BIN
      image/bg/equipment_setting_logo.png
  23. BIN
      image/bg/gj_001_1_20.png
  24. BIN
      image/bg/gj_001_21_40.png
  25. BIN
      image/bg/gj_001_41_60.png
  26. BIN
      image/bg/green_dot.png
  27. BIN
      image/bg/grey_dot.png
  28. BIN
      image/bg/icon.png
  29. BIN
      image/bg/inductance_logo.png
  30. BIN
      image/bg/insulation_logo.png
  31. BIN
      image/bg/login.png
  32. BIN
      image/bg/logo.png
  33. BIN
      image/bg/logoff.png
  34. BIN
      image/bg/menu_data_analysis.png
  35. BIN
      image/bg/menu_data_preprocess.png
  36. BIN
      image/bg/menu_file.png
  37. BIN
      image/bg/menu_setting.png
  38. BIN
      image/bg/min_bt.png
  39. BIN
      image/bg/ng_bg.png
  40. BIN
      image/bg/ok_bg.png
  41. BIN
      image/bg/open_file.png
  42. BIN
      image/bg/refresh.png
  43. BIN
      image/bg/reset_logo.png
  44. BIN
      image/bg/resistance_logo.png
  45. BIN
      image/bg/save_bg.png
  46. BIN
      image/bg/scan_barcode.png
  47. BIN
      image/bg/tree_folder_icon.png
  48. BIN
      image/bg/tree_leaf_icon.png
  49. BIN
      image/bg/user.png
  50. BIN
      image/bg/vertical_line.png
  51. BIN
      image/bg/zoom_in.png
  52. BIN
      image/bg/zoom_out.png
  53. BIN
      image/close_bt.png
  54. 0 0
      image/cmd.txt
  55. BIN
      image/icon.ico
  56. BIN
      image/info_bt.png
  57. BIN
      image/min_bt.png
  58. BIN
      img.png
  59. BIN
      lib/RXTXcomm.jar
  60. BIN
      lib/bluecove-2.1.1.jar
  61. BIN
      lib/commons-codec-1.15.jar
  62. BIN
      lib/fastjson2-2.0.16.jar
  63. BIN
      lib/gson-2.10.jar
  64. BIN
      lib/iot-communication-1.4.4.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/spring-context-5.3.18.jar
  76. BIN
      lib/sqlite-jdbc-3.36.0.3.jar
  77. 10 0
      src/com/mes/component/CallFromJs.java
  78. 57 0
      src/com/mes/component/MesRadio.java
  79. 44 0
      src/com/mes/component/MesWebView.java
  80. 30 0
      src/com/mes/component/MyDialog.java
  81. 90 0
      src/com/mes/netty/MesMsgUtils.java
  82. 64 0
      src/com/mes/netty/NettyClient.java
  83. 82 0
      src/com/mes/netty/NettyClientHandler.java
  84. 73 0
      src/com/mes/netty/ProtocolParam.java
  85. 168 0
      src/com/mes/netty/XDecoder.java
  86. 58 0
      src/com/mes/ui/BindMaterialResp.java
  87. 276 0
      src/com/mes/ui/DataUtil.java
  88. 210 0
      src/com/mes/ui/LoginFarme.java
  89. 956 0
      src/com/mes/ui/MesClient.java
  90. 155 0
      src/com/mes/ui/MesRevice.java
  91. 79 0
      src/com/mes/ui/OprnoUtil.java
  92. 43 0
      src/com/mes/ui/TableCellEditorButton.java
  93. 14 0
      src/com/mes/ui/TableCellRendererButton.java
  94. 190 0
      src/com/mes/ui/Test.java
  95. 15 0
      src/com/mes/util/Base64Utils.java
  96. 151 0
      src/com/mes/util/BluetoothUtils.java
  97. 34 0
      src/com/mes/util/DateLocalUtils.java
  98. 49 0
      src/com/mes/util/ErrorMsg.java
  99. 131 0
      src/com/mes/util/HttpUtils.java
  100. 0 0
      src/com/mes/util/JdbcUtils.java

+ 24 - 0
.classpath

@@ -0,0 +1,24 @@
+<?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"/>
+</classpath>

+ 7 - 0
.gitignore

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

+ 28 - 0
.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>mesclient-sd</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>1763022656890</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>

+ 1 - 0
README.md

@@ -0,0 +1 @@
+![img.png](img.png)

+ 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
img.png


BIN
lib/RXTXcomm.jar


BIN
lib/bluecove-2.1.1.jar


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/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/spring-context-5.3.18.jar


BIN
lib/sqlite-jdbc-3.36.0.3.jar


+ 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;
+    }
+}

+ 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);
+    }
+}

+ 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;
+    }
+
+
+}

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

@@ -0,0 +1,64 @@
+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;
+    }
+}

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

@@ -0,0 +1,276 @@
+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(pro.getProperty("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 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;
+    }
+}

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

@@ -0,0 +1,210 @@
+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;
+import java.time.LocalDateTime;
+
+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) {
+                    // 获取等于所处时间-当前小时
+                    LocalDateTime now = LocalDateTime.now();
+                    MesClient.userLoginHours = now.getHour();
+                    //初始化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;
+        }
+    }
+}

+ 956 - 0
src/com/mes/ui/MesClient.java

@@ -0,0 +1,956 @@
+package com.mes.ui;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.mes.component.MesRadio;
+import com.mes.component.MesWebView;
+import com.mes.netty.NettyClient;
+import com.mes.util.*;
+
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Properties;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class MesClient extends JFrame {
+
+    private static String Drivde = "org.sqlite.JDBC";
+
+    public static int mes_auth = 0; // 权限级别 0=无权限 1=操作工人 2=管理员
+    public static String mes_gw = ""; // 工位号
+    public static String mes_gw_des = ""; // 工位名称
+    public static String mes_server_ip = ""; // 服务器IP地址
+    public static int mes_tcp_port = 3000; // TCP服务端口
+    public static int mes_heart_beat_cycle = 10; // 心跳周期
+    public static int mes_heart_icon_cycle = 1;
+    public static String mes_line_sn = ""; // 产线编号
+
+    //TCP连接
+    public static NettyClient nettyClient;
+    //TCP连接状态
+    public static boolean tcp_connect_flag = false;
+    //TCP连接请求
+    public static boolean connect_request_flag = false;
+    public static boolean com_connect_flag = false;
+    //session
+    public static String sessionid = "";
+
+    public static JPanel contentPane;
+    public static MesClient mesClientFrame;
+    public static JTabbedPane tabbedPane;
+    public static JScrollPane indexScrollPaneA;
+    public static JScrollPane searchScrollPane;
+    public static JScrollPane searchScrollPaneDj;
+    public static SerialPortUtils serialPortUtils;
+    public static BluetoothUtils bluetoothUtils;
+    public static  ParamConfig paramConfig;
+    public static Boolean check_quality_result = false;
+    public static Integer work_status = 0;
+
+    public static JButton heart_beat_menu;
+    public static JButton status_menu;
+    public static JButton user_menu;
+
+    public static int scan_type = 0;
+    public static JButton finish_ok_bt;
+    public static JButton batch_sn_bt;
+    public static JTextField product_sn;
+    public static JButton f_scan_data_bt_1;
+    public static JButton is_js_btn;
+    public static String comboBoxValue = "COM1";
+    public static String user20 = "";
+    public static String is_js_btn_val = "1";
+
+    public static JFrame welcomeWin;
+
+    public static JPanel indexPanelB;
+    public static MesWebView jfxPanel = null;
+    public static JPanel indexPanelC;
+    public static MesWebView jfxPanel2 = null;
+    public static MesRadio mesRadioHj;
+
+    public static JTable table;
+    public static Object[] columnNames = { "物料名称", "绑定批次", "剩余次数", "操作" };
+    public static Object[][] rowData = null;
+    public static Timer cjTimer;
+    public static Timer cjTimer2;
+    private static final String TARGET_DEVICE_ADDRESS = "001135390238";
+    public static void main(String[] args) {
+        EventQueue.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                try{
+
+                    //读文件配置
+                    readProperty();
+                    checkComPort();
+                    // 显示界面
+                    mesClientFrame = new MesClient();
+                    mesClientFrame.setVisible(false);
+
+                    JdbcUtils.getConn();
+
+                    welcomeWin = new LoginFarme();
+                    welcomeWin.setVisible(true);
+
+//                    getMaterailData();
+
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    public static void initComPort() {
+      /*  serialPortUtils = new SerialPortUtils();
+        System.out.println(comboBox.getSelectedItem());
+        paramConfig = new ParamConfig((String) comboBox.getSelectedItem(), 4800, 0, 8, 1);
+//         paramConfig = new ParamConfig("COM7", 1200, 0, 8, 1);
+        System.out.println("串口号:"+(String) comboBox.getSelectedItem());
+        //初始化串口
+        serialPortUtils.init(paramConfig);
+        System.out.println("初始化com串口结束...");*/
+        // 关闭原有的串口连接(如果存在)
+        if (serialPortUtils != null) {
+            serialPortUtils.closeSerialPort();
+            serialPortUtils = null;
+        }
+
+        // 初始化蓝牙连接
+        bluetoothUtils = new BluetoothUtils();
+        bluetoothUtils.init();
+        // 构建参数配置(兼容原有代码结构)
+       // paramConfig = new ParamConfig((String) comboBox.getSelectedItem(), 4800, 0, 8, 1);
+    }
+
+    //如果蓝牙断开,定时任务重连
+    public static void checkComPort() {
+            if(MesClient.cjTimer2!=null) {
+                MesClient.cjTimer2.cancel();
+            }
+            MesClient.cjTimer2 = new Timer();
+            MesClient.cjTimer2.schedule(new TimerTask() {
+                public void run() {
+                    try {
+                        if (!com_connect_flag) {
+                            System.out.println("蓝牙断开连接,正在重连");
+                            initComPort();
+                        }else{
+                            System.out.println("蓝牙已连接");
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                }
+            }, 2000,2000);
+
+    }
+
+    //读配置文件
+    private static void readProperty() throws IOException{
+        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);
+        mes_gw =  pro.getProperty("mes.gw");
+
+//        mes_gw_des = pro.getProperty("mes.gw_des");
+        mes_server_ip = pro.getProperty("mes.server_ip");
+        mes_tcp_port = Integer.parseInt(pro.getProperty("mes.tcp_port"));
+        mes_heart_beat_cycle = Integer.parseInt(pro.getProperty("mes.heart_beat_cycle"));
+        mes_line_sn = pro.getProperty("mes.line_sn");
+
+        mes_gw_des = OprnoUtil.getGwDes(mes_line_sn,mes_gw);
+
+        System.out.println(mes_gw + ";" + mes_gw_des + ";" + mes_server_ip + ";" + mes_tcp_port + ";" + mes_heart_beat_cycle);
+    }
+
+    // 初始化TCP
+    public static void initTcpConnection() {
+        try {
+            if(nettyClient==null) {
+                //初始化TCP连接
+                nettyClient = new NettyClient();
+                //TCP连接状态
+                tcp_connect_flag = false;
+                //设置TCP请求状态
+                connect_request_flag = true;
+
+                DataUtil.synrTcp(nettyClient,mes_gw);
+            }
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    //启动心跳包程序
+    public static java.util.Timer heartBeatTimer;
+    public static java.util.Timer heartBeatIconTimer;
+    public static boolean iconREDFlag = true;
+    public static JTextField weight_text;
+    public static JTextField batch_sn_text;
+    public static JLabel lblNewLabel;
+    public static JLabel lblNewLabel_1;
+    private static JComboBox comboBox;
+    public static JButton finish_ok_bt_1;
+    public static void startHeartBeatTimer() {
+        if(heartBeatTimer!=null) {
+            heartBeatTimer.cancel();
+        }
+        heartBeatTimer = new java.util.Timer();
+        heartBeatTimer.schedule(new TimerTask() {
+            public void run() {
+                if(nettyClient!=null&&tcp_connect_flag) {
+                    //System.out.println("发送心跳报文");
+                    DataUtil.heartBeat(nettyClient,mes_gw);
+
+                    heart_beat_menu.setText(DateLocalUtils.getCurrentTime());
+                }
+            }
+        }, 100,mes_heart_beat_cycle*1000);
+
+        //心跳显示图标
+        if(heartBeatIconTimer!=null) {
+            heartBeatIconTimer.cancel();
+        }
+        heartBeatIconTimer = new Timer();
+        heartBeatIconTimer.schedule(new TimerTask() {
+            public void run() {
+                if(tcp_connect_flag) {
+                    if(iconREDFlag) {
+                        heart_beat_menu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/grey_dot.png")));
+                        iconREDFlag = false;
+                    }else {
+                        heart_beat_menu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/green_dot.png")));
+                        iconREDFlag = true;
+                    }
+                    heart_beat_menu.setText(DateLocalUtils.getCurrentTime());
+                    heart_beat_menu.repaint();
+                }else {
+                    heart_beat_menu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/grey_dot.png")));
+                    heart_beat_menu.setText(DateLocalUtils.getCurrentTime());
+                    heart_beat_menu.repaint();
+
+                    //若未连接则尝试连接
+                    if(nettyClient!=null&&!tcp_connect_flag){
+                        System.out.println("TCP已断开");
+                        //TCP重新同步连接
+                        if(!connect_request_flag) {
+                            //System.out.println("TCP重新同步连接");
+                            //设置TCP请求状态,只重新同步连接一次
+                            connect_request_flag = true;
+
+                            DataUtil.synrTcp(nettyClient,mes_gw);
+                        }
+
+                    }
+                }
+            }
+        }, 100,mes_heart_icon_cycle*1000);
+    }
+
+    //设置tcp连接状态显示
+    public static void setTcpStatus() {
+        if(tcp_connect_flag) {
+            status_menu.setText("已连接MES服务器");
+            heart_beat_menu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/grey_dot.png")));
+            heart_beat_menu.repaint();
+        }else {
+            status_menu.setText("未连接MES服务器");
+            heart_beat_menu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/grey_dot.png")));
+            heart_beat_menu.repaint();
+        }
+    }
+
+    public static void initWarehouseData(){
+        resetScanA();
+    }
+
+    public static void resetScanA() {
+        work_status = 0;
+        check_quality_result = false;
+//		MesClient.start_work_bt.setVisible(false);
+//        MesClient.finish_ng_bt.setVisible(false);
+//        MesClient.finish_ok_bt.setVisible(false);
+        MesClient.finish_ok_bt.setEnabled(false);
+        product_sn.setText("");
+        batch_sn_text.setText("");
+        weight_text.setText("");
+        batch_sn_bt.setEnabled(false);
+        weight_text.setEnabled(false);
+        is_js_btn.setText("最后一台");
+        is_js_btn_val = "1";
+        is_js_btn.setBackground(null);
+        finish_ok_bt.setEnabled(false);
+        MesClient.finish_ok_bt_1.setText("称重");
+//        MesClient.f_scan_data_bt_1.setEnabled(false);
+
+        MesClient.f_scan_data_bt_1.setEnabled(true);
+//		DataUtil.stopWork(sessionid);
+        setMenuStatus("请扫工件码",0);
+//		product_result_text.setText("");
+//		work_status_text.setText("");
+//        MesClient.setMenuStatus("涂胶已超过10分钟,已失效",-1);
+
+//        updateMaterailData();
+        shiftUserCheck();
+    }
+
+    public static int userLoginHours;//用户登录所处小时
+    //换班用户信息检查
+    private static  void  shiftUserCheck() {
+        LocalDateTime now = LocalDateTime.now();
+        // 判断时间范围
+        if (userLoginHours >= 8 && userLoginHours < 20) {
+            int hour = now.getHour();
+            if (hour >= 20 || hour < 8) {
+                logoff();
+            }
+        } else {
+            int hour = now.getHour();
+            if (hour >= 8 && hour < 20) {
+                logoff();
+            }
+        }
+    }
+
+    public static void resetScanB() {
+
+    }
+
+    //获取用户20位
+    public static void getUser() {
+        user20 = user_menu.getText().toString();
+        String space_tmp1 = "";
+        if(user20.length()<20) {
+            for(int i=0;i<20-user20.length();i++) {
+                space_tmp1 = space_tmp1 + " ";
+            }
+        }
+        user20 = user20 + space_tmp1;
+    }
+
+    //获取barcode内容36位
+    public static String getBarcode(String barcodeTmp) {
+        String barcodeRet = barcodeTmp;
+        if(barcodeTmp.equalsIgnoreCase("")) {
+            return "";
+        }else {
+            if(barcodeTmp.length()<36) {
+                String space = "";
+                for(int i=0;i<36-barcodeTmp.length();i++) {
+                    space = space + " ";
+                }
+                barcodeRet = barcodeTmp + space;
+            }
+        }
+        return barcodeRet;
+    }
+
+    public static void scanBarcode() {
+        if(work_status == 1){
+            JOptionPane.showMessageDialog(mesClientFrame,"工作中,勿扫码","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+            return;
+        }
+        String scanBarcodeTitle = "";
+        switch(scan_type) {
+            case 1:
+                product_sn.setText("");
+                scanBarcodeTitle = "请扫工件码";
+                break;
+        }
+
+        //弹窗扫工件码
+        String scanBarcode = JOptionPane.showInputDialog(null, scanBarcodeTitle);
+        if(scanBarcode!=null&&!scanBarcode.equalsIgnoreCase("")) {
+            //获取用户
+            getUser();
+            //获取扫码内容36位
+            String barcode36 = getBarcode(scanBarcode);//处理36为码
+            //工位号
+            String gw = "";
+            switch(scan_type) {
+                case 1:
+                    product_sn.setText(scanBarcode);
+                    break;
+            }
+            //刷新界面
+            mesClientFrame.repaint();
+
+            if(!tcp_connect_flag) {
+                JOptionPane.showMessageDialog(mesClientFrame,"设备未连接Mes服务器","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                return;
+            }
+
+            // 查询工件质量
+            Boolean sendret = DataUtil.checkQuality(nettyClient,barcode36,user20);
+            if(!sendret){
+                JOptionPane.showMessageDialog(mesClientFrame,"消息发送失败,请重试","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                return;
+            }
+        }else {
+            JOptionPane.showMessageDialog(mesClientFrame,"请扫工件码","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+            return;
+        }
+    }
+
+    public static void logoff() {
+//        welcomeWin.setVisible(true);
+        mesClientFrame.setVisible(false);
+
+        //退出程序 退出登录
+        System.exit(0);
+        nettyClient = null;
+//        if(heartBeatTimer!=null) {
+//            heartBeatTimer.cancel();
+//        }
+//        if(heartBeatIconTimer!=null) {
+//            heartBeatIconTimer.cancel();
+//        }
+        tcp_connect_flag = false;
+        connect_request_flag = false;
+    }
+
+    public MesClient() {
+        setIconImage(Toolkit.getDefaultToolkit().getImage(MesClient.class.getResource("/bg/logo.png")));
+        setTitle("MES系统客户端:"+mes_gw + "- " + mes_gw_des);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setBounds(0, 0, 1024, 768);
+
+        JMenuBar menuBar = new JMenuBar();
+        menuBar.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 26));
+        setJMenuBar(menuBar);
+        JMenu fileMenu = new JMenu("用户");
+        fileMenu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/user.png")));
+        fileMenu.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        menuBar.add(fileMenu);
+
+        JMenuItem exitMenuItem = new JMenuItem("退出");
+        exitMenuItem.setIcon(new ImageIcon(MesClient.class.getResource("/bg/logoff.png")));
+        exitMenuItem.setFont(new Font("微软雅黑", Font.PLAIN, 22));
+        fileMenu.add(exitMenuItem);
+        exitMenuItem.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {//只能检测到mousePressed事件
+                super.mouseClicked(e);
+                //dispose();
+                logoff();
+            }
+        });
+
+        JMenu settingMenu = new JMenu("设置");
+        //settingMenu.setVisible(false);
+        settingMenu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/menu_setting.png")));
+        settingMenu.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        menuBar.add(settingMenu);
+
+        JMenuItem resetTcpMenu = new JMenuItem("\u91CD\u8FDEMES");
+        resetTcpMenu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
+        resetTcpMenu.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        resetTcpMenu.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                super.mouseClicked(e);
+                //重连mes
+                nettyClient.future.channel().close();
+            }
+        });
+        settingMenu.add(resetTcpMenu);
+
+        JMenuItem resetTcpMenu_1 = new JMenuItem("刷新工件");
+        resetTcpMenu_1.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
+        resetTcpMenu_1.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        resetTcpMenu_1.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                super.mouseClicked(e);
+                resetScanA();
+            }
+        });
+        settingMenu.add(resetTcpMenu_1);
+
+        contentPane = new JPanel();
+        contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
+        setContentPane(contentPane);
+        contentPane.setLayout(new BorderLayout(0, 0));
+
+        JToolBar toolBar = new JToolBar();
+        contentPane.add(toolBar, BorderLayout.NORTH);
+
+        JLabel equipment_statu_label = new JLabel("状态:");
+        equipment_statu_label.setHorizontalAlignment(SwingConstants.CENTER);
+        equipment_statu_label.setForeground(Color.BLACK);
+        equipment_statu_label.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        equipment_statu_label.setBackground(Color.LIGHT_GRAY);
+        toolBar.add(equipment_statu_label);
+
+        status_menu = new JButton("设备未连接MES服务器");
+        if(tcp_connect_flag) {
+            status_menu.setText("已连接MES服务器");
+            status_menu.setForeground(Color.GREEN);
+        }else {
+            status_menu.setText("未连接MES服务器");
+            status_menu.setForeground(Color.DARK_GRAY);
+        }
+        status_menu.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+            }
+        });
+        status_menu.setForeground(Color.GREEN);
+        status_menu.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        status_menu.setBackground(Color.BLACK);
+        toolBar.add(status_menu);
+
+        JLabel space_1 = new JLabel("    ");
+        toolBar.add(space_1);
+
+        JLabel heart_beat_status_label = new JLabel("心跳:");
+        heart_beat_status_label.setHorizontalAlignment(SwingConstants.CENTER);
+        heart_beat_status_label.setForeground(Color.BLACK);
+        heart_beat_status_label.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        heart_beat_status_label.setBackground(Color.LIGHT_GRAY);
+        toolBar.add(heart_beat_status_label);
+
+        heart_beat_menu = new JButton("2024-02-20 23:20:10");
+        heart_beat_menu.setIcon(new ImageIcon(MesClient.class.getResource("/bg/green_dot.png")));
+        heart_beat_menu.setForeground(Color.GREEN);
+        heart_beat_menu.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        heart_beat_menu.setBackground(Color.BLACK);
+        toolBar.add(heart_beat_menu);
+
+        JLabel space_2 = new JLabel("    ");
+        toolBar.add(space_2);
+
+        JLabel user_status_label = new JLabel("登录用户:");
+        user_status_label.setHorizontalAlignment(SwingConstants.CENTER);
+        user_status_label.setForeground(Color.BLACK);
+        user_status_label.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        user_status_label.setBackground(Color.LIGHT_GRAY);
+        toolBar.add(user_status_label);
+
+        user_menu = new JButton("JinJuShi");
+        user_menu.setForeground(Color.GREEN);
+        user_menu.setFont(new Font("微软雅黑", Font.PLAIN, 22));
+        user_menu.setBackground(Color.BLACK);
+        toolBar.add(user_menu);
+
+        JLabel space_3 = new JLabel("    ");
+        toolBar.add(space_3);
+
+        JLabel space_4 = new JLabel("    ");
+        toolBar.add(space_4);
+//删除
+ /*       comboBox = new JComboBox();
+        comboBox.setBackground(Color.WHITE);
+        comboBox.setFont(new Font("微软雅黑", Font.PLAIN, 18));
+        comboBox.setBounds(50, 10, 80, 21);
+        comboBox.setMaximumSize(new Dimension(100, 40));
+        comboBox.setMinimumSize(new Dimension(100, 30));
+        comboBox.setPreferredSize(new Dimension(100, 30));
+        comboBox.setModel(new DefaultComboBoxModel(new String[] {"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8"}));
+        comboBox.setSelectedItem("COM4");
+        toolBar.add(comboBox);
+        // 串口发生改变
+        comboBox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+
+                if (bluetoothUtils != null) {
+                    bluetoothUtils.closeConnection();
+                }
+                MesClient.initComPort();
+            }
+        });*/
+        tabbedPane = new JTabbedPane(JTabbedPane.TOP);
+        tabbedPane.setMinimumSize(new Dimension(400, 50));
+        tabbedPane.setFont(new Font("宋体", Font.BOLD, 22));
+        contentPane.add(tabbedPane);
+
+        //首页
+        JPanel indexPanelA = new JPanel();
+        indexScrollPaneA = new JScrollPane(indexPanelA);
+        indexPanelA.setLayout(null);
+
+        product_sn = new JTextField();
+        product_sn.setHorizontalAlignment(SwingConstants.CENTER);
+        product_sn.setEditable(false);
+        product_sn.setFont(new Font("微软雅黑", Font.PLAIN, 28));
+        product_sn.setBounds(81, 70, 602, 70);
+        indexPanelA.add(product_sn);
+        product_sn.setColumns(10);
+
+        f_scan_data_bt_1 = new JButton("扫码");
+        f_scan_data_bt_1.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                scan_type = 1;
+                scanBarcode();
+            }
+        });
+        f_scan_data_bt_1.setIcon(new ImageIcon(MesClient.class.getResource("/bg/scan_barcode.png")));
+        f_scan_data_bt_1.setFont(new Font("微软雅黑", Font.PLAIN, 32));
+        f_scan_data_bt_1.setBounds(693, 70, 198, 70);
+        indexPanelA.add(f_scan_data_bt_1);
+
+//        String[] hjtitles = new String[]{"焊机1","焊机2","焊机3"};
+//        String[] hjvals = new String[]{"HJ001","HJ002","HJ003"};
+//        mesRadioHj = new MesRadio(hjtitles,hjvals);
+//        mesRadioHj.setSize(500,50);
+//        mesRadioHj.setBounds(190,170,500,50);
+//        indexPanelA.add(mesRadioHj);
+
+        finish_ok_bt = new JButton("打包");
+        finish_ok_bt.setEnabled(false);
+        finish_ok_bt.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e ) {
+                if(work_status == 1 && check_quality_result) {
+
+                    if ( batch_sn_text.getText().equals("")){
+                        JOptionPane.showMessageDialog(mesClientFrame,"请先获取包装码!","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                    }
+
+
+
+
+
+
+
+
+
+                    String wig = weight_text.getText().isEmpty() ? "10000" : weight_text.getText();
+                    String is_js = is_js_btn_val;
+                    String result = HttpUtils.sendRequest(
+                            "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesProductRecord/dp350?" +
+                                    "sn=" + product_sn.getText() + "&oprno=" + mes_gw + "&batchSn=" +
+                                    batch_sn_text.getText() + "&weight=" + wig + "&isJs=" + is_js + "&ucode=system");
+//                                    batch_sn_text.getText() + "&weight=123" + "&isJs=" + is_js);
+//                    String result = HttpUtils.sendRequest(
+//                            "http://127.0.0.1:8980/js/a/mes/mesProductRecord/dp350?" +
+//                                    "sn=" + product_sn.getText() + "&oprno=" + mes_gw + "&batchSn=" +
+//                                    batch_sn_text.getText() + "&weight=" + weight_text.getText() + "&isJs=" + is_js);
+                    // 无论请求结果如何,都清空重量文本框
+                    weight_text.setText("");
+                    if (result != null && !result.equals("") && !result.equals("false")) {
+                        JSONObject ret = JSON.parseObject(result);
+                        if (ret.get("result").equals("true")) {
+                            MesClient.setMenuStatus("结果提交成功,请扫下一件",0);
+                            resetScanA();
+//                            cjTimer.cancel();
+//                            MesClient.weight_text.setText("");
+                        }else {
+                            JOptionPane.showMessageDialog(mesClientFrame, "结果提交失败,"+ret.get("message")+"!", "提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                            MesClient.setMenuStatus("结果提交失败,请重试!",1);
+                        }
+                    }
+
+//                    String sn = getBarcode(product_sn.getText());
+//                    getUser();
+//
+//                    String qret = "OK";
+//                    Boolean sendret = DataUtil.sendQuality(nettyClient, sn, qret, user20);
+//                    if (!sendret) {
+//                        JOptionPane.showMessageDialog(mesClientFrame, "消息发送失败,请重试", "提示窗口", JOptionPane.INFORMATION_MESSAGE);
+//                        return;
+//                    }
+
+                }
+            }
+        });
+        finish_ok_bt.setIcon(new ImageIcon(MesClient.class.getResource("/bg/ok_bg.png")));
+        finish_ok_bt.setFont(new Font("微软雅黑", Font.PLAIN, 40));
+        finish_ok_bt.setBounds(578, 405, 212, 92);
+        indexPanelA.add(finish_ok_bt);
+
+        weight_text = new JTextField();
+        weight_text.setHorizontalAlignment(SwingConstants.CENTER);
+        weight_text.setFont(new Font("微软雅黑", Font.PLAIN, 28));
+        weight_text.setEditable(false);
+        weight_text.setColumns(10);
+        weight_text.setBounds(403, 300, 181, 70);
+        weight_text.setText("");
+        /*String wet = BluetoothUtils.readWeightTimer();*/
+
+        indexPanelA.add(weight_text);
+
+        batch_sn_text = new JTextField();
+        batch_sn_text.setEditable(false);
+        batch_sn_text.setHorizontalAlignment(SwingConstants.CENTER);
+        batch_sn_text.setFont(new Font("微软雅黑", Font.PLAIN, 28));
+        batch_sn_text.setColumns(10);
+        batch_sn_text.setBounds(403, 192, 280, 70);
+        indexPanelA.add(batch_sn_text);
+
+        batch_sn_bt = new JButton("生成包装码");
+        batch_sn_bt.setEnabled(false);
+        batch_sn_bt.addActionListener(new ActionListener() {
+        	public void actionPerformed(ActionEvent e) {
+                //生成包装码
+                try {
+                    String result = HttpUtils.sendRequest("http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesBatchSn/createBatchSn?lineSn="+mes_line_sn);
+                    JSONObject ret = JSON.parseObject(result);
+                    String TF = ret.getString("result");
+                    if (Boolean.parseBoolean(TF)){
+                        String batchSn = ret.getJSONObject("data").getString("batchSn");
+                        //赋值  禁用生成按钮
+                        batch_sn_text.setText(batchSn);
+                        MesClient.batch_sn_bt.setEnabled(false);
+                        MesClient.finish_ok_bt.setEnabled(true);
+                        setMenuStatus("生成包装码成功",0);
+                    }else{
+                        JOptionPane.showMessageDialog(mesClientFrame,"生成包装码失败!,请重试","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+
+                    }
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                    JOptionPane.showMessageDialog(mesClientFrame,"生成包装码失败!,请重试","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+
+                }
+
+//                if (result!= null&&!result.equals("")&&!result.equals("false")) {
+//                    JSONObject ret = JSON.parseObject(result);
+//                    if (ret != null && ret.containsKey("data")) {
+//                        String batchSn = ret.getJSONObject("data").getString("batchSn");
+//                        if (batchSn == null || batchSn.equals("")) { // 包装码为null,激活生成包装码按钮
+//                            JOptionPane.showMessageDialog(mesClientFrame,"生成包装码失败!,请重试","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+//                        }else{
+//                            //赋值  禁用生成按钮
+//                            batch_sn_text.setText(batchSn);
+//                            MesClient.batch_sn_bt.setEnabled(false);
+//                        }
+//                    }
+//
+//                }else{
+//                    JOptionPane.showMessageDialog(mesClientFrame,"生成包装码失败!,请重试","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+//                }
+
+
+
+        	}
+        });
+        batch_sn_bt.setFont(new Font("微软雅黑", Font.PLAIN, 30));
+        batch_sn_bt.setBounds(693, 192, 198, 70);
+        indexPanelA.add(batch_sn_bt);
+
+        lblNewLabel = new JLabel("重量");
+        lblNewLabel.setEnabled(false);
+        lblNewLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+        lblNewLabel.setFont(new Font("微软雅黑", Font.PLAIN, 30));
+        lblNewLabel.setBounds(238, 300, 117, 70);
+        indexPanelA.add(lblNewLabel);
+
+        lblNewLabel_1 = new JLabel("包装码");
+        lblNewLabel_1.setEnabled(false);
+        lblNewLabel_1.setHorizontalAlignment(SwingConstants.RIGHT);
+        lblNewLabel_1.setFont(new Font("微软雅黑", Font.PLAIN, 30));
+        lblNewLabel_1.setBounds(238, 192, 117, 70);
+        indexPanelA.add(lblNewLabel_1);
+
+        is_js_btn = new JButton("最后一台");
+        is_js_btn.addActionListener(new ActionListener() {
+        	public void actionPerformed(ActionEvent e) {
+//                if (is_js_btn.getText().equals("结束")){
+//                    is_js_btn.setText("开始");
+//                }else if (is_js_btn.getText().equals("开始")){
+//                    is_js_btn.setText("结束");
+//                }
+                if (is_js_btn_val.equals("2")){
+                    is_js_btn.setBackground(null);
+                    is_js_btn_val = "1";
+                }else{
+//                    is_js_btn.setText("结束");
+                    is_js_btn.setBackground(Color.GREEN);
+                    is_js_btn_val = "2";
+                }
+        	}
+        });
+        is_js_btn.setFont(new Font("微软雅黑", Font.PLAIN, 32));
+        is_js_btn.setBounds(693, 300, 198, 70);
+        indexPanelA.add(is_js_btn);
+
+        finish_ok_bt_1 = new JButton("确定");
+        finish_ok_bt_1.setIcon(new ImageIcon(MesClient.class.getResource("/bg/ok_bg.png")));
+        finish_ok_bt_1.addActionListener(new ActionListener() {
+        	public void actionPerformed(ActionEvent e) {
+                    // 创建并启动一个线程执行称重操作,立即执行且只执行一次
+                new  Thread(() -> {
+                    if (finish_ok_bt_1.getText().equals("称重")){
+                        finish_ok_bt_1.setEnabled(false);
+                        finish_ok_bt_1.setText("暂停");
+                        String btsppUrl = "btspp://" + TARGET_DEVICE_ADDRESS + ":1;authenticate=false;encrypt=false;master=false";
+
+                        // 调用BluetoothUtils.connectAndReceiveData获取重量数据
+                        String weight = BluetoothUtils.connectAndReceiveData();
+                        // 在Swing EDT线程中更新UI
+                        javax.swing.SwingUtilities.invokeLater(() -> {
+                            weight_text.setText(weight);
+                            finish_ok_bt_1.setText("称重");
+                            finish_ok_bt_1.setEnabled(true);
+                        });
+                    }else if (finish_ok_bt_1.getText().equals("暂停")){
+                        finish_ok_bt_1.setText("称重");
+                    }
+                }).start();
+
+        	}
+        });
+        finish_ok_bt_1.setFont(new Font("微软雅黑", Font.PLAIN, 40));
+        finish_ok_bt_1.setEnabled(true);
+        finish_ok_bt_1.setBounds(207, 405, 212, 92);
+        indexPanelA.add(finish_ok_bt_1);
+
+        tabbedPane.addTab("工作面板", new ImageIcon(MesClient.class.getResource("/bg/a_side.png")), indexScrollPaneA, null);
+        tabbedPane.setEnabledAt(0, true);
+
+//		searchScrollPane = new JScrollPane((Component) null);
+
+        indexPanelC = new JPanel();
+        searchScrollPaneDj = new JScrollPane(indexPanelC);
+        indexPanelC.setLayout(null);
+
+        tabbedPane.addTab("开班点检", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPaneDj, null);
+
+
+        indexPanelB = new JPanel();
+        searchScrollPane = new JScrollPane(indexPanelB);
+        indexPanelB.setLayout(null);
+
+		tabbedPane.addTab("工作记录", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPane, null);
+
+
+		tabbedPane.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                JTabbedPane tabbedPane = (JTabbedPane) e.getSource();
+                int selectedIndex = tabbedPane.getSelectedIndex();
+                System.out.println("selectedIndex:"+selectedIndex);
+
+                if(selectedIndex == 1){
+
+                }
+            }
+        });
+    }
+
+    public static void setMenuStatus(String msg,int error){
+        if(error == 0){
+            MesClient.status_menu.setForeground(Color.GREEN);
+        }else{
+            MesClient.status_menu.setForeground(Color.RED);
+        }
+        MesClient.status_menu.setText(msg);
+    }
+
+    public static void getMaterailData(){
+        JSONObject retObj = DataUtil.getBindMaterail();
+        if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+            java.util.List<BindMaterialResp> arrs = retObj.getList("data",BindMaterialResp.class);
+            int i = 0;
+            rowData = new Object[arrs.size()][7];
+            for (BindMaterialResp bindMaterialResp:arrs){
+                rowData[i][0] = bindMaterialResp.getMaterialTitle();
+                rowData[i][1] = bindMaterialResp.getBatchSn();
+                rowData[i][2] = bindMaterialResp.getLastTimes();
+                rowData[i][3] = "";
+                rowData[i][4] = bindMaterialResp.getCraft();
+                rowData[i][5] = bindMaterialResp.getMaterialId();
+                rowData[i][6] = bindMaterialResp.getType();
+                i++;
+            }
+            bindBatchPanel();
+        }
+    }
+
+    public static void updateMaterailData(){
+        JSONObject retObj = DataUtil.getBindMaterail();
+        if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+            List<BindMaterialResp> arrs = retObj.getList("data",BindMaterialResp.class);
+
+            int i = 0;
+            for (BindMaterialResp bindMaterialResp:arrs){
+                rowData[i][0] = bindMaterialResp.getMaterialTitle();
+                rowData[i][1] = bindMaterialResp.getBatchSn();
+                rowData[i][2] = bindMaterialResp.getLastTimes();
+                rowData[i][3] = "";
+                rowData[i][4] = bindMaterialResp.getCraft();
+                rowData[i][5] = bindMaterialResp.getMaterialId();
+                rowData[i][6] = bindMaterialResp.getType();
+                i++;
+            }
+
+            MesClient.table.repaint();
+        }
+    }
+
+    // 绑定物料批次码
+    public static void scanBatchSn(BindMaterialResp bindMaterialResp) {
+        //弹窗扫工件码
+        String scanBarcodeTitle = "请扫物料:"+bindMaterialResp.getMaterialTitle();
+        String scanBarcode = JOptionPane.showInputDialog(null, scanBarcodeTitle);
+        if(scanBarcode!=null&&!scanBarcode.equalsIgnoreCase("")) {
+
+            JSONObject retObj = DataUtil.saveBindMaterail(scanBarcode,bindMaterialResp.getCraft(),bindMaterialResp.getMaterialId(),bindMaterialResp.getType());
+            if(retObj.get("result")!=null&&retObj.get("result").toString().equalsIgnoreCase("true")) {
+                MesClient.setMenuStatus("扫物料:"+bindMaterialResp.getMaterialTitle()+"成功",0);
+                updateMaterailData();
+            }else{
+                if(retObj.get("result")==null){
+                    MesClient.setMenuStatus("请求失败,请重试",-1);
+                }else{
+                    if(retObj.get("result").toString().equalsIgnoreCase("false")){
+                        MesClient.setMenuStatus(retObj.getString("message"),-1);
+                    }
+                }
+            }
+        }
+    }
+
+    public static void bindBatchPanel(){
+        JPanel indexPanelBB = new JPanel();
+        JPanel panel = new JPanel();
+        panel.setBounds(0, 0, 990, 550);
+//        panel.setBounds(81, 50, 810, 479);
+        indexPanelBB.add(panel);
+
+        panel.setLayout(new GridLayout(0, 1, 0, 0));
+        table = new JTable(rowData, columnNames){
+            public boolean isCellEditable(int row, int column) {
+                if(column == 3){
+                    return true;
+                }
+                return false;
+            }
+        };
+        table.setRowHeight(40);
+        table.setEnabled(true);
+        table.setFont(new Font("微软雅黑", Font.PLAIN, 14));
+
+        table.getColumnModel().getColumn(3).setCellRenderer(new TableCellRendererButton());
+        table.getColumnModel().getColumn(3).setCellEditor(new TableCellEditorButton());
+
+
+        JScrollPane scrollPane = new JScrollPane(table);
+        panel.add(scrollPane);
+
+        JScrollPane indexScrollPaneB = new JScrollPane(indexPanelBB);
+        indexPanelBB.setLayout(null);
+        tabbedPane.addTab("绑定物料", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), indexScrollPaneB, null);
+    }
+}
+

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

@@ -0,0 +1,155 @@
+package com.mes.ui;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.mes.netty.ProtocolParam;
+import com.mes.component.MyDialog;
+import com.mes.util.ErrorMsg;
+import com.mes.util.HttpUtils;
+import com.mes.util.SerialPortUtils;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class MesRevice {
+
+//     质量查询
+    public static void checkQualityRevice(String processMsgRet,String mes_msg){
+        try{
+//            String lmsg = "该工件本工位不可加工";
+//            MesClient.status_menu.setText(lmsg);
+//            new MyDialog(MesClient.mesClientFrame,"提示",lmsg);
+            if(processMsgRet.equalsIgnoreCase("UD")) {
+                MesClient.status_menu.setForeground(Color.GREEN);
+                MesClient.check_quality_result = true;//质量合格,可以绑定加工
+                MesClient.status_menu.setText("该工件可以加工");
+                if(MesClient.work_status == 0 ){
+                    String barcode36 = MesClient.getBarcode(MesClient.product_sn.getText());//处理36为码
+                    MesClient.getUser();
+                    DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20);
+                }
+            }else {
+                MesClient.check_quality_result = false;
+                String lmsg = ErrorMsg.getErrorMsg(processMsgRet, ProtocolParam.getLx(mes_msg));
+                MesClient.setMenuStatus(lmsg,-1);
+                MesClient.status_menu.setText(lmsg);
+//                new MyDialog(MesClient.mesClientFrame,"提示",lmsg);
+            }
+            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);
+
+//                String sn = MesClient.getBarcode(MesClient.product_sn.getText());
+//                MesClient.getUser();
+//                DataUtil.bindUser(MesClient.nettyClient,sn,MesClient.user20);
+
+                try {
+                    String result = HttpUtils.sendRequest("http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesBatchSn/getBatchSn?lineSn="+MesClient.mes_line_sn);
+
+                    JSONObject ret = JSON.parseObject(result);
+                    String TF = ret.getString("result");
+                    if (Boolean.parseBoolean(TF)){
+                        String batchSn = ret.getJSONObject("data").getString("batchSn");
+                        if(!batchSn.isEmpty()){
+                            MesClient.batch_sn_bt.setEnabled(false);
+                            MesClient.batch_sn_text.setText(batchSn);
+                            MesClient.finish_ok_bt.setEnabled(true);
+                            MesClient.setMenuStatus("获取包装码成功",0);
+                        }else{
+                            MesClient.batch_sn_bt.setEnabled(true);
+                        }
+                    }else{
+                        MesClient.batch_sn_bt.setEnabled(true);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    MesClient.batch_sn_bt.setEnabled(true);
+                }
+
+//                MesClient.finish_ng_bt.setEnabled(true);
+
+                /*String qret = "OK";
+                Boolean sendret = DataUtil.sendQuality(MesClient.nettyClient,sn,qret,MesClient.user20);
+                if(!sendret){
+//                    MesClient.finish_ok_bt.setEnabled(true);
+//                    MesClient.finish_ng_bt.setEnabled(true);
+                    MesClient.status_menu.setText("结果提交失败,请重试");
+                    JOptionPane.showMessageDialog(MesClient.mesClientFrame,"结果提交失败,请重试","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+                    return;
+                }*/
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    // 绑定
+    public static void bindRevice(String processMsgRet,String mes_msg){
+        try{
+            if(processMsgRet.equalsIgnoreCase("OK")) {
+
+            }else{
+
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    // 解绑
+    public static void unbindRevice(String processMsgRet,String mes_msg){
+        try{
+            if(processMsgRet.equalsIgnoreCase("OK")) {
+
+            }else{
+
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    // 上传质量
+    public static void updateResultRevice(String processMsgRet,String mes_msg){
+        try{
+            if(processMsgRet.equalsIgnoreCase("OK")) {
+
+                MesClient.resetScanA();
+//                MesClient.status_menu.setText("结果提交成功,请扫下一件");
+                MesClient.setMenuStatus("结果提交成功,请扫下一件",0);
+                MesClient.scan_type = 1;
+                MesClient.scanBarcode();
+
+            }else{
+                MesClient.setMenuStatus("结果提交失败,请重试",-1);
+//                MesClient.status_menu.setText("结果提交失败,请重试");
+//                JOptionPane.showMessageDialog(MesClient.mesClientFrame,"结果提交失败,请重试","提示窗口", JOptionPane.INFORMATION_MESSAGE);
+//                return;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+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[]{
+            "OP070","OP080", "OP100",
+            "OP110", "OP120", "OP130", "OP140", "OP150",
+            "OP160", "OP170", "OP180", "OP190", "OP200",
+            "OP210", "OP220", "OP230", "OP240", "OP250",
+            "OP260", "OP270", "OP280", "OP290", "OP300",
+            "OP310", "OP320", "OP330", "OP340", "OP350",
+            "OP360", "OP370", "OP380", "OP390", "OP400",
+            "OP410", "OP420", "OP430", "OP440", "OP450",
+            "OP460", "OP470", "OP480", "OP490", "OP500",
+            "OP520", "OP510", "OP550"
+    };
+    public static String[] xtoprnodes = new String[]{
+            "右边梁镭雕二维码","左边梁防爆阀拉铆","CMT框架一序焊接",
+            "人工补焊", "框架CMT二序焊接", "人工补焊", "焊道检查", "总成正面CNC",
+            "总成反面CNC", "框架去毛刺+清洁", "封堵片焊接+打磨", "边框气密", "焊道补焊",
+            "框架反面涂胶", "液冷板安装", "正面溢胶清理,补胶", "液冷板激光点固", "液冷板水嘴处焊接",
+            "焊道打磨", "液冷板FSW", "匙孔补焊打磨", "总成反面拉铆", "总成正面拉铆1",
+            "总成正面拉铆2", "边梁套筒涂胶+压合", "箱体封堵", "胶水固化", "半成品气密",
+            "补强板安装", "胶水固化", "拆卸补强板压紧工装", "FSW焊道涂胶+双层拉铆螺母涂胶", "人工抹胶",
+            "胶水固化", "反面部件装配", "底护板装配+底部套筒螺母安装", "底护板螺栓复拧", "总成气密",
+            "液冷板气密", "总成正面装配", "总成清洁", "总成检具检验", "GP12",
+            "CCD", "GP12", "称重"
+    };
+    public static String[] lboprnos = new String[]{
+            "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",
+            "OP120","OP130","OP140","OP150","OP160","OP170","OP180","OP190",
+            "OP200","OP210","OP220"
+    };
+    public static String[] lboprnodes = new String[]{
+            "左右冷板FSW(反面)","左右冷板FSW(正面)","左右冷板正面CNC","左右冷板反面CNC","去毛刺吹铝屑","超声波清洗","冷板FSW堵头反面焊接","冷板FSW堵头正面焊接",
+            "打磨焊道","水嘴自动激光焊","底护板支撑柱+BDU柱+线束支架焊接","冷板气检","冷板总成正面CNC","冷板总成反面CNC","去毛刺吹铝屑,清洁","高压冲洗",
+            "M5+M6钢丝牙套安装","冷板汽检","冷板氦检"
+    };
+    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;
+    }
+}

+ 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;
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.mes.ui;
+
+import javax.swing.*;
+import javax.swing.table.TableCellRenderer;
+import java.awt.*;
+
+public class TableCellRendererButton implements TableCellRenderer {
+    @Override
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
+                                                   int row, int column) {
+        JButton button = new JButton("扫码");
+        return button;
+    }
+}

+ 190 - 0
src/com/mes/ui/Test.java

@@ -0,0 +1,190 @@
+package com.mes.ui;
+
+import javax.bluetooth.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Test {
+    public static void main(String[] args) {
+        try {
+            LocalDevice localDevice = LocalDevice.getLocalDevice();
+            System.out.println("本机地址:" + localDevice.getBluetoothAddress());
+            System.out.println("本机名称:" + localDevice.getFriendlyName());
+
+            DiscoveryAgent agent = localDevice.getDiscoveryAgent();
+            // 用一个列表存储设备信息(地址+名称),这里用字符串拼接,也可自定义类
+            List<String> deviceInfoList = new ArrayList<>();
+
+            agent.startInquiry(DiscoveryAgent.GIAC, new DiscoveryListener() {
+                @Override
+                public void deviceDiscovered(RemoteDevice remoteDevice, DeviceClass deviceClass) {
+                    try {
+                        // 获取设备地址
+                        String address = remoteDevice.getBluetoothAddress();
+                        // 获取设备名称(参数false表示先查缓存,true表示强制询问设备)
+                        String name = remoteDevice.getFriendlyName(false);
+                        // 若名称为空,可标记为“未知设备”
+                        if (name == null || name.trim().isEmpty()) {
+                            name = "未知设备";
+                        }
+                        // 存储地址和名称
+                        deviceInfoList.add("名称: " + name + ",地址: " + address);
+                    } catch (IOException e) {
+                        // 部分设备可能拒绝提供名称,捕获异常
+                        String address = remoteDevice.getBluetoothAddress();
+                        deviceInfoList.add("名称: 获取失败,地址: " + address);
+                        e.printStackTrace();
+                    }
+                }
+
+                @Override
+                public void servicesDiscovered(int i, ServiceRecord[] serviceRecords) {}
+
+                @Override
+                public void serviceSearchCompleted(int i, int i1) {}
+
+                @Override
+                public void inquiryCompleted(int i) {
+                    System.out.println("搜索完成,共发现 " + deviceInfoList.size() + " 个设备:");
+                    for (String deviceInfo : deviceInfoList) {
+                        System.out.println(deviceInfo);
+                    }
+                }
+            });
+
+            // 等待搜索完成(15秒,根据实际情况调整)
+            try {
+                Thread.sleep(15000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+        } catch (BluetoothStateException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
+
+//package com.mes.ui;
+//
+//import javax.bluetooth.*;
+//import javax.microedition.io.Connector;
+//import javax.microedition.io.StreamConnection;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.io.InputStreamReader;
+//import java.io.BufferedReader;
+//
+//public class Test {
+//    // 目标设备地址(在BlueCove中构建URL时需要去掉冒号)
+//    // 0C2369D662BC A088692C088E
+//    private static final String TARGET_DEVICE_ADDRESS = "001135390238";
+//    // 设备服务UUID(需与目标设备的通信服务UUID匹配,例如"00001101000010008000000805F9B34FB"是SPP服务UUID)
+//    private static final String SERVICE_UUID = "00001101000010008000000805F9B34FB";
+//    // 控制循环读取的标志位
+//    private static volatile boolean isRunning = true;
+//
+//    public static void main(String[] args) {
+//        try {
+//            // 初始化本地蓝牙设备
+//            LocalDevice localDevice = LocalDevice.getLocalDevice();
+//            System.out.println("本地蓝牙名称: " + localDevice.getFriendlyName());
+//            System.out.println("本地蓝牙地址: " + localDevice.getBluetoothAddress());
+//
+//            // 注意:在BlueCove库中,RemoteDevice.getRemoteDevice()不接受String参数
+//            // 我们将直接构建蓝牙连接URL并尝试连接
+//            System.out.println("将尝试连接到设备地址: " + TARGET_DEVICE_ADDRESS);
+//            // 为目标设备构建SPP蓝牙连接URL(BlueCove格式,使用标准SPP服务格式)
+//            // BlueCove期望的URL格式: btspp://<蓝牙地址>:<服务通道>;参数
+//            // 对于SPP服务,通常使用通道1
+//            String btsppUrl = "btspp://" + TARGET_DEVICE_ADDRESS + ":1;authenticate=false;encrypt=false;master=false";
+//
+//            // 尝试直接连接到蓝牙设备(使用SPP服务)
+//            // 在一个新线程中执行连接操作,避免阻塞主线程
+//            new Thread(() -> {
+//                try {
+//                    System.out.println("尝试使用SPP协议直接连接到设备...");
+//                    // 直接使用构建的btspp URL进行连接
+//                    connectAndReceiveData(btsppUrl);
+//                } catch (Exception e) {
+//                    System.err.println("连接线程异常: " + e.getMessage());
+//                    e.printStackTrace();
+//                }
+//            }).start();
+//
+//            // 保持主线程存活(通过用户输入终止)
+//            System.out.println("按任意键停止接收数据...");
+//            new java.util.Scanner(System.in).nextLine(); // 阻塞等待用户输入
+//            isRunning = false; // 停止循环读取
+//            System.out.println("程序已停止");
+//
+//        } catch (BluetoothStateException e) {
+//            System.err.println("蓝牙初始化失败: " + e.getMessage());
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    /**
+//     * 建立连接并持续接收数据
+//     */
+//    private static void connectAndReceiveData(String connectionUrl) {
+//        StreamConnection connection = null;
+//        InputStream is = null;
+//        BufferedReader reader = null;
+//
+//        try {
+//            System.out.println("尝试连接到URL: " + connectionUrl);
+//
+//            // 确保连接URL有效
+//            if (connectionUrl == null || !connectionUrl.startsWith("btspp://")) {
+//                System.err.println("无效的蓝牙连接URL,应为btspp://格式");
+//                return;
+//            }
+//
+//            // 建立连接 - 添加额外的类型检查
+//            Object connectionObj = Connector.open(connectionUrl);
+//            if (connectionObj instanceof StreamConnection) {
+//                connection = (StreamConnection) connectionObj;
+//                System.out.println("已成功连接到设备");
+//
+//                // 获取输入流(用于接收数据)
+//                is = connection.openInputStream();
+//                reader = new BufferedReader(new InputStreamReader(is, "UTF-8")); // 按实际编码调整
+//
+//                // 循环读取数据
+//                while (isRunning) {
+//                    // 读取一行数据(若设备发送二进制数据,需用is.read(byte[])处理)
+//                    String data = reader.readLine();
+//                    if (data != null) {
+//                        System.out.println("收到数据: " + data);
+//                    } else {
+//                        // 读取到null表示连接已断开
+//                        System.out.println("设备已断开连接");
+//                        break;
+//                    }
+//                }
+//            } else {
+//                System.err.println("无法将连接对象转换为StreamConnection类型");
+//                System.err.println("实际类型: " + (connectionObj != null ? connectionObj.getClass().getName() : "null"));
+//            }
+//
+//        } catch (ClassCastException e) {
+//            System.err.println("类型转换错误: " + e.getMessage());
+//            e.printStackTrace();
+//        } catch (IOException e) {
+//            System.err.println("数据接收异常: " + e.getMessage());
+//            e.printStackTrace();
+//        } finally {
+//            // 关闭资源
+//            try {
+//                if (reader != null) reader.close();
+//                if (is != null) is.close();
+//                if (connection != null) connection.close();
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//            System.out.println("连接已关闭");
+//        }
+//    }
+//}

+ 15 - 0
src/com/mes/util/Base64Utils.java

@@ -0,0 +1,15 @@
+package com.mes.util;
+
+import org.apache.commons.codec.binary.Base64;
+
+public class Base64Utils {
+	public static String getBase64(String str) {
+		// 待编码的二进制数据
+        byte[] binaryData = str.getBytes();
+        // 使用Base64.encodeBase64String进行编码
+        String encodedString = Base64.encodeBase64String(binaryData);
+        // 输出编码后的结果
+        System.out.println("Base64编码结果: " + encodedString);
+        return encodedString;
+	}
+}

+ 151 - 0
src/com/mes/util/BluetoothUtils.java

@@ -0,0 +1,151 @@
+package com.mes.util;
+
+import com.mes.ui.MesClient;
+
+import javax.bluetooth.*;
+import javax.microedition.io.Connector;
+import javax.microedition.io.StreamConnection;
+import java.io.*;
+
+public class BluetoothUtils {
+    // 目标设备地址 二线:001135390238
+    private static final String TARGET_DEVICE_ADDRESS = "001135390238";
+    // 标志位
+    private static volatile boolean isRunning = true;
+
+    // 【关键修改】将连接对象和流对象提升为静态变量,保持持久化
+    private static StreamConnection connection;
+    private static InputStream is;
+    private static BufferedReader reader;
+
+    public static void init() {
+        try {
+            LocalDevice localDevice = LocalDevice.getLocalDevice();
+            System.out.println("本地蓝牙名称: " + localDevice.getFriendlyName());
+            System.out.println("将尝试连接到设备地址: " + TARGET_DEVICE_ADDRESS);
+
+            String btsppUrl = "btspp://" + TARGET_DEVICE_ADDRESS + ":1;authenticate=false;encrypt=false;master=false";
+
+            // 在新线程中连接,避免阻塞
+            new Thread(() -> {
+                try {
+                    // 如果已经连接,先跳过
+                    if (connection != null && MesClient.com_connect_flag) {
+                        return;
+                    }
+
+                    System.out.println("尝试建立蓝牙连接...");
+                    // 建立连接
+                    connection = (StreamConnection) Connector.open(btsppUrl);
+
+                    // 【关键修改】连接成功后立即初始化流,并保持打开状态
+                    if (connection != null) {
+                        is = connection.openInputStream();
+                        reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+                        MesClient.com_connect_flag = true;
+                        System.out.println("蓝牙连接成功,输入流已就绪");
+                    }
+                } catch (IOException e) {
+                    System.err.println("蓝牙连接失败: " + e.getMessage());
+                    closeConnection(); // 连接失败清理资源
+                }
+            }).start();
+
+        } catch (BluetoothStateException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 接收数据并解析重量 (复用已有的连接和流)
+     */
+    public static String connectAndReceiveData() {
+        // 1. 检查连接状态
+        if (connection == null || reader == null || !MesClient.com_connect_flag) {
+            System.err.println("错误: 蓝牙未连接");
+            return "未连接";
+        }
+
+        try {
+            long startTime = System.currentTimeMillis();
+            long timeout = 2000; // 3秒超时
+
+            // 清空缓冲区旧数据(可选,视称重仪表特性而定)
+            while (reader.ready()) { reader.readLine(); }
+
+            System.out.println("开始读取重量数据...");
+
+            // 2. 循环读取直到超时或获取到数据
+            while ((System.currentTimeMillis() - startTime < timeout)) {
+                // 使用 ready() 避免 readLine() 在没有数据时无限阻塞
+                if (reader.ready()) {
+                    String data = reader.readLine();
+                    if (data != null) {
+                        System.out.println("收到数据: " + data);
+                        String wet = extractWeight(data);
+                        if (wet != null && !wet.equals("")) {
+                            return wet;
+                        }
+                    }
+                } else {
+                    // 没有数据时短暂休眠
+                    Thread.sleep(100);
+                }
+            }
+
+            System.out.println("读取超时");
+            return "超时";
+
+        } catch (IOException | InterruptedException e) {
+            System.err.println("读取数据异常: " + e.getMessage());
+            // 【关键修改】只有在发生真实IO异常时才关闭连接,触发重连
+            closeConnection();
+            return "异常";
+        }
+        // 【关键修改】这里去掉了 finally { close() },确保连接不被切断
+    }
+
+    /**
+     * 关闭蓝牙连接并重置资源
+     */
+    public static void closeConnection() {
+        isRunning = false;
+        MesClient.com_connect_flag = false;
+        try {
+            if (reader != null) {
+                reader.close();
+                reader = null;
+            }
+            if (is != null) {
+                is.close();
+                is = null;
+            }
+            if (connection != null) {
+                connection.close();
+                connection = null;
+            }
+            System.out.println("蓝牙资源已释放");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // 解析重量
+    public static String extractWeight(String input) {
+        if (input == null) return null;
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("\\d+(?:\\.\\d+)?\\s*kg", java.util.regex.Pattern.CASE_INSENSITIVE);
+        java.util.regex.Matcher matcher = pattern.matcher(input);
+        if (matcher.find()) {
+            return matcher.group().trim();
+        }
+        // 如果没有kg单位,尝试直接提取数字(视仪表格式调整)
+        try {
+            // 简单的数字提取备用方案
+            String num = input.replaceAll("[^0-9.]", "");
+            if(!num.isEmpty()) return num + "kg";
+        } catch(Exception e){}
+
+        return "";
+    }
+
+}

+ 34 - 0
src/com/mes/util/DateLocalUtils.java

@@ -0,0 +1,34 @@
+package com.mes.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateLocalUtils {
+	public static SimpleDateFormat DATA_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//璁剧疆鏃ユ湡鏍煎紡
+	public static SimpleDateFormat DATA_FORMAT1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+	
+	
+	public static String getCurrentTime() {
+		String currentTime = DATA_FORMAT.format(new Date());
+		return currentTime;
+	}
+	
+	public static String getCurrentTime1() {
+		String currentTime = DATA_FORMAT1.format(new Date());
+		return currentTime;
+	}
+	
+	//获取当前时间,年月日
+	public static SimpleDateFormat DATA_FORMAT2 = new SimpleDateFormat("yyyy-MM-dd");
+	public static String getCurrentDate() {
+		String currentTime = DATA_FORMAT2.format(new Date());
+		return currentTime;
+	}
+	
+	//获取当前时间,时分秒
+	public static SimpleDateFormat DATA_FORMAT3 = new SimpleDateFormat("HH:mm:ss");
+	public static String getCurrentTimeHMS() {
+		String currentTime = DATA_FORMAT3.format(new Date());
+		return currentTime;
+	}
+}

+ 49 - 0
src/com/mes/util/ErrorMsg.java

@@ -0,0 +1,49 @@
+package com.mes.util;
+
+public class ErrorMsg {
+    public static String getErrorMsg(String processMsgRet,String lx){
+        String lmsg = "该工件本工位不可加工";
+        try{
+            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"+ lx+"0加工NG";
+            }else if(processMsgRet.equalsIgnoreCase("QD")) {
+                lmsg = "该工件OP"+ lx+"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("CS")) {
+                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 = "工件码重复";
+            }else if(processMsgRet.equalsIgnoreCase("SB")) {
+                lmsg = "设备信息不存在";
+            }
+        }catch (Exception e){ }
+        return lmsg;
+    }
+}

+ 131 - 0
src/com/mes/util/HttpUtils.java

@@ -0,0 +1,131 @@
+package com.mes.util;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+public class HttpUtils {
+	/**
+	 * HTTP请求,正确报文解析,并保存数据到生产记录数据
+	 * @return 
+	 * @throws URISyntaxException
+	 */
+    //http post请求
+    public static String sendRequest(String urlParam) {
+		String requestType = "POST";
+        //根据接收内容返回数据结果
+    	String ret = "";
+    	System.out.println(urlParam);
+        HttpURLConnection con = null;
+        BufferedReader buffer = null;
+        StringBuffer resultBuffer = null;
+        try {
+            URL url = new URL(urlParam);
+            //得到连接对象
+            con = (HttpURLConnection) url.openConnection();
+            //设置请求类型
+            con.setRequestMethod(requestType);
+            //设置请求需要返回的数据类型和字符集类型
+            con.setRequestProperty("Content-Type", "application/json;charset=GBK");  
+            //允许写出
+            con.setDoOutput(true);
+            //允许读入
+            con.setDoInput(true);
+            //不使用缓存
+            con.setUseCaches(false);
+            //得到响应码
+            int responseCode = con.getResponseCode();
+            System.out.println("responseCode="+responseCode);
+            if(responseCode == HttpURLConnection.HTTP_OK){
+                //得到响应流
+                InputStream inputStream = con.getInputStream();
+                //将响应流转换成字符串
+                resultBuffer = new StringBuffer();
+                String line;
+                buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+                while ((line = buffer.readLine()) != null) {
+                    resultBuffer.append(line);
+                }
+                System.out.println(resultBuffer.toString());
+                ret = resultBuffer.toString();
+            }else {
+            	//ret = String.valueOf(responseCode);
+            	ret = "false";
+            }
+            con.disconnect();
+        }catch(Exception e) {
+        	//ret = false;
+        	//System.out.println("e.toString()="+e.toString());
+        	//return e.toString();
+            //e.printStackTrace();
+        	ret = "false";
+        }
+        return ret;
+    }
+
+
+    public static String sendPostRequest(String urlParam, String params) {
+        String requestType = "POST";
+        //根据接收内容返回数据结果
+        String ret = "";
+        System.out.println(urlParam);
+        HttpURLConnection con = null;
+        BufferedReader buffer = null;
+        StringBuffer resultBuffer = null;
+        try {
+            URL url = new URL(urlParam);
+            //得到连接对象
+            con = (HttpURLConnection) url.openConnection();
+            //设置请求类型
+            con.setRequestMethod(requestType);
+            //设置请求需要返回的数据类型和字符集类型
+            con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=GBK");
+            //允许写出
+            con.setDoOutput(true);
+            //允许读入
+            con.setDoInput(true);
+            //不使用缓存
+            con.setUseCaches(false);
+
+            // 获取URLConnection对象对应的输出流
+            OutputStreamWriter out = new OutputStreamWriter( con.getOutputStream(),"UTF-8");// utf-8编码
+            // 发送请求参数
+            out.write(params);
+
+            //得到响应码
+            int responseCode = con.getResponseCode();
+            System.out.println("responseCode="+responseCode);
+            if(responseCode == HttpURLConnection.HTTP_OK){
+                //得到响应流
+                InputStream inputStream = con.getInputStream();
+                //将响应流转换成字符串
+                resultBuffer = new StringBuffer();
+                String line;
+                buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+                while ((line = buffer.readLine()) != null) {
+                    resultBuffer.append(line);
+                }
+                System.out.println(resultBuffer.toString());
+                ret = resultBuffer.toString();
+            }else {
+                //ret = String.valueOf(responseCode);
+                ret = "false";
+            }
+            con.disconnect();
+        }catch(Exception e) {
+            //ret = false;
+            //System.out.println("e.toString()="+e.toString());
+            //return e.toString();
+            //e.printStackTrace();
+            ret = "false";
+        }
+        return ret;
+    }
+
+	
+
+}

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


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません