wangxichen 2 tygodni temu
rodzic
commit
2f8186b359

+ 3 - 3
config/project_config.json

@@ -1,9 +1,9 @@
 {
-	"currentProjectId":"P4",
+	"currentProjectId":"P51",
 	"deviceIp":"192.168.0.6",
-	"stationCodeOverride":"OP300A",
+	"stationCodeOverride":"OP170A",
 	"lineSnOverride":"XT",
-	"serverIpOverride":"127.0.0.1",
+	"serverIpOverride":"192.168.114.99",
 	"deviceEnabledOverride":false,
 	"uiOverride":{
 		"deviceRow1Enabled":false,

+ 32 - 2
src/com/mes/core/OprnoRegistry.java

@@ -6,9 +6,9 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 工位号注册表 —— 按项目(P1-P4)维护工位号到工位名称的映射
+ * 工位号注册表 —— 按项目(P1-P4/P51/P52)维护工位号到工位名称的映射
  * 切换项目后工位列表跟着切换
- * 注:P1 和 P2 工位列表完全一致
+ * 注:P1 和 P2 工位列表完全一致;P51 和 P52 都跑 T09 产线,共用一套工位表(仅产品型号 T09/T68 不同)
  */
 public final class OprnoRegistry {
 
@@ -18,6 +18,8 @@ public final class OprnoRegistry {
     private static final Map<String, String> P3;
     /** P4 工位表 (P04-1) */
     private static final Map<String, String> P4;
+    /** P51/P52 共用工位表 (T09 产线,产品 T09 / T68) */
+    private static final Map<String, String> P51P52;
 
     static {
         // P1/P2 (P02-1 / AY7-610)
@@ -109,6 +111,31 @@ public final class OprnoRegistry {
         p4.put("OP360", "总成检具");
         p4.put("OP410", "下线");
         P4 = Collections.unmodifiableMap(p4);
+
+        // P51/P52 (T09 产线,按 mes_line_process sorts 排序)
+        Map<String, String> p51 = new LinkedHashMap<>();
+        p51.put("OP040",   "激光打码");
+        p51.put("OP050",   "框架总成焊接1");
+        p51.put("OP060",   "框架总成焊接2");
+        p51.put("OP070",   "人工补焊1");
+        p51.put("INSP030", "框架气密");
+        p51.put("OP090",   "框架激光切割正面");
+        p51.put("OP100",   "框架激光切割反面");
+        p51.put("OP120",   "套筒焊接");
+        p51.put("OP130",   "人工补焊2");
+        p51.put("INSP050", "总成检具检验");
+        p51.put("INSP060", "黑件入库");
+        p51.put("OP170",   "紧固件装配正面/反面");
+        p51.put("OP190",   "框架涂胶");
+        p51.put("OP200",   "冷板装配");
+        p51.put("INSP080", "半成品气密");
+        p51.put("OP230",   "安装密封垫底护板");
+        p51.put("INSP090", "整包气密");
+        p51.put("INSP100", "液冷板气密");
+        p51.put("INSP130", "等电位电阻测试");
+        p51.put("INSP110", "CCD检测");
+        p51.put("OP250",   "包装入库");
+        P51P52 = Collections.unmodifiableMap(p51);
     }
 
     private OprnoRegistry() {}
@@ -154,6 +181,9 @@ public final class OprnoRegistry {
                 return P3;
             case "P4":
                 return P4;
+            case "P51":
+            case "P52":
+                return P51P52;
             default:
                 return null;
         }

+ 3 - 1
src/com/mes/core/ProjectConfigManager.java

@@ -65,7 +65,9 @@ public class ProjectConfigManager {
             new Project("P3", "AY7-520", "+KB23", "+KB004", "+KB77"),
             new Project("--", "P04-1",   "+KA93", "+KA94",  "+KB77"),
 //            new Project("P4", "650",   "+KA64IS", "+KA64IG",  "+KB78")
-            new Project("P4", "P04-1",   "+KA93", "+KA94",  "+KB77")
+            new Project("P4", "P04-1",   "+KA93", "+KA94",  "+KB77"),
+            new Project("P51", "T09",   "+KB60", "+KC03",  ""),
+            new Project("P52", "T68",   "+KB87", "+KC03",  "")
 
     ));