wangxichen 1 هفته پیش
والد
کامیت
68ae371e73
2فایلهای تغییر یافته به همراه2 افزوده شده و 6 حذف شده
  1. 1 5
      src/com/mes/ui/MesRevice.java
  2. 1 1
      src/com/mes/ui/OprnoUtil.java

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

@@ -13,7 +13,6 @@ public class MesRevice {
     public static void checkQualityRevice(String processMsgRet,String mes_msg){
         try{
             if(processMsgRet.equalsIgnoreCase("UD")) {
-                String sn = ProtocolParam.getSn(mes_msg).trim();
                 MesClient.status_menu.setForeground(Color.GREEN);
                 MesClient.check_quality_result = true;//质量合格,可以绑定加工
                 MesClient.status_menu.setText("该工件可以加工");
@@ -30,10 +29,7 @@ public class MesRevice {
                     }
                 }
 
-                 String qret = "OK";
-                 MesClient.getUser();
-                 DataUtil.sendQuality(MesClient.nettyClient,sn,qret,MesClient.user20);
-//                // 自动提交OK结果
+//                // 自动提交OK结果(已取消,改为等待用户手动点OK/NG)
 //                String barcode36 = MesClient.getBarcode(sn);
 //                if(!barcode36.isEmpty()){
 //                    MesClient.getUser();

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

@@ -19,7 +19,7 @@ public class OprnoUtil {
             "总成正面CNC+去毛刺","总成正面,吹铝屑+清洁","总成正面装配","套筒涂胶","封堵片焊接",
             "左右边梁封堵","半成品气密","VHB胶带粘贴+冷板泡棉粘贴","冷板背面涂胶",
             "底护板清洗","安装底护板","成品气密","液冷板气密","总成检具检验","箱体封堵",
-            "总成清洁","粘贴云母片","CCD","终检","GP12正面","后梁底涂镭雕","GP12反面","包装"
+            "总成清洁","粘贴云母片","CCD","终检","GP12正面","后梁底涂镭雕","后梁底纹镭雕","包装"
     };
     public static String[] lboprnos = new String[]{