wangxichen 1 semana atrás
pai
commit
ef4012654e
2 arquivos alterados com 25 adições e 11 exclusões
  1. 23 9
      src/com/mes/ui/OprnoUtil.java
  2. 2 2
      src/resources/config/config.properties

+ 23 - 9
src/com/mes/ui/OprnoUtil.java

@@ -2,14 +2,27 @@ package com.mes.ui;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public class OprnoUtil {
-    public static String[] xtoprnos = new String[]{
-            "OP100","OP125"
+    public static String[] cz060oprnos = new String[]{
+            "OP035", "OP040", "OP045", "OP050", "OP055", "OP060",
+            "OP065", "OP070", "OP075", "OP080", "OP085", "OP090",
+            "OP095", "OP100", "OP105", "OP110", "OP115", "OP120",
+            "OP125", "OP130", "OP135", "OP140", "OP145", "OP150",
+            "OP155", "OP160", "OP165", "OP170", "OP175", "OP180",
+            "OP185", "OP190", "OP195", "OP200", "OP205", "OP210",
+            "OP215", "OP220", "OP225", "OP230", "OP235", "OP240",
+            "OP245", "OP250", "OP255", "OP260", "OP265"
     };
-    public static String[] xtoprnodes = new String[]{
-            "弧焊一序","弧焊二序"
+    public static String[] cz060oprnodes = new String[]{
+            "底板预拼+打码", "底板反面FSW", "底板反面打磨", "底板正面FSW", "CNC侧铣", "干冰清洁",
+            "封板预装+点焊", "封板正面FSW", "封板正面打磨", "封板反面FSW", "TIG手工焊", "打磨",
+            "检漏一序", "预拼锁付", "后膨胀梁打码", "弧焊一序", "弧焊二序", "TIG手工焊",
+            "打磨", "总成正面CNC", "总成反面CNC", "吹铝屑+刮毛刺+清洁", "检漏二序", "TIG手工焊",
+            "人工清洁", "抽芯拉铆", "拉铆", "螺套安装", "箱体气密一序", "水道气密一序",
+            "检具", "白件GP12", "喷粉前打包", "电泳", "箱体气密二序", "水道气密二序",
+            "氦检", "总成清洁", "支架、定位销安装", "涂胶", "全检", "GP12成品检验",
+            "CCD检测", "绝缘耐压测试", "成品打包", "入库", "出货"
     };
     public static String[] lboprnos = new String[]{
 
@@ -17,14 +30,15 @@ public class OprnoUtil {
     public static String[] lboprnodes = new String[]{
 
     };
-    public static String getGwDes(String lineSn,String oprno){
+
+    public static String getGwDes(String lineSn, String oprno){
         String des = "";
         oprno = formatOprno(oprno);
-        if(lineSn.equals("XT")){
+        if(lineSn.equals("CZ060")){
             int i = 0;
-            for (String gw:xtoprnos){
+            for (String gw : cz060oprnos){
                 if(gw.equals(oprno)){
-                    des = xtoprnodes[i];
+                    des = cz060oprnodes[i];
                     break;
                 }
                 i++;

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

@@ -1,8 +1,8 @@
-mes.gw=OP100
+mes.gw=OP110
 #mes.server_ip=127.0.0.1
 mes.server_ip=192.168.17.170
 mes.tcp_port=3000
 mes.heart_beat_cycle=60
-mes.line_sn=XT
+mes.line_sn=CZ060
 mes.gwflag=A
 mes.face=B