cmt

src/com/mes/ui/DataUtil.java

@@ -159,6 +159,16 @@ public class DataUtil {
 //        }
 //    }
 
+    public static String resolvePanelOprno(String op) {
+        if ("A".equals(op) || MesClient.PANEL_LABEL_A.equals(op)) {
+            return MesClient.PANEL_OPR_A;
+        }
+        if ("B".equals(op) || MesClient.PANEL_LABEL_B.equals(op)) {
+            return MesClient.PANEL_OPR_B;
+        }
+        return null;
+    }
+
     public static Boolean sendMessage(NettyClient nettyClient,String msgType,String craft,String lx,String sn,String result,String user,String paramNums,String params,String op){
         try{
             String enconding = "UTF-8";
@@ -167,15 +177,20 @@ public class DataUtil {
             BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
             pro.load(br);
 
-            if(MesClient.mes_gwflag.equals("B")){
-                if(op.equals("A")){
+            String panelOprno = resolvePanelOprno(op);
+            String gw;
+            if (panelOprno != null) {
+                gw = "GW" + rightPad(panelOprno, 6);
+            } else if (MesClient.mes_gwflag.equals("B")) {
+                if (op.equals("A")) {
                     op = "C";
-                }else{
+                } else {
                     op = "D";
                 }
+                gw = "GW" + rightPad(pro.getProperty("mes.gw") + op, 6);
+            } else {
+                gw = "GW" + rightPad(pro.getProperty("mes.gw") + op, 6);
             }
-
-            String gw = "GW"+rightPad(pro.getProperty("mes.gw")+op, 6);
             String start = "aaaabbbbbABW";
             String gy = "GY" + rightPad(craft, 6);
             String reslx = "LX" + rightPad(lx, 2);
@@ -294,18 +309,9 @@ public class DataUtil {
             BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
             pro.load(br);
             String mes_server_ip = pro.getProperty("mes.server_ip");
-            String mes_gw = pro.getProperty("mes.gwflag").trim();
-            String oprno = pro.getProperty("mes.gw").trim();
             List<String> oprnos = new ArrayList<>();
-            if ("A".equals(mes_gw)){
-                oprnos.add(oprno+"A");
-                oprnos.add(oprno+"B");
-            }else if ("B".equals(mes_gw)){
-                oprnos.add(oprno+"C");
-                oprnos.add(oprno+"D");
-            }else {
-                return null;
-            }
+            oprnos.add(MesClient.PANEL_OPR_A);
+            oprnos.add(MesClient.PANEL_OPR_B);
             String oprnosStr = JSONObject.toJSONString(oprnos);
             String lineSn = pro.getProperty("mes.line_sn").trim();
             String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProcessCheckRecord/addCheck2";

src/com/mes/ui/MesClient.java

@@ -55,6 +55,11 @@ public class MesClient extends JFrame {
     public static String mes_line_sn = "";
     public static String mes_gwflag = ""; // 工位标识
 
+    public static final String PANEL_LABEL_A = "100D";
+    public static final String PANEL_LABEL_B = "120D";
+    public static final String PANEL_OPR_A = "OP100D";
+    public static final String PANEL_OPR_B = "OP120D";
+
     public static NettyClient nettyClient;
     public static boolean tcp_connect_flag = false;
     public static boolean connect_request_flag = false;
@@ -417,7 +422,7 @@ public class MesClient extends JFrame {
         MesClient.finish_ok_bt.setEnabled(false);
         MesClient.mesQualityFlagA = false;
         product_sn.setText("");
-        MesClient.pxstatus1.setText("A");
+        MesClient.pxstatus1.setText(PANEL_LABEL_A);
 
         MesClient.param1.setText("");
         MesClient.param2.setText("");
@@ -480,7 +485,7 @@ public class MesClient extends JFrame {
         MesClient.mesQualityFlagB = false;
         product_sn2.setText("");
 
-        MesClient.pxstatus2.setText("B");
+        MesClient.pxstatus2.setText(PANEL_LABEL_B);
         MesClient.param1.setText("");
         MesClient.param2.setText("");
         MesClient.param3.setText("");
@@ -776,11 +781,11 @@ public class MesClient extends JFrame {
                     String qret = "OK";
                     Boolean sendret = DataUtil.sendQuality(nettyClient,sn,qret,user20,"A");
                     if(!sendret){
-                        MesClient.pxstatus1.setText("A:结果上传MES失败");
+                        MesClient.pxstatus1.setText(PANEL_LABEL_A + ":结果上传MES失败");
                         MesClient.tjStatusa = 1;
                     }else{
-                        MesClient.pxstatus1.setText("A:提交成功");
-                        MesClient.status_menu.setText("A件提交成功");
+                        MesClient.pxstatus1.setText(PANEL_LABEL_A + ":提交成功");
+                        MesClient.status_menu.setText(PANEL_LABEL_A + "件提交成功");
                         MesClient.resetScanA();
                     }
                 }
@@ -817,11 +822,11 @@ public class MesClient extends JFrame {
                     String qret = "OK";
                     Boolean sendret = DataUtil.sendQuality(nettyClient,sn,qret,user20,"B");
                     if(!sendret){
-                        MesClient.pxstatus2.setText("B:结果上传MES失败");
+                        MesClient.pxstatus2.setText(PANEL_LABEL_B + ":结果上传MES失败");
                         MesClient.tjStatusb = 1;
                     }else{
-                        MesClient.pxstatus2.setText("B:提交成功");
-                        MesClient.status_menu.setText("B件提交成功");
+                        MesClient.pxstatus2.setText(PANEL_LABEL_B + ":提交成功");
+                        MesClient.status_menu.setText(PANEL_LABEL_B + "件提交成功");
                         MesClient.resetScanB();
                     }
                 }
@@ -850,11 +855,11 @@ public class MesClient extends JFrame {
                     String qret = "OK";
                     Boolean sendret = DataUtil.sendQuality(nettyClient,sn,qret,user20,"B");
                     if(!sendret){
-                        MesClient.pxstatus2.setText("B:结果上传MES失败");
+                        MesClient.pxstatus2.setText(PANEL_LABEL_B + ":结果上传MES失败");
                         MesClient.tjStatusb = 1;
                     }else{
-                        MesClient.pxstatus2.setText("B:提交成功");
-                        MesClient.status_menu.setText("B件提交成功");
+                        MesClient.pxstatus2.setText(PANEL_LABEL_B + ":提交成功");
+                        MesClient.status_menu.setText(PANEL_LABEL_B + "件提交成功");
                         MesClient.resetScanB();
                     }
                 }
@@ -891,11 +896,11 @@ public class MesClient extends JFrame {
                     String qret = "NG";
                     Boolean sendret = DataUtil.sendQuality(nettyClient,sn,qret,user20,"B");
                     if(!sendret){
-                        MesClient.pxstatus2.setText("B:结果上传MES失败");
+                        MesClient.pxstatus2.setText(PANEL_LABEL_B + ":结果上传MES失败");
                         MesClient.tjStatusb = 1;
                     }else{
-                        MesClient.pxstatus2.setText("B:提交成功");
-                        MesClient.status_menu.setText("B件提交成功");
+                        MesClient.pxstatus2.setText(PANEL_LABEL_B + ":提交成功");
+                        MesClient.status_menu.setText(PANEL_LABEL_B + "件提交成功");
                         MesClient.resetScanB();
                     }
                 }
@@ -1095,14 +1100,14 @@ public class MesClient extends JFrame {
         param25.setVisible(true);
         indexPanelA.add(param25);
 
-        pxstatus1 = new JLabel("A");
+        pxstatus1 = new JLabel(PANEL_LABEL_A);
         pxstatus1.setForeground(new Color(255, 128, 64));
         pxstatus1.setHorizontalAlignment(SwingConstants.CENTER);
         pxstatus1.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 20));
         pxstatus1.setBounds(26, 98, 446, 44);
         indexPanelA.add(pxstatus1);
 
-        pxstatus2 = new JLabel("B");
+        pxstatus2 = new JLabel(PANEL_LABEL_B);
         pxstatus2.setForeground(new Color(255, 128, 64));
         pxstatus2.setHorizontalAlignment(SwingConstants.CENTER);
         pxstatus2.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 20));
@@ -1430,14 +1435,14 @@ public class MesClient extends JFrame {
             if(MesClient.curPage.equals("A")){
                 System.out.println("typeA");
                 if(!product_sn.getText().isEmpty() && mesQualityFlagA){
-                    MesClient.setMenuStatus("A面已存在工件码，勿重复扫码",1);
+                    MesClient.setMenuStatus(PANEL_LABEL_A + "已存在工件码，勿重复扫码",1);
                     return;
                 }
                 product_sn.setText(scanBarcodeSn);
             }else{
                 System.out.println("typeB");
                 if(!product_sn2.getText().isEmpty() && mesQualityFlagB){
-                    MesClient.setMenuStatus("B面已存在工件码，勿重复扫码",1);
+                    MesClient.setMenuStatus(PANEL_LABEL_B + "已存在工件码，勿重复扫码",1);
                     return;
                 }
                 product_sn2.setText(scanBarcodeSn);

src/com/mes/ui/MesRevice.java

@@ -20,14 +20,14 @@ public class MesRevice {
                 System.out.println(":"+oprno);
 
 
-                if(oprno.equals(MesClient.mes_gw+"A") || oprno.equals(MesClient.mes_gw+"C")){
+                if(oprno.equals(MesClient.PANEL_OPR_A)){
                     MesClient.mesQualityFlagA = true;
-                    MesClient.pxstatus1.setText("A:可以加工，等待设备启动");
+                    MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":可以加工，等待设备启动");
                     MesClient.curSna = MesClient.product_sn.getText();
                     MesClient.tjFlaga = 1;
-                }else{
+                }else if(oprno.equals(MesClient.PANEL_OPR_B)){
                     MesClient.mesQualityFlagB = true;
-                    MesClient.pxstatus2.setText("B:可以加工，等待设备启动");
+                    MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":可以加工，等待设备启动");
                     MesClient.curSnb = MesClient.product_sn2.getText();
                     MesClient.tjFlagb = 1;
                 }
@@ -76,14 +76,14 @@ public class MesRevice {
                 String oprno = ProtocolParam.getOprno(mes_msg).trim();
                 String sn = ProtocolParam.getSn(mes_msg).trim();
 
-                if(oprno.equals(MesClient.mes_gw+"A") || oprno.equals(MesClient.mes_gw+"C")){
+                if(oprno.equals(MesClient.PANEL_OPR_A)){
                     MesClient.mesQualityFlagA = true;
-                    MesClient.pxstatus1.setText("A:可以加工，等待设备启动");
+                    MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":可以加工，等待设备启动");
                     MesClient.curSna = MesClient.product_sn.getText();
                     MesClient.tjFlaga = 1;
-                }else{
+                }else if(oprno.equals(MesClient.PANEL_OPR_B)){
                     MesClient.mesQualityFlagB = true;
-                    MesClient.pxstatus2.setText("B:可以加工，等待设备启动");
+                    MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":可以加工，等待设备启动");
                     MesClient.curSnb = MesClient.product_sn2.getText();
                     MesClient.tjFlagb = 1;
                 }
@@ -169,24 +169,24 @@ public class MesRevice {
             if(processMsgRet.equalsIgnoreCase("OK")) {
                 if(sn.equals(MesClient.product_sn.getText())){
                     System.out.println("resetScanA");
-                    MesClient.status_menu.setText("A件提交成功");
-                    MesClient.pxstatus1.setText("A:提交成功");
+                    MesClient.status_menu.setText(MesClient.PANEL_LABEL_A + "件提交成功");
+                    MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":提交成功");
                     MesClient.resetScanA();
                 }else{
                     System.out.println("resetScanB");
-                    MesClient.pxstatus2.setText("B:提交成功");
-                    MesClient.status_menu.setText("B件提交成功");
+                    MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":提交成功");
+                    MesClient.status_menu.setText(MesClient.PANEL_LABEL_B + "件提交成功");
                     MesClient.resetScanB();
                 }
             }else{
                 if(sn.equals(MesClient.product_sn.getText())){
-                    MesClient.status_menu.setText("A件提交失败");
-                    MesClient.pxstatus1.setText("A:提交失败");
+                    MesClient.status_menu.setText(MesClient.PANEL_LABEL_A + "件提交失败");
+                    MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":提交失败");
 //                    MesClient.finish_ok_bt.setEnabled(true);
                     MesClient.tjStatusa = 1;
                 }else{
-                    MesClient.status_menu.setText("B件提交失败");
-                    MesClient.pxstatus2.setText("B:提交失败");
+                    MesClient.status_menu.setText(MesClient.PANEL_LABEL_B + "件提交失败");
+                    MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":提交失败");
 //                    MesClient.finish_ng_bt.setEnabled(true);
                     MesClient.tjStatusb = 1;
                 }

src/com/mes/ui/PlcUtil.java

@@ -15,21 +15,6 @@ import java.util.Arrays;
 public class PlcUtil {
 
     public static void getParamDyDl(S7PLC s7PLC){
-        Boolean starta = s7PLC.readBoolean("DB1.2.2"); //A启动中
-        Boolean startb = s7PLC.readBoolean("DB1.2.3"); //B启动中
-
-        String oprno = MesClient.mes_gw+"A";
-        if(startb){
-            oprno = MesClient.mes_gw+"B";
-        }
-        if(MesClient.mes_gwflag.equals("B")){
-            if(oprno.equals(MesClient.mes_gw+"A")){
-                oprno = MesClient.mes_gw+"C";
-            }else{
-                oprno = MesClient.mes_gw+"D";
-            }
-        }
-
         if(MesClient.tjFlaga == 2 || MesClient.tjFlagb == 2){ //运行中
             Float dya = s7PLC.readFloat32("DB1010.2");
             Float dla = s7PLC.readFloat32("DB1010.8");
@@ -60,6 +45,7 @@ public class PlcUtil {
 
             if(MesClient.hjparams.size() == 60){
                 try{
+                    String oprno = MesClient.curFlag.equals("A") ? MesClient.PANEL_OPR_A : MesClient.PANEL_OPR_B;
                     if(MesClient.curFlag.equals("A")){
                         JdbcUtils.insertCmtData(oprno,MesClient.mes_line_sn,MesClient.product_sn.getText(), JSON.toJSONString(MesClient.hjparams));
                     }else{
@@ -82,7 +68,7 @@ public class PlcUtil {
             if(starta){
                 MesClient.curFlag = "A";
                 MesClient.tjFlaga = 2;
-                MesClient.pxstatus1.setText("A:设备运行中");
+                MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":设备运行中");
                 PlcUtil.changeEnable(MesClient.s7PLC,false);
             }
         }else if(MesClient.tjFlaga == 2){ // 运行中
@@ -91,22 +77,22 @@ public class PlcUtil {
             Boolean startb = s7PLC.readBoolean("DB1.2.3"); //B启动中
             if(starta || startb){ // B启动中，A当做完成
                 MesClient.tjFlaga = 3;
-                MesClient.pxstatus1.setText("A:设备运行结束,提交结果中");
+                MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":设备运行结束,提交结果中");
                 MesClient.finish_ok_bt.setEnabled(true);
 
                 Boolean sendret = DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn.getText(),"OK",MesClient.user20,"A");
                 if(!sendret){
-                    MesClient.pxstatus1.setText("A:结果上传MES失败");
+                    MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":结果上传MES失败");
                     MesClient.tjStatusa = 1;
                 }else{
-//                    MesClient.pxstatus1.setText("A:提交成功");
+//                    MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":提交成功");
 //                    MesClient.status_menu.setText("A件提交成功");
 //                    MesClient.resetScanA();
                 }
             }
 //            Boolean sa = s7PLC.readBoolean("DB1.2.2"); //A启动中
 //            if(!sa){
-//                MesClient.pxstatus1.setText("A:设备运行停止");
+//                MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":设备运行停止");
 //                MesClient.finish_ok_bt.setEnabled(true);
 //            }
         }
@@ -131,7 +117,7 @@ public class PlcUtil {
                         MesClient.getUser();
                         Boolean sendret = DataUtil.checkQuality(MesClient.nettyClient,snb,MesClient.user20,"B");
                         if(!sendret){
-                            MesClient.pxstatus2.setText("B:查询质量失败");
+                            MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":查询质量失败");
                             MesClient.checkB = 0;
                         }
                     }
@@ -143,7 +129,7 @@ public class PlcUtil {
             if(startb){
                 MesClient.curFlag = "B";
                 MesClient.tjFlagb = 2;
-                MesClient.pxstatus2.setText("B:设备运行中");
+                MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":设备运行中");
                 PlcUtil.changeEnable(MesClient.s7PLC,false);
             }
         }else if(MesClient.tjFlagb == 2){ // 运行中
@@ -152,15 +138,15 @@ public class PlcUtil {
             Boolean startb = s7PLC.readBoolean("DB1.2.2"); //A启动中
             if(starta || startb){
                 MesClient.tjFlagb = 3;
-                MesClient.pxstatus2.setText("B:设备运行结束,提交结果中");
+                MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":设备运行结束,提交结果中");
                 MesClient.finish_ng_bt.setEnabled(true);
 
                 Boolean sendret = DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn2.getText(),"OK",MesClient.user20,"B");
                 if(!sendret){
-                    MesClient.pxstatus2.setText("B:结果上传MES失败");
+                    MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":结果上传MES失败");
                     MesClient.tjStatusb = 1;
                 }else{
-//                    MesClient.pxstatus2.setText("B:提交成功");
+//                    MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":提交成功");
 //                    MesClient.status_menu.setText("B件提交成功");
 //                    MesClient.resetScanB();
                 }
@@ -174,7 +160,7 @@ public class PlcUtil {
             if(starta){
                 MesClient.curFlag = "A";
                 MesClient.tjFlaga = 2;
-                MesClient.pxstatus1.setText("A:设备运行中");
+                MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":设备运行中");
 //                MesClient.formatScanType(1);
 //                MesClient.batch_scan_1.setEnabled(false);
                 PlcUtil.changeEnable(s7PLC,false);
@@ -183,13 +169,13 @@ public class PlcUtil {
             Boolean afinish = getAFinish(s7PLC); //A焊接完成
             if(afinish){ // B启动中，A当做完成
                 MesClient.tjFlaga = 3;
-                MesClient.pxstatus1.setText("A:设备运行结束,提交结果中");
+                MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":设备运行结束,提交结果中");
                 MesClient.finish_ok_bt.setEnabled(true);
                 MesClient.finish_ng_bt.setEnabled(true);
 
                 Boolean sendret = DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn.getText(),"OK",MesClient.user20,"A");
                 if(!sendret){
-                    MesClient.pxstatus1.setText("A:结果上传MES失败");
+                    MesClient.pxstatus1.setText(MesClient.PANEL_LABEL_A + ":结果上传MES失败");
                     MesClient.tjStatusa = 1;
                 }
             }
@@ -202,7 +188,7 @@ public class PlcUtil {
             if(startb){
                 MesClient.curFlag = "B";
                 MesClient.tjFlagb = 2;
-                MesClient.pxstatus2.setText("B:设备运行中");
+                MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":设备运行中");
                 MesClient.batch_scan_2.setEnabled(false);
                 MesClient.formatScanType(1);
                 PlcUtil.changeEnable(s7PLC,false);
@@ -211,13 +197,13 @@ public class PlcUtil {
             Boolean bfinish = getBFinish(s7PLC); //B焊接完成
             if(bfinish){
                 MesClient.tjFlagb = 3;
-                MesClient.pxstatus2.setText("B:设备运行结束,提交结果中");
+                MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":设备运行结束,提交结果中");
                 MesClient.finish_ng_bt2.setEnabled(true);
                 MesClient.finish_ok_bt2.setEnabled(true);
 
                 Boolean sendret = DataUtil.sendQuality(MesClient.nettyClient,MesClient.product_sn2.getText(),"OK",MesClient.user20,"B");
                 if(!sendret){
-                    MesClient.pxstatus2.setText("B:结果上传MES失败");
+                    MesClient.pxstatus2.setText(MesClient.PANEL_LABEL_B + ":结果上传MES失败");
                     MesClient.tjStatusb = 1;
                 }
             }
@@ -274,7 +260,7 @@ public class PlcUtil {
         try{
             //DB9.21.7 A//DB9.26.4 B
             System.out.println("调用允许启动");
-            s7PLC.writeBoolean("DB9.30.4",result);// 100CD  120CD
+            s7PLC.writeBoolean("DB9.26.4",result);// 100CD  120CD
 //            s7PLC.writeBoolean("DB9.26.4",result);
 //            s7PLC.writeBoolean("DB9.21.7",result);
             return true;
@@ -286,11 +272,11 @@ public class PlcUtil {
 
     // 获取当前是A面还是B面
     public static String getCurAside(S7PLC s7PLC){//120A
-        String str = "B";
+        String str = "A";
         try{
             Boolean ret = s7PLC.readBoolean("DB1.2.0"); // 当前A面
             if(!ret){
-                str = "A";
+                str = "B";
             }
 
         }catch (Exception e){
@@ -300,11 +286,11 @@ public class PlcUtil {
     }
 
     public static String getCurAsideOther(S7PLC s7PLC){//120A
-        String str = "A";
+        String str = "B";
         try{
             Boolean ret = s7PLC.readBoolean("DB1.2.0"); // 当前A面
             if(!ret){
-                str = "B";
+                str = "A";
             }
 
         }catch (Exception e){

src/resources/config/config.properties

@@ -4,4 +4,4 @@ mes.server_ip=192.168.21.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT
-mes.gwflag=B
+#mes.gwflag=B