刘功能优化1205

application/admin/controller/Feeding.php

@@ -23,7 +23,7 @@ class Feeding extends Backend
      */
     protected $model = null;
 
-    protected $noNeedRight = ['get_formula','get_task'];
+    protected $noNeedRight = ['get_formula','get_task','get_material'];
 
     public function _initialize()
     {
@@ -188,6 +188,27 @@ class Feeding extends Backend
         $row['process'] = $pro+1;
         return json($row);
     }
+    public function get_material(){
+        $bach = $this->request->post('bach');//批次号
+        $material = $this->request->post('material');//原材料
+        if (!$bach || !$material){
+            $this->error('扫码数据不能为空');
+        }
+        $task = Db::name('task')->where('bach',$bach)->find();
+        $map = [];
+        $map['f_name'] = $task['name'];
+        $map['name'] = $material;
+        $data = Db::name('formula_material')->where($map)->find();
+        $result['data'] = $data;
+        if ($data){
+            $result['total'] = 1;
+        }else{
+            $result['total'] = 0;
+        }
+//        print_r($result);die;
+        return json($result);
+    }
+
     //查找替代料
     /*public function replace(){
         $bach = $this->request->post('bach');
@@ -203,4 +224,5 @@ class Feeding extends Backend
         if ($key !== false) array_splice($res['yuan'], $key, 1);
         return json($res);
     }*/
+
 }

public/assets/js/backend/feeding.js

@@ -213,7 +213,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                             var html = '';//打印的table
                                             for(var i=0;i<result.data.length;i++){
                                                 str += "<tr class='tablestr"+i+" tablestr'><td><input class='form-control material' type='text' name='row[material][]' readonly value='"+result.data[i].material+"'></td>";
-                                                str += "<td><input class='form-control' type='text' name='row[nweight][]' readonly value='"+result.data[i].nweight+"'></td>";
+                                                // str += "<td><input class='form-control' type='text' name='row[nweight][]' readonly value='"+result.data[i].nweight+"'></td>";
+                                                str += "<td><input class='form-control nweight' type='text' name='row[nweight][]' readonly value='"+result.data[i].nweight+"'></td>";
                                                 str += "<input class='form-control' type='hidden' name='row[gy_num][]' value='"+result.data[i].gy_num+"'>";
                                                 str += "<td><input class='form-control' type='number' name='row[weight][]' value='";
                                                 if (result.data[i].weight) {
@@ -246,109 +247,81 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                     var wuliao = $("#wuliao").val();
                                                     $('#input').html();
                                                     $('#input').html(wuliao);
-                                                    for (var i=0;i<result.data.length;i++){
-                                                            //扫描的物料=table中的物料,,,变红,否则语音提示
-                                                            if(result.data[i].material===wuliao){
-                                                                if (result.data[i].gy_num == result.process){
-                                                                    $(".material")[i].setAttribute('style','color:red');
-                                                                    //语音播报
-                                                                    var msg = new SpeechSynthesisUtterance("应投入物料"+result.data[i].material+"应投入重量"+result.data[i].nweight+"千克");
-                                                                    window.speechSynthesis.speak(msg);
-                                                                    error++;
-                                                                }else if (result.data[i].gy_num > result.process){
-                                                                    Layer.confirm("此物料不在当前工序，请确认！",{
-                                                                        area: ['60%', '60%'],
-                                                                    });
-                                                                    //语音播报
-                                                                    var msg = new SpeechSynthesisUtterance("此物料不在当前工序，请确认！");
-                                                                    window.speechSynthesis.speak(msg);
-                                                                    error++;
-                                                                }else {
-                                                                    Layer.confirm("此物料已经投料，请确认此工序是否有此物料！",{
-                                                                        area: ['60%', '60%'],
-                                                                    });
-                                                                    //语音播报
-                                                                    var msg = new SpeechSynthesisUtterance("此物料不在当前工序，请确认！");
-                                                                    window.speechSynthesis.speak(msg);
-                                                                    error++;
-                                                                }
+                                                    $.ajax({
+                                                        method: "POST",
+                                                        url: "feeding/get_material",
+                                                        data: {
+                                                            bach: $("#c-bach").val(),
+                                                            material:wuliao
+                                                        },
+                                                        success(data) {
+                                                            if (data.total == 1){
+                                                                wuliao = data.data.m_name;
                                                             }
-                                                            //替代料变扫描的物料
-                                                            if(result.data[i].material.indexOf('/')!==-1){
-                                                                var arr = result.data[i].material.split('/');
-                                                                if(arr.indexOf($("#wuliao").val()) !== -1 && result.data[i].gy_num == result.process){
-                                                                    $(".material")[i].value = wuliao;
-                                                                    $(".material")[i].setAttribute('style','color:red');
-                                                                    error++;
-                                                                }else if(arr.indexOf($("#wuliao").val()) !== -1 ){
-                                                                    Layer.confirm("此物料不在当前工序，请确认！",{
-                                                                        area: ['60%', '60%'],
-                                                                    });
-                                                                    //语音播报
-                                                                    var msg = new SpeechSynthesisUtterance("此物料不在当前工序，请确认！");
-                                                                    window.speechSynthesis.speak(msg);
-                                                                    error++;
+                                                            $('#input').html(wuliao);
+                                                            for (var i=0;i<result.data.length;i++){
+                                                                //扫描的物料=table中的物料,,,变红,否则语音提示
+                                                                if(result.data[i].material===wuliao){
+                                                                    if (result.data[i].gy_num == result.process){
+                                                                        $(".material")[i].setAttribute('style','color:red');
+                                                                        $(".nweight")[i].setAttribute('style','color:red');
+                                                                        //语音播报
+                                                                        var msg = new SpeechSynthesisUtterance("应投入物料"+result.data[i].material+"应投入重量"+result.data[i].nweight+"千克");
+                                                                        window.speechSynthesis.speak(msg);
+                                                                        error++;
+                                                                    }else if (result.data[i].gy_num > result.process){
+                                                                        Layer.confirm("此物料不在当前工序，请确认！",{
+                                                                            area: ['60%', '60%'],
+                                                                        });
+                                                                        //语音播报
+                                                                        var msg = new SpeechSynthesisUtterance("此物料不在当前工序，请确认！");
+                                                                        window.speechSynthesis.speak(msg);
+                                                                        error++;
+                                                                    }else {
+                                                                        Layer.confirm("此物料已经投料，请确认此工序是否有此物料！",{
+                                                                            area: ['60%', '60%'],
+                                                                        });
+                                                                        //语音播报
+                                                                        var msg = new SpeechSynthesisUtterance("此物料不在当前工序，请确认！");
+                                                                        window.speechSynthesis.speak(msg);
+                                                                        error++;
+                                                                    }
                                                                 }
-                                                            }
-                                                    }
 
-                                                    // console.log(new_data);return false;
 
-                                                    // for(var i=0;i<result.data.length;i++) {
-                                                    //     //扫描的物料=table中的物料,,,变红,否则语音提示
-                                                    //     if(result.data[i].material===wuliao && result.data[i].gy_num == result.process){
-                                                    //         $(".material")[i].setAttribute('style','color:red');
-                                                    //         //语音播报
-                                                    //         var msg = new SpeechSynthesisUtterance("应投入物料"+result.data[i].material+"应投入重量"+result.data[i].nweight+"千克");
-                                                    //         window.speechSynthesis.speak(msg);
-                                                    //         error++;
-                                                    //         break;
-                                                    //     }else if(result.data[i].material===wuliao && result.data[i].gy_num != result.process ){
-                                                    //         Layer.confirm("此物料不在当前工序，请确认！",{
-                                                    //             area: ['60%', '60%'],
-                                                    //         });
-                                                    //         //语音播报
-                                                    //         var msg = new SpeechSynthesisUtterance("此物料不在当前工序，请确认！");
-                                                    //         window.speechSynthesis.speak(msg);
-                                                    //         error++;
-                                                    //     }
-                                                    //     //替代料变扫描的物料
-                                                    //     if(result.data[i].material.indexOf('/')!==-1){
-                                                    //         var arr = result.data[i].material.split('/');
-                                                    //         if(arr.indexOf($("#wuliao").val()) !== -1 && result.data[i].gy_num == result.process){
-                                                    //             $(".material")[i].value = wuliao;
-                                                    //             $(".material")[i].setAttribute('style','color:red');
-                                                    //             error++;
-                                                    //         }else if(arr.indexOf($("#wuliao").val()) !== -1 ){
-                                                    //             Layer.confirm("此物料不在当前工序，请确认！",{
-                                                    //                 area: ['60%', '60%'],
-                                                    //             });
-                                                    //             //语音播报
-                                                    //             var msg = new SpeechSynthesisUtterance("此物料不在当前工序，请确认！");
-                                                    //             window.speechSynthesis.speak(msg);
-                                                    //             error++;
-                                                    //         }
-                                                    //     }
-                                                    // }
-
-                                                    if(error===0){
-                                                        layer.confirm("此物料不在配方中,且没有替代料，请确认！", {//物料不存在提示错误信息
-                                                            title: ['信息'],
-                                                            btn: ['确认'],
-                                                            area: ['60%', '60%'],
-                                                        });
+                                                                //替代料变扫描的物料
+                                                                if(result.data[i].material.indexOf('/')!==-1) {
+                                                                    var arr = result.data[i].material.split('/');
+                                                                    if (arr.indexOf($("#wuliao").val()) !== -1 && result.data[i].gy_num == result.process) {
+                                                                        $(".material")[i].value = wuliao;
+                                                                        $(".material")[i].setAttribute('style', 'color:red');
+                                                                        $(".nweight")[i].setAttribute('style', 'color:red');
+                                                                        error++;
+                                                                    } else if (arr.indexOf($("#wuliao").val()) !== -1) {
+                                                                        Layer.confirm("此物料不在当前工序，请确认！", {
+                                                                            area: ['60%', '60%'],
+                                                                        });
+                                                                        //语音播报
+                                                                        var msg = new SpeechSynthesisUtterance("此物料不在当前工序，请确认！");
+                                                                        window.speechSynthesis.speak(msg);
+                                                                        error++;
+                                                                    }
+                                                                }
+                                                            }
+                                                            if(error===0){
+                                                                layer.confirm("此物料不在配方中,且没有替代料，请确认！", {//物料不存在提示错误信息
+                                                                    title: ['信息'],
+                                                                    btn: ['确认'],
+                                                                    area: ['60%', '60%'],
+                                                                });
+                                                                var synth = window.speechSynthesis;
+                                                                var msg = new window.SpeechSynthesisUtterance('此物料不在配方中,且没有替代料，请确认！');
+                                                                window.speechSynthesis.cancel();
+                                                                synth.speak(msg);
+                                                            }
+                                                        }
 
-                                                        // var fn = function(){
-                                                            var synth = window.speechSynthesis;
-                                                            var msg = new window.SpeechSynthesisUtterance('此物料不在配方中,且没有替代料，请确认！');
-                                                            window.speechSynthesis.cancel();
-                                                            synth.speak(msg);
-                                                        // }
-                                                        // setInterval(fn,5000);
-                                                        //语音播报setTimeout()
-                                                        // var msg = new SpeechSynthesisUtterance("此物料不在配方中,且没有替代料，请确认！");
-                                                        // window.speechSynthesis.speak(msg);
-                                                    }
+                                                    })
                                                     //清空物料扫描后的值,下次直接重新扫描即可
                                                     $("#wuliao").val('');
                                                 }