wangxichen 2 dienas atpakaļ
vecāks
revīzija
d10379534f
1 mainītis faili ar 39 papildinājumiem un 1 dzēšanām
  1. 39 1
      src/com/mes/ui/MesClient.java

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

@@ -144,6 +144,7 @@ public class MesClient extends JFrame {
     // 顶部扫码区(参考 OP60)
     public static JTextField scanTextField;        // 扫码输入框
     public static JLabel scanCurSideLabel;         // 当前上料面标签
+    public static JButton manualUnloadButton;      // 手动下料按钮
     public static String lastSideAtLoad = "";      // 上次检测到的上料面
 
     public static void main(String[] args) {
@@ -497,6 +498,32 @@ public class MesClient extends JFrame {
         }
     }
 
+    /**
+     * 手动下料(解锁转台)
+     */
+    public static void manualUnload() {
+        try {
+            if (laserDevice == null || !laserDevice.isConnected()) {
+                setMenuStatus("设备未连接", -1);
+                return;
+            }
+
+            // 写#1590=1允许转台旋转
+            boolean ret = laserDevice.writeMesEnable(1);
+            if (ret) {
+                log.info("手动下料:写入#1590=1,允许转台旋转(操作员:{})", user_menu.getText());
+                setMenuStatus("已允许转台旋转", 0);
+            } else {
+                log.error("手动下料:写入#1590=1失败");
+                setMenuStatus("允许转台失败", -1);
+            }
+
+        } catch (Exception e) {
+            log.error("手动下料异常", e);
+            setMenuStatus("操作失败", -1);
+        }
+    }
+
     public static void logoff() {
         welcomeWin.setVisible(true);
         mesClientFrame.setVisible(false);
@@ -677,7 +704,7 @@ public class MesClient extends JFrame {
         scanTextField = new JTextField("");
         scanTextField.setHorizontalAlignment(SwingConstants.LEFT);
         scanTextField.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 22));
-        scanTextField.setBounds(280, 15, 683, 50);
+        scanTextField.setBounds(280, 15, 550, 50);
         scanTextField.setColumns(10);
         scanTextField.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -686,6 +713,17 @@ public class MesClient extends JFrame {
         });
         indexPanelA.add(scanTextField);
 
+        // 手动下料按钮
+        manualUnloadButton = new JButton("手动下料");
+        manualUnloadButton.setFont(new Font("微软雅黑", Font.PLAIN, 20));
+        manualUnloadButton.setBounds(845, 15, 120, 50);
+        manualUnloadButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                manualUnload();
+            }
+        });
+        indexPanelA.add(manualUnloadButton);
+
         // ========== A面区域 ==========
         pxstatus1 = new JLabel("A");
         pxstatus1.setForeground(new Color(255, 128, 64));