绑定更改

src/com/mes/ui/DataUtil.java

@@ -112,8 +112,8 @@ public class DataUtil {
             String mes_server_ip = pro.getProperty("mes.server_ip");
             String oprno = pro.getProperty("mes.gw").trim();  // oprno
             String lineSn = pro.getProperty("mes.line_sn").trim();  // lineSn
-            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProductRecord/pcbindRecord";
-            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&sn="+sn+"&result="+ret+"&ucode="+user + "&craft="+craft+"&materielSn="+materielSn;
+            String url = "http://"+mes_server_ip+":8980/js/a/mes/mesProductRecord/bindWarehouse";
+            String params = "__ajax=json&oprno="+oprno+"&lineSn="+lineSn+"&sn="+sn+"&result="+ret+"&ucode="+user + "&craft="+craft+"&wsn="+materielSn;
 
             String result = doPost(url,params);
 

src/com/mes/ui/LoginFarme.java

@@ -200,7 +200,7 @@ public class LoginFarme extends JFrame {
                         MesClient.indexPanelC.add(MesClient.jfxPanel2);
                     }
 
-                    MesClient.initWarehouseData();
+//                    MesClient.initWarehouseData();
                     ProcessUtil.terminateOtherJavawProcesses();
                 }
 

src/com/mes/ui/MesClient.java

@@ -169,15 +169,15 @@ public class MesClient extends JFrame {
                     welcomeWin = new LoginFarme();
                     welcomeWin.setVisible(true);
 
-                    getPlcParam();
+//                    getPlcParam();
 
-                    upParams();
-
-                    setDeviceStart();
+//                    upParams();
+//
+//                    setDeviceStart();
 
                     getMaterailData();
 
-                    deviceOnline();
+//                    deviceOnline();
                 }catch (Exception e){
                     log.error("系统初始化异常: ", e);
                     e.printStackTrace();
@@ -799,6 +799,8 @@ public class MesClient extends JFrame {
                     setMenuStatus("请在工件上料完成后扫码!",1);
                     return;
                 }
+                System.out.println(work_status);
+                System.out.println(check_quality_result);
                 if (work_status == 1&&check_quality_result){
                     scanBarcodeLb();
                 }else{