合并分支

chenhaozhe

2025-05-21 e50265de5ae4e5e4c8b8852e777216adab7c4ce4

 WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast.html

@@ -103,8 +103,8 @@
                    </div>                 
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                        <ul class="layui-tab-title">
                            <li style="padding:1px;" class="layui-this">表头信息</li>
                            <li style="padding:1px;">明细信息</li>
                            <li lay-id="1" style="padding:1px;" class="layui-this">表头信息</li>
                            <li lay-id="2" style="padding:1px;">明细信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
@@ -186,7 +186,7 @@
            });

            //进入页面默认光标在条形码上
            $("#HBarCode").focus();
            $("#HBillNo").focus();

            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
@@ -198,6 +198,49 @@
            form.on('submit(QueDin)', function (data) {
                GetMeesageByBarCode();
            });
            
            ////扫描条形码方法new
            //function GetMeesageByBarCode() {
            //    var HBarCode = $('#HBarCode').val();
            //    if (!HBarCode) {
            //        layer.msg("条形码不能为空！")
            //        return;
            //    }
            //    var HInterID = $('#HInterID').val();
            //    if (!HInterID) {
            //        layer.msg("请先输入收料通知单单据号！")
            //        return;
            //    }
            //    var index = layer.load();
            //    $.ajax({
            //        url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
            //        type: "GET",
            //        data: { "HBarCode": HBarCode, "HInterID": HInterID },
            //        success: function (result) {
            //            if (result.code == "1") {
            //                var sSubStr = table.cache['mainTable'];
            //                for (var i = 0; i < sSubStr.length; i++) {
            //                    if (sSubStr[i].HMaterID == result.data[0].HMaterID) {
            //                        sSubStr[i].HSQty += result.data[0].HQty;
            //                        table.render(option);
            //                        break;
            //                    }
            //                }
            //                layer.close(index);
            //            }
            //            else {
            //                layer.close(index);
            //                layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //            }
            //        },
            //        error: function (err) {
            //            layer.close(index);
            //            layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //        }
            //    });
            //    $('#HBarCode').val("");
            //    $("#HBarCode").focus();
            //}
            //扫描条形码方法
            function GetMeesageByBarCode() {
                var HBarCode = $('#HBarCode').val();
@@ -253,6 +296,7 @@
            //审核
            form.on('submit(btn_Check)', function (data) {//审核
                var sSubStr = table.cache['mainTable'];
                var HReturn = "";
                for (var i = 0; i < sSubStr.length; i++) {
                    if (parseInt(sSubStr[i].HSQty) > parseInt(sSubStr[i].HQty)) {
                        layer.msg("明细记录第" + (i + 1) + "行,扫码数量不能超出订单数量!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -262,18 +306,51 @@
                        layer.msg("明细记录第" + (i + 1) + "行,扫码数量为0", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    if (parseInt(sSubStr[i].HSQty) != parseInt(sSubStr[i].HQty)) {
                        HReturn += "第" + (i + 1) + "行,订单数量与条码数量不一致，是否继续审核<br/>";                       
                    }
                }

                if (HReturn != "") {
                    layer.confirm(HReturn, {
                        title: "操作提示",
                        icon: 0,
                        btn: ['确认', '取消'] //可以无限个按钮                      
                    }, function (index, layero) {
                        //按钮一回调
                        set_Aduit();
                    }, function (index) {
                        //按钮二回调
                        return;
                    });
                } else {
                    set_Aduit();
                }       
                
            });

            //审核按钮方法
            function set_Aduit() {
                var index = layer.load();
                var HInterID = $('#HInterID').val();
                var HBillNo = $('#HBillNo').val();
                var sSubStr = table.cache['mainTable'];

                //拼接序列化的数据
                var msg = JSON.stringify(sSubStr) + ';' + sessionStorage["HUserName"];

                $.ajax({
                    url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost",
                    type: "Post",
                    data: { "msg": JSON.stringify(sSubStr) },
                    data: { "msg": msg },
                    success: function (result) {
                        if (result.code == "1") {
                            layer.msg("审核成功", { icon: 1, btn: ['确认'], time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            layer.msg("审核成功", {
                                icon: 1, time: 1000000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                            }, function () {
                                window.location.reload();
                                element.tabChange('TabTest', '1');
                            });
                            layer.close(index);
                        }
                        else {
@@ -286,7 +363,7 @@
                        layer.close(index);
                    }
                });
            });
            }

            //初始化表格
            function set_InitGrid() {
@@ -370,10 +447,17 @@
                            option.data = result.data;
                            table.render(option);
                            layer.close(index);
                            element.tabChange('TabTest', '2');
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            layer.msg(result.Message, {
                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                            }, function () {
                                element.tabChange('TabTest', '1');
                                $("#HBillNo").select();
                                $("#HBillNo").focus();
                            });
                        }
                    },
                    error: function (err) {