刘功能优化1201

public/assets/js/backend/dashboard.js

@@ -9,7 +9,6 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                 data : {},
                 dataType : "json",
                 success : function(result) {
-                    console.log(result);
                     var myChart = Echarts.init(document.getElementById('echart'), 'walden');
                     var option = {
                         title: {

public/assets/js/backend/feeding.js

@@ -208,11 +208,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                             num:''
                                         },
                                         success(result) {
+                                            console.log(result)
                                             var str = '';//页面table
                                             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 nweight' 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 += "<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) {
@@ -244,80 +245,54 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                 if(key === 13){
                                                     var wuliao = $("#wuliao").val();
                                                     $('#input').html();
-                                                    // $('#input').html(wuliao);
-                                                    $.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;
-                                                                }
-                                                            $('#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++;
-                                                                    }
-                                                                }
-                                                                //替代料变扫描的物料
-                                                                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++;
-                                                                    }
+                                                    $('#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++;
                                                                 }
                                                             }
-                                                            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);
-                                                            }
+                                                            //替代料变扫描的物料
+                                                            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++;
+                                                                }
                                                             }
-                                                        })
+                                                    }
 
+                                                    // console.log(new_data);return false;
 
                                                     // for(var i=0;i<result.data.length;i++) {
                                                     //     //扫描的物料=table中的物料,,,变红,否则语音提示
@@ -355,24 +330,25 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                     //         }
                                                     //     }
                                                     // }
-                                                    // if(error===0){
-                                                    //     layer.confirm("此物料不在配方中,且没有替代料，请确认！", {//物料不存在提示错误信息
-                                                    //         title: ['信息'],
-                                                    //         btn: ['确认'],
-                                                    //         area: ['60%', '60%'],
-                                                    //     });
-                                                    //
-                                                    //     // 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);
-                                                    // }
+
+                                                    if(error===0){
+                                                        layer.confirm("此物料不在配方中,且没有替代料，请确认！", {//物料不存在提示错误信息
+                                                            title: ['信息'],
+                                                            btn: ['确认'],
+                                                            area: ['60%', '60%'],
+                                                        });
+
+                                                        // 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('');
                                                 }

public/assets/js/backend/formula.js

@@ -440,63 +440,80 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             Controller.api.bindevent();
             $(document).on('click','.submit',function () {
-                Form.api.bindevent($("form[role=form]"), function(data, ret){
-                    Toastr.success('111');//成功
-                }, function(data, ret){
-                    Toastr.success("222");
-                }, function(success, error){
-                    var verify = 1;
-                    var ids = $('#ids').attr('value');
-                    var name = $('#c-name').val();
-                    if (name == '' || name== undefined) {
-                        verify = -1;
-                    }
-                    var bach = $('#c-bach').val();
-                    if (bach == '' || bach== undefined) {
-                        verify = -1;
-                    }
-                    var drawer_name = $('#c-drawer_name').val();
-                    if (drawer_name == '' || drawer_name== undefined) {
-                        verify = -1;
-                    }
-                    var examine_name = $('#c-examine_name').val();
-                    if (examine_name == '' || examine_name== undefined) {
-                        verify = -1;
-                    }
-                    var number = $('#c-number').val();
-                    var remark = $('#c-remark').val();
-                    var mid = $('#c-mid').val();
-                    var oid = $('#c-order-uncompleted').val();
-                    if (verify == -1){
-                        layer.confirm("数据格式不对,请仔细核查!");return false;
-                    }
-                    //基础数据
-                    var baseData = [];
-                    baseData.push(ids);
-                    baseData.push(name);
-                    baseData.push(bach);
-                    baseData.push(drawer_name);
-                    baseData.push(examine_name);
-                    baseData.push(number);
-                    baseData.push(remark);
-                    baseData.push(mid);
-                    baseData.push(oid);
-                    Fast.api.ajax({
-                        url:'formula/task?ids='+ids,
-                        data:{baseData:baseData}
-                    },function (data,ret) {
-                        //成功回调
-                        parent.Toastr.success("添加成功");
-                        Fast.api.close();
-                        parent.Fast.api.refreshmenu();
-                        return false;
-                    },function (data,ret) {
-                        parent.Toastr.error("添加失败");
-                        Fast.api.close();
-                        return false;
+                if($('#hidden').val() > $('#c-bach').val()){
+                    layer.confirm("批次号不能小于之前的批次", {
+                        title: ['信息'],
+                        btn: ['确认'],
+                        icon: 0,
+                        closeBtn: 2,
+                        shade: [0.3, '#000'],
+                        shadeClose: true,
+                        id: "one",
+                        anim: 2,
+                        isOutAnim: false,
+                        area: ['30%', '30%'],
                     });
                     return false;
-                });
+                }else{
+                    Form.api.bindevent($("form[role=form]"), function(data, ret){
+                        Toastr.success('111');//成功
+                    }, function(data, ret){
+                        Toastr.success("222");
+                    }, function(success, error){
+                        var verify = 1;
+                        var ids = $('#ids').attr('value');
+                        var name = $('#c-name').val();
+                        if (name == '' || name== undefined) {
+                            verify = -1;
+                        }
+                        var bach = $('#c-bach').val();
+                        if (bach == '' || bach== undefined) {
+                            verify = -1;
+                        }
+                        var drawer_name = $('#c-drawer_name').val();
+                        if (drawer_name == '' || drawer_name== undefined) {
+                            verify = -1;
+                        }
+                        var examine_name = $('#c-examine_name').val();
+                        if (examine_name == '' || examine_name== undefined) {
+                            verify = -1;
+                        }
+                        var number = $('#c-number').val();
+                        var remark = $('#c-remark').val();
+                        var mid = $('#c-mid').val();
+                        var oid = $('#c-order-uncompleted').val();
+                        if (verify == -1){
+                            layer.confirm("数据格式不对,请仔细核查!");return false;
+                        }
+                        //基础数据
+                        var baseData = [];
+                        baseData.push(ids);
+                        baseData.push(name);
+                        baseData.push(bach);
+                        baseData.push(drawer_name);
+                        baseData.push(examine_name);
+                        baseData.push(number);
+                        baseData.push(remark);
+                        baseData.push(mid);
+                        baseData.push(oid);
+                        Fast.api.ajax({
+                            url:'formula/task?ids='+ids,
+                            data:{baseData:baseData}
+                        },function (data,ret) {
+                            //成功回调
+                            parent.Toastr.success("添加成功");
+                            Fast.api.close();
+                            parent.Fast.api.refreshmenu();
+                            return false;
+                        },function (data,ret) {
+                            parent.Toastr.error("添加失败");
+                            Fast.api.close();
+                            return false;
+                        });
+                        return false;
+                    });
+                }
+
             });
         },
         examine:function () {

public/assets/js/backend/order.js

@@ -94,7 +94,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 $('.total').text(number);
                 var remark = $('#c-remark').val();
                 remark = '备注：'+remark;
-
+                if($('#hidden').val() > $('#c-bach').val()){
+                    layer.confirm("批次号不能小于之前的批次", {
+                        title: ['信息'],
+                        btn: ['确认'],
+                        icon: 0,
+                        closeBtn: 2,
+                        shade: [0.3, '#000'],
+                        shadeClose: true,
+                        id: "one",
+                        anim: 2,
+                        isOutAnim: false,
+                        area: ['30%', '30%'],
+                    });
+                    return false;
+                }
                 //给打印表头赋值
                 var bach = $('#c-bach').val();
                 $('#bach').text(bach);
@@ -154,68 +168,89 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             Controller.api.bindevent();
             $(document).on('click','.submit',function () {
-                Form.api.bindevent($("form[role=form]"), function(data, ret){
-                    Toastr.success('111');//成功
-                }, function(data, ret){
-                    Toastr.success("222");
-                }, function(success, error){
-                    var verify = 1;
-                    var ids = $('#c-name').val();
-                    //获取配方名称,去掉版本号
-                    var name = $('#c-name').find("option:selected").text();
-                    var n = name.indexOf("v");
-                    if (n >= 0){
-                        name = name.slice(0,n);
-                    }
-                    // console.log(formula);return false;
-                    if (name == '' || name== undefined) {
-                        verify = -1;
-                    }
-                    var bach = $('#c-bach').val();
-                    if (bach == '' || bach== undefined) {
-                        verify = -1;
-                    }
-                    var drawer_name = $('#c-drawer_name').val();
-                    if (drawer_name == '' || drawer_name== undefined) {
-                        verify = -1;
-                    }
-                    var examine_name = $('#c-examine_name').val();
-                    if (examine_name == '' || examine_name== undefined) {
-                        verify = -1;
-                    }
-                    var number = $('#c-number').val();
-                    if (number == '' || number== undefined) {
-                        verify = -1;
-                    }
-                    var remark = $('#c-remark').val();
-                    if (verify == -1){
-                        layer.confirm("数据格式不对,请仔细核查!");return false;
-                    }
-                    //基础数据
-                    var baseData = [];
-                    baseData.push(ids);
-                    baseData.push(name);
-                    baseData.push(bach);
-                    baseData.push(drawer_name);
-                    baseData.push(examine_name);
-                    baseData.push(number);
-                    baseData.push(remark);
-                    Fast.api.ajax({
-                        url:'formula/task?ids='+ids,
-                        data:{baseData:baseData}
-                    },function (data,ret) {
-                        //成功回调
-                        parent.Toastr.success("添加成功");
-                        Fast.api.close();
-                        parent.Fast.api.refreshmenu();
-                        return false;
-                    },function (data,ret) {
-                        parent.Toastr.error("添加失败");
-                        Fast.api.close();
-                        return false;
+                if($('#hidden').val() > $('#c-bach').val()){
+                    layer.confirm("批次号不能小于之前的批次", {
+                        title: ['信息'],
+                        btn: ['确认'],
+                        icon: 0,
+                        closeBtn: 2,
+                        shade: [0.3, '#000'],
+                        shadeClose: true,
+                        id: "one",
+                        anim: 2,
+                        isOutAnim: false,
+                        area: ['30%', '30%'],
                     });
                     return false;
-                });
+                }else{
+                    Form.api.bindevent($("form[role=form]"), function(data, ret){
+                        Toastr.success('111');//成功
+                    }, function(data, ret){
+                        Toastr.success("222");
+                    }, function(success, error){
+                        var verify = 1;
+                        var ids = $('#c-name').val();
+                        //获取配方名称,去掉版本号
+                        var name = $('#c-name').find("option:selected").text();
+                        var n = name.indexOf("v");
+                        var mid = $('#c-mid').val();
+                        var oid = $('#ids').val();
+                        if (n >= 0){
+                            name = name.slice(0,n);
+                        }
+                        // console.log(formula);return false;
+                        if (name == '' || name== undefined) {
+                            verify = -1;
+                        }
+                        var bach = $('#c-bach').val();
+                        if (bach == '' || bach== undefined) {
+                            verify = -1;
+                        }
+                        var drawer_name = $('#c-drawer_name').val();
+                        if (drawer_name == '' || drawer_name== undefined) {
+                            verify = -1;
+                        }
+                        var examine_name = $('#c-examine_name').val();
+                        if (examine_name == '' || examine_name== undefined) {
+                            verify = -1;
+                        }
+                        var number = $('#c-number').val();
+                        if (number == '' || number== undefined) {
+                            verify = -1;
+                        }
+                        var remark = $('#c-remark').val();
+                        if (verify == -1){
+                            layer.confirm("数据格式不对,请仔细核查!");return false;
+                        }
+                        //基础数据
+                        var baseData = [];
+                        baseData.push(ids);//配方id
+                        baseData.push(name);//配方名称
+                        baseData.push(bach);//批次号
+                        baseData.push(drawer_name);//开票人
+                        baseData.push(examine_name);//审核人
+                        baseData.push(number);//生产量
+                        baseData.push(remark);//备注
+                        baseData.push(mid);//机台id
+                        baseData.push(oid);//订单id
+                        Fast.api.ajax({
+                            url:'formula/task?ids='+ids,
+                            data:{baseData:baseData}
+                        },function (data,ret) {
+                            //成功回调
+                            parent.Toastr.success("添加成功");
+                            Fast.api.close();
+                            parent.Fast.api.refreshmenu();
+                            return false;
+                        },function (data,ret) {
+                            parent.Toastr.error("添加失败");
+                            Fast.api.close();
+                            return false;
+                        });
+                        return false;
+                    });
+                }
+
             });
         },
         api: {