dkk 6 天之前
父节点
当前提交
5f5b178549
共有 4 个文件被更改,包括 19 次插入2 次删除
  1. 7 0
      src/com/mes/ui/LoginFarme.java
  2. 9 0
      src/com/mes/ui/MesClient.java
  3. 2 2
      src/com/mes/ui/MesRevice.java
  4. 1 0
      src/com/mes/ui/PlcUtil.java

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

@@ -193,6 +193,13 @@ public class LoginFarme extends JFrame {
                         MesClient.indexPanelB.add(MesClient.jfxPanel);
                     }
 
+                    if(MesClient.jfxPanel2 == null){
+                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProcessCheckRecord/ulist?ucode="+user_id+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
+                        MesClient.jfxPanel2 = new MesWebView(url);
+                        MesClient.jfxPanel2.setSize(990, 550);
+                        MesClient.indexPanelC.add(MesClient.jfxPanel2);
+                    }
+
 //                    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);

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

@@ -67,6 +67,7 @@ public class MesClient extends JFrame {
     public static JScrollPane indexScrollPaneB;
     public static JScrollPane searchScrollPane;
     public static JScrollPane searchScrollPaneGz;
+    public static JScrollPane  searchScrollPaneDj;
 
     public static Boolean check_quality_result = false;
     public static Integer work_status = 0;
@@ -127,7 +128,9 @@ public class MesClient extends JFrame {
     public static JFrame welcomeWin;
 
     public static JPanel indexPanelB;
+    public static JPanel indexPanelC;
     public static MesWebView jfxPanel = null;
+    public static MesWebView jfxPanel2 = null;
     public static MesRadio mesRadioHj;
 
     public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "10.85.10.131"); //100 AB工位
@@ -1373,6 +1376,12 @@ public class MesClient extends JFrame {
 
         tabbedPane.addTab("工作记录", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPane, 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);
+
 //        bindBatchPanel();
     }
 

+ 2 - 2
src/com/mes/ui/MesRevice.java

@@ -22,11 +22,11 @@ public class MesRevice {
                 String oprno = ProtocolParam.getOprno(mes_msg).trim();
                 String sn = currentSn;
                 System.out.println(":"+oprno);
-                if(oprno.equals("OP090A")){
+                if(oprno.equals("OP080A")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }else if(oprno.equals("OP090B")){
+                }else if(oprno.equals("OP080B")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");

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

@@ -282,6 +282,7 @@ public class PlcUtil {
         try{
             // DB9.26.4 A B
             System.out.println("调用允许启动");
+            System.out.println(result);
             s7PLC.writeBoolean("DB9.25.7",result);
 //            s7PLC.writeBoolean("DB9.21.7",result);
             return true;