增加裸瓷判定检验

wwwroot/main/Assemble/index.html

@@ -829,7 +829,7 @@
         var checkprocedureId = "";  //校验工序ID
         var checkworkstationname = "";  //校验工位名称
 
-        var socketbarcode = new WebSocket('ws://172.18.32.32:9102');
+        //var socketbarcode = new WebSocket('ws://172.18.32.32:9102');
 
         /*
 
@@ -883,7 +883,12 @@
             //});
             pinguansave = '0';
             scanMusicFlag = 0;
-            ischanged = 0; 
+            ischanged = 0;
+            //装配页面，不显示质量登记tab页面，只进行装配，不进行质量登记 add by qq
+            if (request('modeltype') == -5) {
+                $('#质量登记页').addClass('d-none');
+            }
+
             // 非装配页面，质量登记显示在最前
             //if (request('modeltype') != -5 && request('NAME').search("三检") <= 0) {
             if (request('modeltype') != -5 && request('NAME').search("巡检") <= 0) {
@@ -914,10 +919,10 @@
             //console.log('socket', socket)
             //console.log('socket1', socket1)
 
-            var result = $.ajax({ url: 'api/GetBarcodeByScan.ashx?start=1&barcodeip=ws://172.18.32.32:9102&name=' + request('NAME').toString(), dataType: "json", type: "get" });
+            //var result = $.ajax({ url: 'api/GetBarcodeByScan.ashx?start=1&barcodeip=ws://172.18.32.32:9102&name=' + request('NAME').toString(), dataType: "json", type: "get" });
 
-            socketbarcode = new WebSocket('ws://172.18.32.32:9102');
-            console.log('socketbarcode', socketbarcode)
+            //socketbarcode = new WebSocket('ws://172.18.32.32:9102');
+            //console.log('socketbarcode', socketbarcode)
 
             loadProductionPlanData();
         });
@@ -943,26 +948,26 @@
         //    }
         //};
 
-        socketbarcode.onopen = function (event) {
-            console.log('WebSocket 已连接！等待接收数据');
-        };
+        //socketbarcode.onopen = function (event) {
+        //    console.log('WebSocket 已连接！等待接收数据');
+        //};
 
-        socketbarcode.onmessage = function (event) {
+        //socketbarcode.onmessage = function (event) {
             
-            var text = event.data.toString();
-            var values = text.split("#");
-            console.log('text',text);
-            //console.log('checkprocedureId', checkprocedureId);
-            //console.log('checkworkstationname', checkworkstationname);
-            //console.log('servicePort', servicePort);
-            if (procedureId == checkprocedureId && request('NAME') == checkworkstationname && values[0].toString() == servicePort) {
+        //    var text = event.data.toString();
+        //    var values = text.split("#");
+        //    console.log('text',text);
+        //    //console.log('checkprocedureId', checkprocedureId);
+        //    //console.log('checkworkstationname', checkworkstationname);
+        //    //console.log('servicePort', servicePort);
+        //    if (procedureId == checkprocedureId && request('NAME') == checkworkstationname && values[0].toString() == servicePort) {
 
-                $('#urltext').val(values[1].toString());
+        //        $('#urltext').val(values[1].toString());
 
-                loadProductScans();
+        //        loadProductScans();
 
-            }
-        };
+        //    }
+        //};
 
         //智能装配强制启动
         function OpenFinal() {
@@ -1170,35 +1175,35 @@
             //页面初始时，查询当前工序工位所配置的自动扫描头ip等信息 
             var worksid = request('WORKSID');
             var names = request('NAME');
-            var ipData = $.ajax({ url: 'api/GetIPData_WCF.ashx?id=' + procedureId + '&workstation=' + worksid, dataType: "json", type: "get" });
-            $.when(ipData).then(
-                function (jsonIPData) {
-
-                    //barcodeip = jsonIPData["rows"][0]["BARCODEIP"];    //常连接IP:端口(产品条码)
-                    //idnrkip = jsonIPData["rows"][0]["IDNRKIP"];      //常连接IP:端口(组件条码)
-                    scanip = jsonIPData["rows"][0]["SCANIP"];       //扫描头IP
-                    plcip = jsonIPData["rows"][0]["PLCIP"];        //PLCIP
-                    servicePort = jsonIPData["rows"][0]["SERVICEPORT"];
-                    db = jsonIPData["rows"][0]["DB"];
-                    checkprocedureId = procedureId;
-                    checkworkstationname = names;
-
-                    //socketbarcode = new WebSocket('ws://' + barcodeip)
-                    //socketidnrk = new WebSocket('ws://' + idnrkip)
-                    //console.log(socketbarcode)
-                    //console.log(socketidnrk)
-                    scanMusicFlag = 1;
-
-                    //var ip1 = 'ws://' + barcodeip;
-                    //var ip2 = 'ws://' + idnrkip;
-                    //console.log(ip1)
-                    //console.log(ip2)
-                    ////返回结果
-                    //var result = $.ajax({ url: 'api/GetBarcodeByScan.ashx?start=1&barcodeip=' + ip1 + '&idnrkip=' + ip2, dataType: "json", type: "get" });
+            //var ipData = $.ajax({ url: 'api/GetIPData_WCF.ashx?id=' + procedureId + '&workstation=' + worksid, dataType: "json", type: "get" });
+            //$.when(ipData).then(
+            //    function (jsonIPData) {
+
+            //        //barcodeip = jsonIPData["rows"][0]["BARCODEIP"];    //常连接IP:端口(产品条码)
+            //        //idnrkip = jsonIPData["rows"][0]["IDNRKIP"];      //常连接IP:端口(组件条码)
+            //        scanip = jsonIPData["rows"][0]["SCANIP"];       //扫描头IP
+            //        plcip = jsonIPData["rows"][0]["PLCIP"];        //PLCIP
+            //        servicePort = jsonIPData["rows"][0]["SERVICEPORT"];
+            //        db = jsonIPData["rows"][0]["DB"];
+            //        checkprocedureId = procedureId;
+            //        checkworkstationname = names;
+
+            //        //socketbarcode = new WebSocket('ws://' + barcodeip)
+            //        //socketidnrk = new WebSocket('ws://' + idnrkip)
+            //        //console.log(socketbarcode)
+            //        //console.log(socketidnrk)
+            //        scanMusicFlag = 1;
+
+            //        //var ip1 = 'ws://' + barcodeip;
+            //        //var ip2 = 'ws://' + idnrkip;
+            //        //console.log(ip1)
+            //        //console.log(ip2)
+            //        ////返回结果
+            //        //var result = $.ajax({ url: 'api/GetBarcodeByScan.ashx?start=1&barcodeip=' + ip1 + '&idnrkip=' + ip2, dataType: "json", type: "get" });
 
                     
-                }
-            );
+            //    }
+            //);
 
             ClearProductDefectList();
         }