dkk 17 小时之前
父节点
当前提交
e90db9ae6a
共有 2 个文件被更改,包括 21 次插入15 次删除
  1. 20 14
      src/com/mes/ui/OprnoUtil.java
  2. 1 1
      src/resources/config/config.properties

+ 20 - 14
src/com/mes/ui/OprnoUtil.java

@@ -6,22 +6,28 @@ import java.util.Map;
 
 public class OprnoUtil {
     public static String[] xtoprnos = new String[]{
-            "OP050","OP060","OP070","OP080","OP090","OP100","OP110",
-            "OP120","OP130","OP140","OP150","OP160","OP170","OP180","OP190",
-            "OP200","OP210","OP220","OP230","OP240","OP250","OP260","OP270",
-            "OP280","OP290","OP300","OP310","OP320","OP330","OP340","OP350",
-            "OP360","OP370","OP380","OP390","OP400","OP410","OP420","OP430",
-            "OP440","OP450","OP460","OP470","OP480"
+            "OP040","OP050","OP060","OP070","OP080A","OP090", "OP100","OP110A","OP110B","OP110C",
+            "OP120","OP130","OP140","OP150","OP160", "OP170A","OP170B","OP170C","OP170D",
+            "OP180", "OP190","OP200", "OP210A","OP210B", "OP210C","OP220",
+            "OP230", "OP240A","OP240B", "OP250", "OP260", "OP270", "OP280A","OP280B",
+            "OP290", "OP300", "OP305", "OP310", "OP315", "OP320", "OP330A","OP330B", "OP340A",
+            "OP340B", "OP350", "OP360", "OP370", "OP380", "OP390", "OP400", "OP410", "OP420",
+            "OP430", "OP440", "OP450", "OP460"
     };
 
     public static String[] xtoprnodes = new String[]{
-            "牙套安装", "后侧梁左小总成焊接", "后侧梁找漏", "边梁压铆", "框架CMT焊接",
-            "人工补焊", "焊道打磨", "焊道检查", "框架找漏", "框架正面CNC", "框架反面CNC", "框架去毛刺+清洁",
-            "封堵片焊接", "封堵片打磨+清洁", "框架涂胶", "液冷板装配", "中吊点安装+正面清理溢胶", "液冷板FSW",
-            "匙孔补焊", "焊道打磨、清洁", "总成反面紧固件安装", "边梁套筒涂胶+压合", "总成正面拉铆", "封堵",
-            "胶水固化", "半成品气密", "贴泡棉", "拉铆螺母涂胶", "FSW焊道涂胶", "刮胶", "底护板安装",
-            "底护板复拧+堵盖安装", "总成气密", "液冷板气密", "RPU加强件涂胶组装", "限位胶条+陶瓷复合带安装",
-            "总成清洁", "总成检具检", "CCD", "终检", "贴PET膜", "GP12", "下线拍照", "包装"
+            "单部件压铆+涂胶", "压铆", "单部件装配", "左边梁镭雕", "CMT框架焊接", "人工补焊",
+            "焊缝打磨", "框架反面CNC(1序)", "框架反面CNC(2序)", "框架反面CNC(3序)", "框架去毛刺+清洁+牙套",
+            "液冷板拉铆", "液冷板点焊+水嘴焊接", "液冷板FSW", "半总成找漏", "总成反面CNC(1序)",
+            "总成反面CNC(2序)", "总成反面CNC(3序)", "总成反面CNC(4序)", "匙孔补焊打磨+搅拌焊道打磨",
+            "总成清洁", "中吊点安装", "总成反面装配1(1序)",
+            "总成反面装配1(2序)", "总成反面装配1(3序)", "总成反面装配2", "总成正面装配1",
+            "总成正面装配2(1序)", "总成正面装配2(2序)", "边梁套筒涂胶+压合", "箱体封堵",
+            "胶水固化+静置","半成品气密(1序)", "半成品气密(2序)", "密封件装配+加强板安装",
+            "双层拉铆螺母涂胶", "胶水固化", "焊道涂胶", "胶水固化", "加强板压紧工装拆卸+泡棉粘贴", "底护板装配(1序)",
+            "底护板装配(2序)", "总成气密(1序)", "总成气密(2序)", "底护板螺栓复拧", "液冷板气密", "反面终检",
+            "PC条+陶瓷复合带粘贴+水嘴封堵", "总成清洁+PET粘贴", "CCD", "总成检具检验", "模拟客户安装界面(装拆)",
+            "正面终检", "正面GP12", "反面GP12", "称重"
     };
     public static String[] lboprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090"
@@ -37,7 +43,7 @@ public class OprnoUtil {
     };
     public static String getGwDes(String lineSn,String oprno){
         String des = "";
-        oprno = formatOprno(oprno);
+//        oprno = formatOprno(oprno);
         if(lineSn.equals("XT")){
             int i = 0;
             for (String gw:xtoprnos){

+ 1 - 1
src/resources/config/config.properties

@@ -1,6 +1,6 @@
 #mes.gw=OP450
 mes.server_ip=127.0.0.1
-#mes.server_ip=192.168.13.99
+#mes.server_ip=192.168.14.99
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
 mes.line_sn=XT