hzd пре 6 дана
родитељ
комит
743464fe4f
1 измењених фајлова са 9 додато и 7 уклоњено
  1. 9 7
      src/com/mes/ui/MesClient.java

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

@@ -401,7 +401,7 @@ public class MesClient extends JFrame {
     public static void initWarehouseData(){
         resetScanA();
         resetScanB();
-
+        PlcUtil.changeEnable(s7PLC,false);
     }
 
     public static void resetScanA() {
@@ -412,7 +412,7 @@ public class MesClient extends JFrame {
         product_sn.setText("");
         MesClient.pxstatus1.setText("A");
 
-        PlcUtil.changeEnable(s7PLC,false);
+//        PlcUtil.changeEnable(s7PLC,false);
 
         MesClient.param1.setText("");
         MesClient.param2.setText("");
@@ -441,7 +441,7 @@ public class MesClient extends JFrame {
 
         updateMaterailData(); // 更新物料
 
-        shiftUserCheck();
+//        shiftUserCheck();
     }
 
     public static int userLoginHours;//用户登录所处小时
@@ -475,7 +475,7 @@ public class MesClient extends JFrame {
         MesClient.mesQualityFlagB = false;
         product_sn2.setText("");
 
-        PlcUtil.changeEnable(s7PLC,false);
+//        PlcUtil.changeEnable(s7PLC,false);
 
         MesClient.pxstatus2.setText("B");
         MesClient.param1.setText("");
@@ -605,6 +605,7 @@ public class MesClient extends JFrame {
             public void mousePressed(MouseEvent e) {
                 super.mouseClicked(e);
                 resetScanA();
+                PlcUtil.changeEnable(s7PLC,false);
             }
         });
         settingMenu.add(resetTcpMenu_1);
@@ -617,6 +618,7 @@ public class MesClient extends JFrame {
             public void mousePressed(MouseEvent e) {
                 super.mouseClicked(e);
                 resetScanB();
+                PlcUtil.changeEnable(s7PLC,false);
             }
         });
         settingMenu.add(resetTcpMenu_1_1);
@@ -640,7 +642,7 @@ public class MesClient extends JFrame {
 //                }
             }
         });
-        settingMenu.add(resetTcpMenu_1sd);
+//        settingMenu.add(resetTcpMenu_1sd);
 
         JMenuItem resetTcpMenu_1_1sd = new JMenuItem("手动提交-B");
         resetTcpMenu_1_1sd.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
@@ -659,7 +661,7 @@ public class MesClient extends JFrame {
 //                }
             }
         });
-        settingMenu.add(resetTcpMenu_1_1sd);
+//        settingMenu.add(resetTcpMenu_1_1sd);
 
         contentPane = new JPanel();
         contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
@@ -902,7 +904,7 @@ public class MesClient extends JFrame {
         finish_ng_bt2.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 32));
         finish_ng_bt2.setBounds(780, 380, 160, 80);
         finish_ng_bt2.setEnabled(false);
-        indexPanelA.add(finish_ng_bt2);
+//        indexPanelA.add(finish_ng_bt2);
 
         JLabel lblNewLabel = new JLabel("电压");
         lblNewLabel.setHorizontalAlignment(SwingConstants.RIGHT);