wangxichen il y a 3 semaines
Parent
commit
1ff01ddb32
2 fichiers modifiés avec 7 ajouts et 2 suppressions
  1. 6 1
      src/com/mes/ui/LoginFarme.java
  2. 1 1
      src/resources/config/config.properties

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

@@ -187,7 +187,12 @@ public class LoginFarme extends JFrame {
                     MesClient.mesClientFrame.setVisible(true);
 
                     if(MesClient.jfxPanel == null){
-                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProductRecord/work?ucode="+user_id+"&oprno="+MesClient.mes_gw+MesClient.mes_gwflag+"&lineSn="+MesClient.mes_line_sn;
+                        // 双工位传递dualStation=true参数
+                        String dualStationParam = "";
+                        if(!MesClient.mes_gwflag.isEmpty()){
+                            dualStationParam = "&dualStation=true";
+                        }
+                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProductRecord/work?ucode="+user_id+"&oprno="+MesClient.mes_gw+MesClient.mes_gwflag+"&lineSn="+MesClient.mes_line_sn+dualStationParam;
                         MesClient.jfxPanel = new MesWebView(url);
                         MesClient.jfxPanel.setSize(990, 550);
                         MesClient.indexPanelB.add(MesClient.jfxPanel);

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

@@ -4,4 +4,4 @@ mes.server_ip=192.168.113.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT
-mes.gwflag=B
+mes.gwflag=A