hfy vor 20 Stunden
Ursprung
Commit
c8ddd81a82

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

@@ -702,9 +702,9 @@ public class MesClient extends JFrame {
                     }
 
                     // 判断范围 76.76 ~ 83.22
-                    if (weightVal < 76.76 || weightVal > 83.22) {
+                    if (weightVal < 101.92 || weightVal > 110.50) {
                         JOptionPane.showMessageDialog(mesClientFrame,
-                                String.format("重量不在合格范围!当前重量:%.2f,要求区间:76.76 ~ 83.22,请重新称重", weightVal),
+                                String.format("重量不在合格范围!当前重量:%.2f,要求区间:101.92 ~ 110.50,请重新称重", weightVal),
                                 "提示窗口",
                                 JOptionPane.WARNING_MESSAGE);
                         return;

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

@@ -12,7 +12,7 @@ public class OprnoUtil {
             "OP230", "OP240A","OP240B", "OP250", "OP260", "OP270", "OP275", "OP280A","OP280B",
             "OP290", "OP300", "OP305", "OP310", "OP315", "OP320", "OP330A","OP330B", "OP340A",
             "OP340B", "OP350", "OP360", "OP370", "OP380", "OP390", "OP400", "OP410", "OP420",
-            "OP430", "OP440", "OP450", "OP460"
+            "OP430", "OP440", "OP480", "OP460"
     };
 
     public static String[] xtoprnodes = new String[]{
@@ -27,7 +27,7 @@ public class OprnoUtil {
             "双层拉铆螺母涂胶", "胶水固化", "焊道涂胶", "胶水固化", "加强板压紧工装拆卸+泡棉粘贴", "底护板装配(1序)",
             "底护板装配(2序)", "总成气密(1序)", "总成气密(2序)", "底护板螺栓复拧", "液冷板气密", "反面终检",
             "PC条+陶瓷复合带粘贴+水嘴封堵", "总成清洁+PET粘贴", "CCD", "总成检具检验", "模拟客户安装界面(装拆)",
-            "正面终检", "正面GP12", "反面GP12", "称重"
+            "正面终检", "正面GP12", "称重", "称重"
     };
     public static String[] lboprnos = new String[]{
             "OP040","OP050","OP060","OP070","OP080","OP090","OP100","OP110",

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

@@ -1,12 +1,12 @@
-#\u5DE5\u4F4D\u53F7
+#???
 #XT OP090 OP100 OP110 OP120 OP160 OP180 OP190 OP250 OP260 OP280 OP360 OP370 OP390 OP400
-mes.gw=OP460
-#\u670D\u52A1\u5668IP\u5730\u5740
+mes.gw=OP480
+#???IP??
 #mes.server_ip=127.0.0.1
-mes.server_ip=192.168.14.99
-#TCP\u7AEF\u53E3
+mes.server_ip=192.168.13.99
+#TCP??
 mes.tcp_port=3000
-#\u5FC3\u8DF3\u5468\u671F
+#????
 mes.heart_beat_cycle=60
-#\u4EA7\u7EBF\u7F16\u53F7
+#????
 mes.line_sn=XT