src/com/mes/ui/MesClient.java

@@ -135,7 +135,7 @@ public class MesClient extends JFrame {
     public static JPanel indexPanelC;
     public static MesWebView jfxPanel2 = null;
 
-    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "10.88.10.240"); //100 B工位
+    public static S7PLC s7PLC = new S7PLC(EPlcType.S1200, "192.168.7.100"); //100 B工位
 
     public static List<String> hjparams = new ArrayList<>();
 
@@ -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("");
@@ -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);
@@ -628,10 +630,10 @@ public class MesClient extends JFrame {
             @Override
             public void mousePressed(MouseEvent e) {
                 super.mouseClicked(e);
-                finish_ok_bt.setEnabled(true);
-                finish_ng_bt.setEnabled(true);
+//                finish_ok_bt.setEnabled(true);
+//                finish_ng_bt.setEnabled(true);
 //                MesClient.finish_ok_bt.setEnabled(true);
-//                if(MesClient.work_status == 1){
+//                if(MesClient.mesQualityFlagA == 1){
 //                    Boolean sendret = DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn.getText(),"OK",MesClient.user20,"A");
 //                    if(!sendret){
 //                        MesClient.pxstatus1.setText("A:结果上传MES失败");
@@ -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);

src/com/mes/ui/MesRevice.java

@@ -18,19 +18,19 @@ public class MesRevice {
                 String oprno = ProtocolParam.getOprno(mes_msg).trim();
                 String sn = ProtocolParam.getSn(mes_msg).trim();
                 System.out.println(":"+oprno);
-                if(oprno.equals("OP070A")){
+                if(oprno.equals("OP110A")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }else if(oprno.equals("OP070B")){
+                }else if(oprno.equals("OP110B")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");
-                }else if(oprno.equals("OP070C")){
+                }else if(oprno.equals("OP110C")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"A");
-                }else if(oprno.equals("OP070D")){
+                }else if(oprno.equals("OP110D")){
                     String barcode36 = MesClient.getBarcode(sn);//处理36为码
                     MesClient.getUser();
                     DataUtil.startWork(MesClient.nettyClient,barcode36,MesClient.user20,"B");

src/com/mes/ui/OprnoUtil.java

@@ -19,7 +19,7 @@ public class OprnoUtil {
 
     public static String[] xtoprnodes = new String[]{
             "镭雕二维码", "前边梁小总成（焊接）", "前边梁小总成（拉铆）+右边梁小总成（拉铆）", "前边梁小总成气密", "前边梁小总成/左边梁小总成压铆",
-            "前边梁小总成/左边梁小总成涂胶", "框架CMT焊接", "人工补焊", "焊道铣削", "焊道缺陷检验",
+            "前边梁小总成/左边梁小总成涂胶", "框架CMT焊接", "框架CMT焊接", "焊道铣削", "焊道缺陷检验",
             "框架气密", "总成正面CNC", "总成反面CNC", "框架清洁", "框架涂胶+液冷板安装",
             "反面铆接", "激光点焊", "水冷板FSW", "清除FSW飞边", "TIG焊接水嘴",
             "TIG补焊尾孔+封堵片焊接", "总成清洁+涂封堵胶", "涂胶+压套筒", "胶水固化", "正面装配",

src/com/mes/ui/PlcUtil.java

@@ -273,7 +273,7 @@ public class PlcUtil {
     public static Boolean changeEnable(S7PLC s7PLC,Boolean result){
         try{
             //DB9.21.7 A//DB9.26.4 B
-            s7PLC.writeBoolean("DB0.DBX23.7",result);
+            s7PLC.writeBoolean("DB9.26.4",result);
 //            s7PLC.writeBoolean("DB9.21.7",result);
             return true;
         }catch (Exception e){

src/resources/config/config.properties

@@ -1,4 +1,4 @@
-mes.gw=OP100A
+mes.gw=OP110
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.22.99
 mes.tcp_port=3000