hfy il y a 4 jours
Parent
commit
2c583ff152

+ 4 - 1
src/com/mes/netty/ProtocolParam.java

@@ -43,10 +43,13 @@ public class ProtocolParam {
         return msg.substring(34,70);
     }
 
-    public static String getLx(String msg){
+    public static String getLx(String processMsgRet,String msg){
         if(msg.length() < 72){
             return "";
         }
+        if(processMsgRet.equalsIgnoreCase("QN")||processMsgRet.equalsIgnoreCase("QD")){
+            return msg.substring(70,72)+msg.substring(74,75);
+        }
         return msg.substring(70,72);
     }
 

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

@@ -37,7 +37,7 @@ public class MesRevice {
             }else {
                 MesClient.check_quality_result = false;
 
-                String lmsg = ErrorMsg.getErrorMsg(processMsgRet, ProtocolParam.getLx(mes_msg));
+                String lmsg = ErrorMsg.getErrorMsg(processMsgRet, ProtocolParam.getLx(processMsgRet,mes_msg));
 
                 MesClient.setMenuStatus(lmsg,-1);
                 //语音播报错误信息

+ 2 - 2
src/com/mes/ui/OprnoUtil.java

@@ -26,8 +26,8 @@ public class OprnoUtil {
             "胶水固化+静置","半成品气密(1序)", "半成品气密(2序)", "密封件装配+加强板安装",
             "双层拉铆螺母涂胶", "胶水固化", "焊道涂胶", "胶水固化", "加强板压紧工装拆卸+泡棉粘贴", "底护板装配(1序)",
             "底护板装配(2序)", "总成气密(1序)", "总成气密(2序)", "底护板螺栓复拧", "液冷板气密", "反面终检",
-            "PC条+陶瓷复合带粘贴+水嘴封堵", "总成清洁+PET粘贴", "CCD", "总成检具检验", "模拟客户安装界面(装拆)",
-            "正面终检", "正面GP12", "反面GP12", "称重"
+            "PC条+陶瓷复合带粘贴+水嘴封堵", "总成清洁+PET粘贴", "CCD",  "模拟客户安装界面(装拆)","总成检具检验",
+            "正面终检", "反面GP12", "正面GP12", "称重"
     };
     public static String[] lboprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090"

+ 2 - 2
src/com/mes/util/ErrorMsg.java

@@ -11,9 +11,9 @@ public class ErrorMsg {
             }else if(processMsgRet.equalsIgnoreCase("NN")) {
                 lmsg = "该工件跳过该工位";
             }else if(processMsgRet.equalsIgnoreCase("QN")) {
-                lmsg = "该工件OP"+ lx+"0加工NG";
+                lmsg = "该工件OP"+ lx+"加工NG";
             }else if(processMsgRet.equalsIgnoreCase("QD")) {
-                lmsg = "该工件OP"+ lx+"0未加工";
+                lmsg = "该工件OP"+ lx+"未加工";
             }else if(processMsgRet.equalsIgnoreCase("NF")) {
                 lmsg = "该工件已合格下线";
             }else if(processMsgRet.equalsIgnoreCase("NR")) {