|
|
@@ -414,39 +414,7 @@ public class MesClient extends JFrame {
|
|
|
}
|
|
|
|
|
|
public static void initWarehouseData(){
|
|
|
- resetScanA();
|
|
|
resetScanB();
|
|
|
-
|
|
|
-// PlcUtil.changeEnable(s7PLC,false);
|
|
|
- }
|
|
|
-
|
|
|
- public static void resetScanA() {
|
|
|
- work_status = 0;
|
|
|
- check_quality_result = false;
|
|
|
- MesClient.finish_ok_bt.setEnabled(true);
|
|
|
- MesClient.mesQualityFlagA = false;
|
|
|
- product_sn.setText("");
|
|
|
-
|
|
|
- MesClient.pxstatus1.setText("A");
|
|
|
- MesClient.param1.setText("");
|
|
|
- MesClient.param2.setText("");
|
|
|
- MesClient.param3.setText("");
|
|
|
- MesClient.param4.setText("");
|
|
|
- MesClient.param5.setText("");
|
|
|
-
|
|
|
- MesClient.param21.setText("");
|
|
|
- MesClient.param22.setText("");
|
|
|
- MesClient.param23.setText("");
|
|
|
- MesClient.param24.setText("");
|
|
|
- MesClient.param25.setText("");
|
|
|
- MesClient.curFlag = "";
|
|
|
- MesClient.curSna = "";
|
|
|
- MesClient.tjFlaga = 0;
|
|
|
- PlcUtil.changeEnable(s7PLC, false, "A");
|
|
|
-
|
|
|
- updateMaterailData(); // 更新物料
|
|
|
-
|
|
|
- shiftUserCheck();
|
|
|
}
|
|
|
|
|
|
public static int userLoginHours;//用户登录所处小时
|
|
|
@@ -598,18 +566,6 @@ public class MesClient extends JFrame {
|
|
|
});
|
|
|
settingMenu.add(resetTcpMenu);
|
|
|
|
|
|
- JMenuItem resetTcpMenu_1 = new JMenuItem("\u91CD\u65B0\u626B\u7801-A");
|
|
|
- resetTcpMenu_1.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
|
|
|
- resetTcpMenu_1.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 20));
|
|
|
- resetTcpMenu_1.addMouseListener(new MouseAdapter() {
|
|
|
- @Override
|
|
|
- public void mousePressed(MouseEvent e) {
|
|
|
- super.mouseClicked(e);
|
|
|
- resetScanA();
|
|
|
- }
|
|
|
- });
|
|
|
- settingMenu.add(resetTcpMenu_1);
|
|
|
-
|
|
|
JMenuItem resetTcpMenu_1_1 = new JMenuItem("\u91CD\u65B0\u626B\u7801-B");
|
|
|
resetTcpMenu_1_1.setIcon(new ImageIcon(MesClient.class.getResource("/bg/reset_logo.png")));
|
|
|
resetTcpMenu_1_1.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 20));
|