jingbo hace 6 meses
padre
commit
d7accc4c78
Se han modificado 2 ficheros con 4 adiciones y 2 borrados
  1. 3 2
      src/com/mes/ui/MesClient.java
  2. 1 0
      src/com/mes/ui/MesRevice.java

+ 3 - 2
src/com/mes/ui/MesClient.java

@@ -293,7 +293,7 @@ public class MesClient extends JFrame {
         // 标签宽度设置
         int labelWidth = 120;
         // 按钮宽度
-        int buttonWidth = 60;
+        int buttonWidth = 100;
         // 输入框和按钮之间的间距
         int gapBetweenFieldAndButton = 5;
         // 调整后的输入框宽度(为按钮腾出空间)
@@ -340,7 +340,7 @@ public class MesClient extends JFrame {
             oprnoTextFieldMap.put(oprnoCode, textField);
 
             // 4. 创建刷新按钮
-            JButton refreshButton = new JButton("刷新");
+            JButton refreshButton = new JButton("手动上料");
             refreshButton.setFont(new Font("SimHei", Font.PLAIN, 12));
             refreshButton.setBounds(labelWidth + adjustedTextFieldWidth + gapBetweenFieldAndButton, fieldY, buttonWidth, TEXT_FIELD_HEIGHT);
             refreshButton.setToolTipText("刷新工位:" + oprnoCode);
@@ -354,6 +354,7 @@ public class MesClient extends JFrame {
                     String inputValue = textField.getText();
                     // 打印工位号和输入框内容
                     System.out.println("工位号:" + currentOprnoCode + ", 输入内容:" + inputValue);
+                    s7PLC.writeBoolean(oprnoMap.get(currentOprnoCode).getMes_in(),true);
                 }
             });
 

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

@@ -103,6 +103,7 @@ public class MesRevice {
                 Oprno oprno1 = MesClient.oprnoMap.get(oprno);
                 // 发送允许下料信号
                 MesClient.s7PLC.writeBoolean(oprno1.getMes_out(),true);
+                MesClient.s7PLC.writeBoolean(oprno1.getProcess_ok(),false);
             }else{
                 MesClient.setMenuStatus("结果提交失败,请重试",-1);
             }