jingbo 2 週間 前
親
コミット
23036077d5

+ 5 - 2
src/com/mes/ui/DataUtil.java

@@ -216,10 +216,13 @@ public class DataUtil {
             connection.setReadTimeout(60000);
             connection.setDoOutput(true);
             connection.setDoInput(true);
-            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            // 必须显式指定 UTF-8:打包成 exe 后 Windows JVM 默认编码是 GBK,
+            // 若使用 param.getBytes()(无字符集),中文参数会按 GBK 发出,服务端按 UTF-8 解析即乱码。
+            // 点检走 WebView 浏览器提交,本身就是 UTF-8,所以点检不受影响。
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
             connection.setRequestProperty("Authorization", "Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0");
             os = connection.getOutputStream();
-            os.write(param.getBytes());
+            os.write(param.getBytes("UTF-8"));
             if (connection.getResponseCode() == 200) {
                 is = connection.getInputStream();
                 br = new BufferedReader(new InputStreamReader(is, "UTF-8"));

+ 3 - 3
src/com/mes/ui/LoginFarme.java

@@ -22,7 +22,7 @@ public class LoginFarme extends JFrame {
     static JButton scanLoginButton = new JButton("扫  码  登  录");
 
     public LoginFarme(){
-        setTitle("MES系统客户端:"+MesClient.mes_gw+" - "+MesClient.mes_gw_des);
+        setTitle("MES系统客户端115:"+MesClient.mes_gw+" - "+MesClient.mes_gw_des);
 
         ImageIcon bg = new ImageIcon(MesClient.class.getResource("/background.png"));
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -45,11 +45,11 @@ public class LoginFarme extends JFrame {
         userPasswordLabel.setBounds(300, 150, 120, 40);
         userPasswordLabel.setFont(new java.awt.Font("Dialog",   1,   16));
         userNameTxt = new JTextField(20);
-        userNameTxt.setText("system");
+        userNameTxt.setText("");
         userNameTxt.setBounds(400, 105, 150, 30);
         userPasswordTxt = new JPasswordField(20);
         userPasswordTxt.setBounds(400, 155, 150, 30);
-        userPasswordTxt.setText("Aa111111");
+        userPasswordTxt.setText("");
         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")));

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

@@ -351,7 +351,7 @@ public class MesClient extends JFrame {
 
     public MesClient() {
         setIconImage(Toolkit.getDefaultToolkit().getImage(MesClient.class.getResource("/bg/logo.png")));
-        setTitle("MES系统客户端:"+mes_gw + "- " + mes_gw_des);
+        setTitle("MES系统客户端115:"+mes_gw + "- " + mes_gw_des);
 //        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setBounds(0, 0, 1024, 768);
 

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

@@ -38,6 +38,16 @@ public class OprnoUtil {
             "底护板清洁", "底护板粘贴底部钢板", "底护板封堵+刮胶", "底护板静置封堵胶固化", "底护板清洁",
             "底护板粘贴底部泡棉缓冲垫+保温板", "终检"
     };
+    public static String[] oprnos = new String[]{
+            "OP010", "OP050", "OP060", "OP070", "OP080",
+            "OP090", "OP100", "OP110", "OP120", "OP130",
+            "OP140", "OP150"
+    };
+    public static String[] oprnodes = new String[]{
+            "镭雕二维码", "底护板封堵片焊接", "底护板FSW", "焊道打磨", "底板反面CNC",
+            "底护板清洁", "底护板粘贴底部钢板", "底护板封堵+刮胶", "底护板静置封堵胶固化", "底护板清洁",
+            "底护板粘贴底部泡棉缓冲垫+保温板", "终检"
+    };
     public static String getGwDes(String lineSn,String oprno){
         String des = "";
         oprno = formatOprno(oprno);
@@ -59,6 +69,15 @@ public class OprnoUtil {
                 }
                 i++;
             }
+        } else if (lineSn.equals("115XT")) {
+            int i = 0;
+            for (String gw:oprnos){
+                if(gw.equals(oprno)){
+                    des = oprnodes[i];
+                    break;
+                }
+                i++;
+            }
         }
         return des;
     }

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

@@ -1,4 +1,4 @@
 mes.gw=OP010A
 mes.server_ip=127.0.0.1
 #mes.server_ip=192.168.9.180
-mes.line_sn=HEVXT
+mes.line_sn=115XT