jingbo hai 4 días
pai
achega
bb9aeee158

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

@@ -24,7 +24,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);

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

@@ -368,7 +368,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);
 

+ 6 - 6
src/com/mes/ui/OprnoUtil.java

@@ -29,14 +29,14 @@ public class OprnoUtil {
             "液冷板气密", "总成正面装配", "总成清洁", "总成检具检验", "GP12",
             "CCD", "GP12", "称重"
     };
-    public static String[] lboprnos = new String[]{
+    public static String[] oprnos = new String[]{
             "OP040", "OP050", "OP060", "OP070", "OP080",
             "OP090", "OP100", "OP110", "OP120", "OP130",
             "OP140", "OP150"
     };
-    public static String[] lboprnodes = new String[]{
+    public static String[] oprnodes = new String[]{
             "镭雕二维码", "底护板封堵片焊接", "底护板FSW", "焊道打磨", "底板反面CNC",
-            "底护板清洁", "底护板粘贴底部钢板", "底护板封堵+刮胶", "底护板静置封堵胶固化", "底护板清洁",
+            "底护板清洁", "底护板粘贴底部钢板", "白件气密检测", "底护板静置封堵胶固化", "底护板清洁",
             "底护板粘贴底部泡棉缓冲垫+保温板", "终检"
     };
     public static String getGwDes(String lineSn,String oprno){
@@ -51,11 +51,11 @@ public class OprnoUtil {
                 }
                 i++;
             }
-        }else if(lineSn.equals("LB")){
+        }else if(lineSn.equals("115XT")){
             int i = 0;
-            for (String gw:lboprnos){
+            for (String gw:oprnos){
                 if(gw.equals(oprno)){
-                    des = lboprnodes[i];
+                    des = oprnodes[i];
                     break;
                 }
                 i++;

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

@@ -1,7 +1,7 @@
-mes.gw=OP190B
+mes.gw=OP110A
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.9.180
-mes.line_sn=HEVXT
+mes.line_sn=115XT
 mes.csyq=comso
 # 设备状态定时上报间隔(分钟)
 mes.device.heartbeat.minutes=5