生产领料单校验扫码模块优化

yxj

1 天以前 1063e43e00819590b787fb813df36030e601ad7c

生产领料单校验扫码模块优化

 WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBill_Check_PDA.html

@@ -81,7 +81,8 @@
                            <ul class="layui-tab-title" lay-filter="tab-all">
                                <li lay-id="1" style="padding:1px;">表头信息</li>
                                <li lay-id="2" style="padding:1px;">物料信息</li>
                                <li lay-id="3" style="padding:1px;">条码信息</li>
                                <li lay-id="3" style="padding:1px;">下架信息</li>
                                <li lay-id="4" style="padding:1px;">条码信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <!--表头信息-->
@@ -147,6 +148,15 @@
                                        <div class="layui-col-xs12">
                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                            <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                                        </div>
                                    </div>
                                </div>
                                <!--下架信息-->
                                <div class="layui-tab-item">
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
                                            <table class="layui-hide" id="FIFOList-table" lay-filter="FIFOList-table"></table>
                                        </div>
                                    </div>
                                </div>
@@ -296,6 +306,7 @@
            var HSourceBarCodeCtl = "N" //是否进行源单对应条码核对（'Y'为核对）
            var OperationType = 1       //操作类型（1新增、2从缓存列表中返回）
            var listOption = [];
            var FIFOListOption = [];
            var columns = "";
            var HModName = "Kf_MateOutBill_Check_PDA";
            var ModRightName = "CE_MateOutCheck";    //模块权限参数
@@ -397,6 +408,8 @@
                ]];
                listOption.data = data;
                table.render(listOption);
                FIFOListOption.data = data;
                table.render(FIFOListOption);

                //光标默认在单据号位置上
                var pFocus = $("#HBillNo");
@@ -417,6 +430,30 @@
                        layer.closeAll("loading");
                    }
                };

                //下架信息
                FIFOListOption = {
                    elem: '#FIFOList-table'
                    //, toolbar: '#toolbarDemo'
                    , cellMinWidth: 90
                    , limit: 3000
                    , totalRow: true
                    , cols: [[
                        { field: '数量', title: '数量', width: 80, totalRow: true }
                        , { field: '下架数量', title: '下架数量', width: 90 }
                        , { field: '仓库', title: '仓库', width: 150 }
                        , { field: '仓位', title: '仓位', width: 150 }
                        , { field: '物料代码', title: '物料代码', width: 150 }
                        , { field: '物料名称', title: '物料名称', width: 150 }
                        , { field: '规格型号', title: '规格型号', width: 150 }
                        , { field: '控制值', title: '控制值', width: 150 }
                        , { field: '辅助属性', title: '辅助属性', width: 150 }
                    ]]
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                }
            }

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
@@ -774,14 +811,33 @@

            form.on('submit(cmdCancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    if (OperationType == 2) {
                        var index = parent.layer.getFrameIndex(window.name);    //先得到当前iframe层的索引
                        parent.location.reload();                               //刷新父页面，注意一定要在关闭当前iframe层之前执行刷新
                        parent.layer.close(index);                              //再执行关闭
                    }
                    else {
                        parent.location.href = "../../../views/index_Mobile.html";
                    }
                    //更新先进先出临时表状态（更新 HlineStatus =1）
                    $.ajax({
                        type: "Get",
                        url: GetWEBURL() + "/WEBSController/set_UPDateFIFOTmp_BillCheck_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                if (OperationType == 2) {
                                    var index = parent.layer.getFrameIndex(window.name);    //先得到当前iframe层的索引
                                    parent.location.reload();                               //刷新父页面，注意一定要在关闭当前iframe层之前执行刷新
                                    parent.layer.close(index);                              //再执行关闭
                                }
                                else {
                                    parent.location.href = "../../../views/index_Mobile.html";
                                }
                            }
                            else {
                                layer.msg(data.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        complete: function (XHR, TS) { XHR = null },//回收资源
                        error: function (err) {
                            layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    });
                });
            })

@@ -888,6 +944,7 @@
                                layer.confirm(result.data.hRemarkField, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                    btn2: function () {
                                        location.replace('Kf_MateOutBill_Check_PDA.html?OperationType=1&HInterID=0');
                                    }//关闭
                                }
                                , function () {
@@ -1067,7 +1124,7 @@
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
                        success: function (result) {
                            if (result.count == 1) {
                                playSound_OK();
@@ -1114,6 +1171,7 @@
                                        layer.confirm(result.data.hRemarkField, {
                                            icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                            btn2: function () {
                                                location.replace('Kf_MateOutBill_Check_PDA.html?OperationType=1&HInterID=0');
                                            }//关闭
                                        }
                                        , function () {
@@ -1154,6 +1212,52 @@
                                $("#HQty").val("");
                                //显示表体明细
                                DisBillEntryList();
                            }
                            //启用先进先出仅提示控制，条码不在先进先出列表中时提示
                            else if (result.count == 2) {
                                playSound();
                                element.tabChange('tab-Kf_MateOutBill_Check_PDA', '2');
                                layer.confirm(result.Message, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['允许', '不允许'],
                                    btn2: function () {
                                    }//关闭
                                }
                                , function () {
                                    $.ajax({
                                        type: "GET",
                                        url: GetWEBURL() + "/WEBSController/get_SavePonderationBillMain_Temp_BarCodeFIFO_BillCheck_Json",
                                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HSCWHID": 0, "HSCSPID": 0, "HQty": sHQty, "HStockOrgID": HStockOrgID },
                                        success: function (result) {
                                            if (result.count == 1) {
                                                //清空数量
                                                $("#HQty").val("");
                                                layer.closeAll();
                                                //显示表体明细
                                                DisBillEntryList();
                                            }
                                            else {
                                                playSound();
                                                layer.msg(result.Message, {
                                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                                }, function () {
                                                    $("#HBarCode").select();
                                                    $("#HBarCode").focus();
                                                });
                                            }
                                        },
                                        complete: function (XHR, TS) { XHR = null },//回收资源
                                        error: function (err) {
                                            playSound();
                                            layer.msg("错误！" + err, {
                                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                            }, function () {
                                                $("#HBarCode").select();
                                                $("#HBarCode").focus();
                                            });
                                        }
                                    });
                                });//清空
                            }
                            else {
                                playSound();
@@ -1241,6 +1345,13 @@
                            listOption.totalRow = true;
                            table.cache['wl-table'] = null;         //清空表格缓存数据
                            table.render(listOption);
                            if (result.data.FIFOlist.length != 0) {
                                if (result.data.FIFOlist[0].HMaterID != 0) {
                                    FIFOListOption.data = result.data.FIFOlist;
                                    table.cache['FIFOList-table'] = null;         //清空表格缓存数据
                                    table.render(FIFOListOption);
                                }
                            }

                            //条码信息
                            $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);