浏览代码

录入系统

wangxichen 5 天之前
父节点
当前提交
a9bdebd8b8

+ 3 - 0
src/com/mes/netty/NettyClientHandler.java

@@ -59,6 +59,9 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
             case "MQDW":
                 MesRevice.updateResultRevice(processMsgRet,mes_msg);
                 break;
+            case "MCJW":
+                MesRevice.createRevice(processMsgRet,mes_msg);
+                break;
         }
 
 

+ 12 - 0
src/com/mes/ui/DataUtil.java

@@ -112,6 +112,18 @@ public class DataUtil {
         }
     }
 
+    // 创建产品记录(首站录入系统)
+    public static Boolean sendCreate(NettyClient nettyClient,String sn,String ret,String user,String op){
+        try{
+            String msgType = "MCJW";
+            String gy = "100000";
+            Boolean aqdw_str = sendMessage(nettyClient,msgType,gy,"",sn,ret,user,"00","",op);
+            return aqdw_str;
+        }catch (Exception e){
+            return false;
+        }
+    }
+
     public static Boolean sendQuality(NettyClient nettyClient,String sn,String ret,String user,String op){
         try{
             String msgType = "MQDW";

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

@@ -1324,13 +1324,13 @@ public class MesClient extends JFrame {
             product_sn2.setText(sn);
         }
 
-        MesClient.setMenuStatus("扫码成功",0);
+        MesClient.setMenuStatus("扫码成功,正在录入系统",0);
 
         //刷新界面
         mesClientFrame.repaint();
         getUser();
-        // 查询工件质量
-        Boolean sendret = DataUtil.checkQuality(nettyClient,sn,user20,page);
+        // 首站录入系统(创建产品记录),成功后直接进入等待加工状态
+        Boolean sendret = DataUtil.sendCreate(nettyClient,sn,"OK",user20,page);
         if(!sendret){
             MesClient.setMenuStatus("消息发送失败,请重试",1);
         }

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

@@ -10,6 +10,43 @@ import java.awt.*;
 
 public class MesRevice {
 
+    // 创建产品记录回复
+    public static void createRevice(String processMsgRet,String mes_msg){
+        try{
+            String oprno = ProtocolParam.getOprno(mes_msg).trim();
+            if(processMsgRet.equalsIgnoreCase("OK") || processMsgRet.equalsIgnoreCase("CF")) {
+                // 创建成功或已存在,直接进入等待加工状态
+                String tip = processMsgRet.equalsIgnoreCase("OK") ? "录入成功" : "工件码已存在";
+                MesClient.lastpage = 0;
+                if(oprno.equals(MesClient.mes_gw+"A") || oprno.equals(MesClient.mes_gw+"C") || oprno.equals(MesClient.mes_gw+"E")){
+                    MesClient.finish_ok_bt.setEnabled(false);
+                    MesClient.mesQualityFlagA = true;
+                    MesClient.pxstatus1.setText("A:" + tip + ",等待设备启动");
+                    MesClient.curSna = MesClient.product_sn.getText();
+                    MesClient.tjFlaga = 1;
+                }else{
+                    MesClient.finish_ng_bt.setEnabled(false);
+                    MesClient.mesQualityFlagB = true;
+                    MesClient.pxstatus2.setText("B:" + tip + ",等待设备启动");
+                    MesClient.curSnb = MesClient.product_sn2.getText();
+                    MesClient.tjFlagb = 1;
+                }
+                MesClient.setMenuStatus(tip + ",等待设备启动",0);
+            }else if(processMsgRet.equalsIgnoreCase("BM")){
+                MesClient.setMenuStatus("物料未绑定或已失效",1);
+            }else if(processMsgRet.equalsIgnoreCase("GS")){
+                MesClient.setMenuStatus("工件码格式不正确",1);
+            }else if(processMsgRet.equalsIgnoreCase("DJ")){
+                MesClient.setMenuStatus("未进行开班点检",1);
+            }else{
+                MesClient.setMenuStatus("录入MES失败,请重试",1);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            MesClient.setMenuStatus("录入MES失败,请重试",1);
+        }
+    }
+
     // 质量查询
     public static void checkQualityRevice(String processMsgRet,String mes_msg){
         try{