智云MES-UI前端
parent: f44347dd | 补丁 | 提交 | ignore whitespace
yangle
2023-12-12 bcb9d3000b0cd83e3eed468236be133d430b9852 
单品过站优化
3个文件已修改
184 ■■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html


@@ -1,7 +1,8 @@


<!DOCTYPE html>


<html xmlns="http://www.w3.org/1999/xhtml">


<head>


<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>


    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />


    <meta name="renderer" content="ie-comp" />


    <title>打印</title>


    <script src="../../CreateControl.js"></script>


    <script src="../../GRInstall.js"></script>


@@ -14,42 +15,42 @@


    </style>


    <script type="text/javascript">




    function getUrlVars() {


        var vars = [], hash;


        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');


        for (var i = 0; i < hashes.length; i++) {


            hash = hashes[i].split('=');


            vars.push(hash[0]);


            vars[hash[0]] = hash[1];


        function getUrlVars() {


            var vars = [], hash;


            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');


            for (var i = 0; i < hashes.length; i++) {


                hash = hashes[i].split('=');


                vars.push(hash[0]);


                vars[hash[0]] = hash[1];


            }


            return vars;


        }


        return vars;


    }


    //在网页初始加载时向报表提供数据


    function window_onload() {


        var ReportViewer = document.getElementById("ReportViewer");


        // ReportViewer.Stop();


        var Report = ReportViewer.Report;


        //开启报表生成进度条显示


        //ReportViewer.Report.ShowProgressUI = true;


        Report.OnPrintBegin = OnPrintBegin;


        Report.OnPrintEnd = OnPrintEnd;


        //在网页初始加载时向报表提供数据


        function window_onload() {


            var ReportViewer = document.getElementById("ReportViewer");


            // ReportViewer.Stop();


            var Report = ReportViewer.Report;


            //开启报表生成进度条显示


            //ReportViewer.Report.ShowProgressUI = true;


            Report.OnPrintBegin = OnPrintBegin;


            Report.OnPrintEnd = OnPrintEnd;




        ReportViewer.Start();


    }


    //function OnPrintEnd() {


    //    if (PrintCount == 0) {


    //        var LCStatus = sessionStorage.getItem("LCStatus");


    //        if (LCStatus == "Print")//打印状态


    //        {


    //            SaveLabelPrint(sessionStorage.getItem("LabelJson"));


    //            PrintCount = 1;


    //        }


    //    }


            ReportViewer.Start();


        }


        //function OnPrintEnd() {


        //    if (PrintCount == 0) {


        //        var LCStatus = sessionStorage.getItem("LCStatus");


        //        if (LCStatus == "Print")//打印状态


        //        {


        //            SaveLabelPrint(sessionStorage.getItem("LabelJson"));


        //            PrintCount = 1;


        //        }


        //    }




    //}


    //function OnPrintBegin() {


        //}


        //function OnPrintBegin() {




    //}


        //}


    </script>


</head>


<body>




 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html


@@ -13,7 +13,7 @@


    <script src="../../../layuiadmin/Scripts/json2.js"></script>


    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>


    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>


    <!--<script src="../../../layuiadmin/PubCustom.js"></script>-->


    <script src="../../../layuiadmin/PubCustom.js"></script>


    <script src="../../CreateControl.js"></script>


</head>


<body>




 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html


@@ -307,6 +307,7 @@


        var option = [];


        var option2 = [];


        var option3 = [];


        var setIntervalIndex = null;


        //#endregion




        //#region è¿›å…¥é¡µé¢å³åŠ è½½


@@ -356,7 +357,7 @@


                txtHBarCode_KeyDown(HBarCode);


            }


        });




      


        //流转卡回车方法


        $('#HBardCodeProcExchBillNo').on('keydown', function (event) {


            var HBarCode = $('#HBardCodeProcExchBillNo').val();


@@ -365,18 +366,22 @@


                    layer.msg("流转卡不能为空！")


                    return;


                }


                setIntervalIndex = setInterval(setIntervalList, 30000);


                get_BomList(HBarCode);


                if (option.data != 0) {


                    //保存到临时表


                    get_AddBomTempList();


                }


                //if (option.data != 0) {


                //    //保存到临时表


                //    get_AddBomTempList();


                //}


                //查询不良记录


                get_BadRecords(HBarCode);


                get_BadRecords();


                //查询合格记录


                get_HGRecords();


                //查询总数量




               


            }


        });




       




        //配件回车方法


        $('#HBardCodeMater').on('keydown', function (event) {


@@ -464,7 +469,8 @@


          


            get_Display();


            get_CriticalPartsList();//关键件清单 ä¸è‰¯è®°å½•  åˆæ ¼è®°å½•


          




         


        }




        // ç”Ÿæˆå•æ®å·


@@ -624,19 +630,21 @@


        }




        //查询不良记录


        function get_BadRecords(HBarCode) {


        function get_BadRecords() {


            var ajaxLoad = layer.load();


            var HProcExchInterID = $("#HProcExchInterID").val();


            var HProcExchEntryID = $("#HProcExchEntryID").val();


            //进入页面显示的缓存列表


            $.ajax({


                url: GetWEBURL() + '/Cj_SingleStation/BadRecordsList',


                type: "GET",


                async: false,


                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },


                data: { "HProcExchInterID": HProcExchInterID, "HProcExchEntryID": HProcExchEntryID, "user": sessionStorage["HUserName"] },


                success: function (data1) {


                    if (data1.count == 1) {


                        option2.data = data1.data;


                        option2.data = data1.data.h_p_Gy_BadRecordsList;


                        table.render(option2);


                        $("#HBadCount").val(data1.data.length);


                        $("#HBadCount").val(data1.data.h_p_Gy_BadRecordsList1.length - data1.data.h_p_Gy_BadRecordsList2.length);


                        layer.close(ajaxLoad);


                    } else {


                        layer.close(ajaxLoad);


@@ -754,7 +762,7 @@


                                layer.msg("删除成功！");


                                layer.close(ajaxLoad);


                                //查询不良记录


                                get_BadRecords($("#HBardCodeProcExchBillNo").val());


                                get_BadRecords();


                            } else {


                                layer.alert(result.code + result.Message, { icon: 5 });


                                layer.close(ajaxLoad);


@@ -836,6 +844,18 @@




                        option.data = data1.data;


                        table.render(option)




                        for (var i = 0; i < option.data.length; i++) {


                            if (parseFloat(option.data[i]["配件数量"]) == 0) {


                                if (setIntervalIndex != null) {


                                    //clearInterval(setIntervalIndex);


                                    //setIntervalIndex = null;


                                    clearTimerQ();


                                }


                                return layer.msg("配件数量为0!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                            }


                        }




                    }


                    else if (data1.count == 2) {


                        layer.close(index);


@@ -860,6 +880,7 @@


                        $("#HICMOQty").val(data1.data[0]["HICMOQty"]);




                        createBillNo();


                       


                    } else {


                        layer.close(index);


                        layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


@@ -871,6 +892,38 @@


                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                }


            });


        }




        function clearTimerQ() {


            try {


                window.clearInterval(setIntervalIndex)


            } catch (error) { }


            window.setIntervalIndex = null


        }




        function setIntervalList() {


            clearTimerQ();




            var HBarCode = $('#HBardCodeProcExchBillNo').val();




            if (!HBarCode) {


                layer.msg("流转卡不能为空！")


                return;


            }


            if (option2.data.length != 0 || option3.data.length != 0) {


                get_BomList(HBarCode);


            }




            //if (option.data != 0) {


            //    //保存到临时表


            //    get_AddBomTempList();


            //}


            //查询不良记录


            get_BadRecords();


            //查询合格记录


            get_HGRecords();




            setIntervalIndex = setInterval(setIntervalList, 30000);


        }




        //配件查询数据


@@ -898,23 +951,25 @@


                                    option.data[i]["配件数量"] = data1.data[0]["HQty"];


                                    option.data[i]["HBarCode"] = HBarCode;


                                    table.render(option);




                                    PD_HBatchNo();


                                });


                                break;


                            }




                            if (data1.data[0]["HMaterNumber"] == option.data[i]["配件代码"]) {


                                option.data[i]["HBatchNo"] = data1.data[0]["HBatchNo"];


                                option.data[i]["配件数量"] = data1.data[0]["HQty"];


                                option.data[i]["HBarCode"] = HBarCode;


                                KNum += 1;


                                


                                table.render(option);




                                if (KNum == option.data.length) {


                                    layer.msg("批次已全部匹配!");


                                }


                                PD_HBatchNo();


                                break;


                            }


                           


                        }




                     


                        $('#HBardCodeMater').val("");


                    }


                    else {


@@ -928,6 +983,26 @@


                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                }


            });


        }




        //判断批次是否匹配完


        function PD_HBatchNo() {


            for (var i = 0; i < option.data.length; i++) {


                if (parseFloat(option.data[i]["配件数量"]) != 0 && option.data[i]["配件数量"] != null) {


                    KNum += 1;


                }


                if (KNum == option.data.length) {


                    layer.msg("批次已全部匹配!");


                    if (setIntervalIndex != null) {


                        clearInterval(setIntervalIndex);


                        setIntervalIndex = null;


                    }


                    setIntervalIndex = setInterval(setIntervalList, 30000);




                    get_AddBomTempList();


                }


            }


            KNum = 0;


        }




        //保存配件到产线组装单临时表


@@ -1126,7 +1201,7 @@


                    , shift: 2//弹出动画


                    , content: ['../../车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html?OperationType=1&linterid=' + $("#HInterID").val() + '&HProcExchBillNo=' + $("#HProcExchBillNo").val(), 'yes']


                    , end: function () {


                        get_BadRecords($("#HBardCodeProcExchBillNo").val());


                        get_BadRecords();


                    }


                })


            }


@@ -1164,7 +1239,7 @@


                        //查询合格记录


                        get_HGRecords();


                        //查询不良记录


                        get_BadRecords(HBardCodeProcExchBillNo);


                        get_BadRecords();


                    }


                    else {


                        layer.close(index);