Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

llj

7 天以前 c32c47bed40ee7bef531ea42df2fcdd55d479fc4

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/WebTM.csproj

@@ -473,6 +473,8 @@
    <Content Include="views\基础资料\公用基础资料\Gy_MaterialPackingRelation_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlzuotuo_xiaowei.aspx" />
@@ -2704,6 +2706,20 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_xiaoweizutuo.aspx.designer.cs">
      <DependentUpon>xmlLBM_xiaoweizutuo.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -4,10 +4,10 @@
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/API/";        //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/"           //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"           //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";        //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/";          //陈镐哲本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //李林俊本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //李林俊本地配置
    //var WEBURL = "http://localhost:8080/API/";        //王仪本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)

 WebTM/views/Baseset/»ù´¡×ÊÁÏ/saomazutuo_xiaowei.html

@@ -381,6 +381,7 @@
                table.render({
                    elem: '#resultTable',
                    cols: [[
                        { field: 'hmainid', title: 'hmainid', width: 120, hide: true },
                        { field: '栈板码', title: '栈板码', width: 120 },
                        { field: '中箱码', title: '中箱码', width: 120 },
                        { field: '日期', title: '日期', width: 100 },
@@ -419,8 +420,8 @@
                    if (resultTableData.length > 0)  {
                        var rows = '';
                        for (var i = 0; i < resultTableData.length; i++) {
                            if (resultTableData[i]['栈板码']) {
                                rows += resultTableData[i]['栈板码'] + ',';
                            if (resultTableData[i]['hmainid']) {
                                rows += resultTableData[i]['hmainid'] + ',';
                            }
                        }
                        if (rows.length > 0) {

 WebTM/views/WMSɨÂëÄ£¿é/ÆäËûÈë¿â/Kf_OtherInBill_Check_PDA.html

@@ -888,6 +888,7 @@
                                layer.confirm(result.data.hRemarkField, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                    btn2: function () {
                                        location.replace('Kf_OtherInBill_Check_PDA.html?OperationType=1&HInterID=0');
                                    }//关闭
                                }
                                , function () {
@@ -1067,7 +1068,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 +1115,7 @@
                                        layer.confirm(result.data.hRemarkField, {
                                            icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                            btn2: function () {
                                                location.replace('Kf_OtherInBill_Check_PDA.html?OperationType=1&HInterID=0');
                                            }//关闭
                                        }
                                        , function () {

 WebTM/views/WMSɨÂëÄ£¿é/ÆäËû³ö¿â/Kf_OtherOutBill_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">
                                <!--表头信息-->
@@ -96,10 +97,10 @@
                                                    <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                </div>
                                                <!--<div class="layui-col-xs2">
                                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                    </button>
                                                </div>-->
                                                <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>-->
                                                <div class="layui-col-xs2" style="float: right;">
                                                    <button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
                                                </div>
@@ -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_OtherOutBill_Check_PDA";
            var ModRightName = "CE_OtherOutCheck";    //模块权限参数
@@ -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_OtherOutBill_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_OtherOutBill_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_MateReplenishOutBill_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);

 WebTM/views/WMSɨÂëÄ£¿é/ίÍâ²¹ÁÏ/Kf_EntrustReplenishOutBill_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">
                                <!--表头信息-->
@@ -96,10 +97,10 @@
                                                    <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                </div>
                                                <!--<div class="layui-col-xs2">
                                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                    </button>
                                                </div>-->
                                                <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>-->
                                                <div class="layui-col-xs2" style="float: right;">
                                                    <button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
                                                </div>
@@ -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_EntrustReplenishOutBill_Check_PDA";
            var ModRightName = "CE_EntrustReplenishOutCheck";    //模块权限参数
@@ -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_EntrustReplenishOutBill_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_EntrustReplenishOutBill_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_MateReplenishOutBill_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);

 WebTM/views/WMSɨÂëÄ£¿é/ίÍâÁìÁÏ/Kf_EntrustOutBill_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">
                                <!--表头信息-->
@@ -96,10 +97,10 @@
                                                    <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                </div>
                                                <!--<div class="layui-col-xs2">
                                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                    </button>
                                                </div>-->
                                                <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>-->
                                                <div class="layui-col-xs2" style="float: right;">
                                                    <button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
                                                </div>
@@ -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_EntrustOutBill_Check_PDA";
            var ModRightName = "CE_EntrustOutCheck";    //模块权限参数
@@ -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_EntrustOutBill_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_EntrustOutBill_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_MateReplenishOutBill_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);

 WebTM/views/WMSɨÂëÄ£¿é/Éú²úÈë¿â/Kf_ProductInBill_Check_PDA.html

@@ -888,6 +888,7 @@
                                layer.confirm(result.data.hRemarkField, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                    btn2: function () {
                                        location.replace('Kf_ProductInBill_Check_PDA.html?OperationType=1&HInterID=0');
                                    }//关闭
                                }
                                , function () {
@@ -1067,7 +1068,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 +1115,7 @@
                                        layer.confirm(result.data.hRemarkField, {
                                            icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                            btn2: function () {
                                                location.replace('Kf_ProductInBill_Check_PDA.html?OperationType=1&HInterID=0');
                                            }//关闭
                                        }
                                        , function () {

 WebTM/views/WMSɨÂëÄ£¿é/Éú²ú²¹ÁÏ/Kf_MateReplenishOutBill_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_MateReplenishOutBill_Check_PDA";
            var ModRightName = "CE_MateReplenishOutCheck";    //模块权限参数
@@ -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_MateReplenishOutBill_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_MateReplenishOutBill_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_MateReplenishOutBill_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);

 WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_Check_PDA.html

@@ -57,6 +57,32 @@
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">仓库</label>
                                </div>
                                <div class="layui-col-xs6">
                                    <input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                    <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
                                </div>
                                <div class="layui-col-xs3">
                                    <button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
                                </div>
                            </div>
                            <div class="layui-col-xs6">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">仓位</label>
                                </div>
                                <div class="layui-col-xs6">
                                    <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                    <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                </div>
                                <div class="layui-col-xs3">
                                    <button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
                            <div class="layui-col-xs6">
                                <div class="layui-col-xs4">
                                    <label class="layui-form-label" style="width:56px;padding-left:0px;">调入仓库</label>
                                </div>
                                <div class="layui-col-xs5">
                                    <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                    <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
                                </div>
@@ -65,10 +91,10 @@
                                </div>
                            </div>
                            <div class="layui-col-xs6">
                                <div class="layui-col-xs3">
                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">仓位</label>
                                <div class="layui-col-xs4">
                                    <label class="layui-form-label" style="width:56px;padding-left:0px;">调入仓位</label>
                                </div>
                                <div class="layui-col-xs6">
                                <div class="layui-col-xs5">
                                    <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                    <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                </div>
@@ -81,7 +107,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">
                                <!--表头信息-->
@@ -96,10 +123,10 @@
                                                    <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                </div>
                                                <!--<div class="layui-col-xs2">
                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                    </button>
                                </div>-->
                                                <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>-->
                                                <div class="layui-col-xs2" style="float: right;">
                                                    <button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
                                                </div>
@@ -156,6 +183,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>
@@ -322,10 +358,13 @@
            var HBillNo = $('#HBillNo').val()
            var HBillType = '1207'
            var HMaker = sessionStorage["HUserName"]
            var HStockOrgID = sessionStorage["OrganizationID"]  //组织ID
            var HStockInOrgID = sessionStorage["OrganizationID"]    //调入组织ID
            var HStockOutOrgID = sessionStorage["OrganizationID"]   //调出组织ID
            var HStockOrgID = sessionStorage["OrganizationID"]      //登入组织ID
            var HSourceBarCodeCtl = "N" //是否进行源单对应条码核对（'Y'为核对）
            var OperationType = 1       //操作类型（1新增、2从缓存列表中返回）
            var listOption = [];
            var FIFOListOption = [];
            var columns = "";
            var HModName = "Kf_MoveStockBill_Check_PDA";
            var ModRightName = "CE_MoveStockCheck";    //模块权限参数
@@ -432,6 +471,8 @@
                ]];
                listOption.data = data;
                table.render(listOption);
                FIFOListOption.data = data;
                table.render(FIFOListOption);

                //光标默认在单据号位置上
                var pFocus = $("#HBillNo");
@@ -452,6 +493,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 ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
@@ -505,8 +570,179 @@

            //#region åŸºç¡€èµ„料选择

            //#region ä»“库
            //扫描仓库条码
            //#region è°ƒå‡ºä»“库
            //扫描调出仓库条码
            $('#HSCWHName').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    var HSCWHName = $('#HSCWHName').val()
                    if (HSCWHName == '') {
                        playSound();
                        $("#HSCWHID").val("0");
                        $("#HSCWHName").val("");
                        $("#HOutStockPlaceID").val("0");
                        $("#HOutStockPlaceName").val("");
                        $("#HOutStockPlaceName").removeAttr("disabled");
                        $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                        layer.msg("调出仓库条码为空！", {
                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                        }, function () {
                            $("#HSCWHName").select();
                            $("#HSCWHName").focus();
                        });
                        return;
                    }

                    layer.load(3);
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "HBarCode": HSCWHName, "HStockOrgID": HStockOutOrgID },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HSCWHID").val(result.data[0].HItemID);
                                $("#HSCWHName").val(result.data[0].HName);
                                $("#HOutStockPlaceID").val(result.data[0].HSPID);
                                $("#HOutStockPlaceName").val(result.data[0].HSPName);
                                if (result.data[0].HSPFlag == 0) {
                                    $("#HOutStockPlaceName").attr("disabled", "disabled");
                                    $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                                }
                                else {
                                    $("#HOutStockPlaceName").removeAttr("disabled");
                                    $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                                }
                                //光标显示到条码上
                                $("#HBarCode").select();
                                $("#HBarCode").focus();
                            }
                            else {
                                playSound();
                                $("#HSCWHID").val("0");
                                $("#HSCWHName").val("");
                                $("#HOutStockPlaceID").val("0");
                                $("#HOutStockPlaceName").val("");
                                $("#HOutStockPlaceName").removeAttr("disabled");
                                $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                                layer.msg(result.Message, {
                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                }, function () {
                                    $("#HSCWHName").select();
                                    $("#HSCWHName").focus();
                                });
                            }
                            layer.closeAll("loading");
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });

            //调出仓库按钮
            form.on('submit(HSCWHID-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓库列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseListNew.html?Type=HSCWHID&HOrgID=' + HStockOutOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });

            //#endregion

            //#region è°ƒå‡ºä»“位
            //扫描调出仓位条码
            $('#HOutStockPlaceName').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    //调出仓库文本框为空时，清空对应ID
                    if ($("#HSCWHName").val() == '') {
                        $("#HSCWHID").val("0");
                    }
                    var sHSCWHID = $("#HSCWHID").val()
                    var HOutStockPlaceName = $('#HOutStockPlaceName').val()
                    if (HOutStockPlaceName == '') {
                        playSound();
                        $("#HSCWHID").val("0");
                        $("#HSCWHName").val("");
                        $("#HOutStockPlaceID").val("0");
                        $("#HOutStockPlaceName").val("");
                        layer.msg("调出仓位条码为空！", {
                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                        }, function () {
                            $("#HOutStockPlaceName").select();
                            $("#HOutStockPlaceName").focus();
                        });
                        return;
                    }

                    layer.load(3);
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "HBarCode": HOutStockPlaceName, "HWhID": sHSCWHID, "HStockOrgID": HStockOutOrgID },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HOutStockPlaceName").val(result.data[0].HName);
                                $("#HOutStockPlaceID").val(result.data[0].HItemID);
                                $("#HSCWHName").val(result.data[0].HWhName);
                                $("#HSCWHID").val(result.data[0].HWHID);
                                //光标显示到条码上
                                $("#HBarCode").select();
                                $("#HBarCode").focus();
                            }
                            else {
                                playSound();
                                $("#HSCWHID").val("0");
                                $("#HSCWHName").val("");
                                $("#HOutStockPlaceID").val("0");
                                $("#HOutStockPlaceName").val("");
                                layer.msg(result.Message, {
                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                                }, function () {
                                    $("#HOutStockPlaceName").select();
                                    $("#HOutStockPlaceName").focus();
                                });
                            }
                            layer.closeAll("loading");
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });

            //调出仓位按钮
            form.on('submit(HSCSpID-BT)', function () {
                //调出仓库文本框为空时，清空对应ID
                if ($("#HSCWHName").val() == '') {
                    $("#HSCWHID").val("0");
                }
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓位列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceListNew.html?HWhID=' + $("#HSCWHID").val() + '&Type=HOSpID&HOrgID=' + HStockOutOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });

            //#endregion

            //#region è°ƒå…¥ä»“库
            //扫描调入仓库条码
            $('#HWHName').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    var HWHName = $('#HWHName').val()
@@ -518,7 +754,7 @@
                        $("#HStockPlaceName").val("");
                        $("#HStockPlaceName").removeAttr("disabled");
                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                        layer.msg("仓库条码为空！", {
                        layer.msg("调入仓库条码为空！", {
                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                        }, function () {
                            $("#HWHName").select();
@@ -532,7 +768,7 @@
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
                        data: { "HBarCode": HWHName, "HStockOrgID": HStockInOrgID },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HWHID").val(result.data[0].HItemID);
@@ -547,6 +783,7 @@
                                    $("#HStockPlaceName").removeAttr("disabled");
                                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                                }
                                element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
                                //光标显示到条码上
                                $("#HBarCode").select();
                                $("#HBarCode").focus();
@@ -573,7 +810,7 @@
                }
            });

            //仓库按钮
            //调入仓库按钮
            form.on('submit(HWHID-BT)', function () {
                layer.open({
                    type: 2
@@ -582,7 +819,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockInOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -592,11 +829,11 @@

            //#endregion

            //#region ä»“位
            //扫描仓位条码
            //#region è°ƒå…¥ä»“位
            //扫描调入仓位条码
            $('#HStockPlaceName').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    //仓库文本框为空时，清空对应ID
                    //调入仓库文本框为空时，清空对应ID
                    if ($("#HWHName").val() == '') {
                        $("#HWHID").val("0");
                    }
@@ -608,7 +845,7 @@
                        $("#HWHName").val("");
                        $("#HStockPlaceID").val("0");
                        $("#HStockPlaceName").val("");
                        layer.msg("仓位条码为空！", {
                        layer.msg("调入仓位条码为空！", {
                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                        }, function () {
                            $("#HStockPlaceName").select();
@@ -622,13 +859,14 @@
                        type: "GET",
                        url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
                        async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                        data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
                        data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockInOrgID },
                        success: function (result) {
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $("#HStockPlaceName").val(result.data[0].HName);
                                $("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HWHName").val(result.data[0].HWhName);
                                $("#HWHID").val(result.data[0].HWHID);
                                element.tabChange('tab-Kf_MoveStockBill_PDA', '2');
                                //光标显示到条码上
                                $("#HBarCode").select();
                                $("#HBarCode").focus();
@@ -653,9 +891,9 @@
                }
            });

            //仓位按钮
            //调入仓位按钮
            form.on('submit(HSpID-BT)', function () {
                //仓库文本框为空时，清空对应ID
                //调入仓库文本框为空时，清空对应ID
                if ($("#HWHName").val() == '') {
                    $("#HWHID").val("0");
                }
@@ -666,7 +904,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockInOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -809,14 +1047,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: "温馨提示" });
                        }
                    });
                });
            })

@@ -907,6 +1164,28 @@
                            $('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                            $('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                            HInterID = $('#HInterID').val()
                            //调入组织不同时，清空调入仓库仓位
                            if (HStockInOrgID != $('#HStockInOrgID').val())
                            {
                                HStockInOrgID = $('#HStockInOrgID').val()
                                $("#HWHID").val("0");
                                $("#HWHName").val("");
                                $("#HStockPlaceID").val("0");
                                $("#HStockPlaceName").val("");
                                $("#HStockPlaceName").removeAttr("disabled");
                                $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                            }
                            //调出组织不同时，清空调出仓库仓位
                            if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
                                HStockOutOrgID = $('#HStockOutOrgID').val()
                                $("#HSCWHID").val("0");
                                $("#HSCWHName").val("");
                                $("#HOutStockPlaceID").val("0");
                                $("#HOutStockPlaceName").val("");
                                $("#HOutStockPlaceName").removeAttr("disabled");
                                $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                            }

                            //条码核对标记
                            if (result.data.hSourceBarCodeFlagField) {
                                $("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
@@ -927,6 +1206,7 @@
                                layer.confirm(result.data.hRemarkField, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                    btn2: function () {
                                        location.replace('Kf_MoveStockBill_Check_PDA.html?OperationType=1&HInterID=0');
                                    }//关闭
                                }
                                , function () {
@@ -1004,6 +1284,12 @@
            //扫条码
            function GetMeesageByBarCode(obj) {
                //仓库、仓位文本框为空时，清空对应ID
                if ($("#HSCWHName").val() == '') {
                    $("#HSCWHID").val("0");
                }
                if ($("#HOutStockPlaceName").val() == '') {
                    $("#HOutStockPlaceID").val("0");
                }
                if ($("#HWHName").val() == '') {
                    $("#HWHID").val("0");
                }
@@ -1013,6 +1299,8 @@
                var sOldBarCode = $('#HBarCode').val()
                var HDeleteFlag = sOldBarCode.substring(0, 1);
                var sBarCode = sOldBarCode.slice(1);
                var sHSCWHID = $("#HSCWHID").val()
                var sHSCSPID = $("#HOutStockPlaceID").val()
                var sHWHID = $("#HWHID").val()
                var sHSPID = $("#HStockPlaceID").val()
                var sHQty = $("#HQty").val()
@@ -1106,39 +1394,45 @@
                        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": sHSCWHID, "HSPID": sHSCSPID, "HSCWHID": sHWHID, "HSCSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
                        success: function (result) {
                            if (result.count == 1) {
                                playSound_OK();
                                if (result.data.hBarTypeField == '仓库条码') {
                                    $("#HWHName").val(result.data.hWhNameField);
                                    $("#HWHID").val(result.data.hWhIDField);
                                    $("#HStockPlaceName").val(result.data.hSPNameField);
                                    $("#HStockPlaceID").val(result.data.hSPIDField);
                                    $("#HSCWHName").val(result.data.hWhNameField);
                                    $("#HSCWHID").val(result.data.hWhIDField);
                                    $("#HOutStockPlaceName").val(result.data.hSPNameField);
                                    $("#HOutStockPlaceID").val(result.data.hSPIDField);
                                    if (result.data.hSPFlagField == 0) {
                                        $("#HStockPlaceName").attr("disabled", "disabled");
                                        $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                                        $("#HOutStockPlaceName").attr("disabled", "disabled");
                                        $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                                    }
                                    else {
                                        $("#HStockPlaceName").removeAttr("disabled");
                                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                                        $("#HOutStockPlaceName").removeAttr("disabled");
                                        $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                                    }
                                    return;//结束
                                }
                                else if (result.data.hBarTypeField == '仓位条码') {
                                    $("#HStockPlaceName").val(result.data.hSPNameField);
                                    $("#HStockPlaceID").val(result.data.hSPIDField);
                                    $("#HWHName").val(result.data.hWhNameField);
                                    $("#HWHID").val(result.data.hWhIDField);
                                    $("#HOutStockPlaceName").val(result.data.hSPNameField);
                                    $("#HOutStockPlaceID").val(result.data.hSPIDField);
                                    $("#HSCWHName").val(result.data.hWhNameField);
                                    $("#HSCWHID").val(result.data.hWhIDField);
                                    return;//结束
                                }
                                else if (result.data.hBarTypeField == '源单条码') {
                                    $('#HInterID').val(result.data.hInterIDField)
                                    $('#HBillNo').val(result.data.hBillNoField)
                                    $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField)
                                    $("#HStockOutOrgName").val(result.data.hStockOutOrgNameField)
                                    $("#HStockInOrgID").val(result.data.hStockInOrgIDField)
                                    $("#HStockInOrgName").val(result.data.hStockInOrgNameField)
                                    $("#HBillNo").attr("disabled", "disabled");
                                    $('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                                    $('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                                    HInterID = $('#HInterID').val()
                                    HStockInOrgID = $('#HStockInOrgID').val()
                                    HStockOutOrgID = $('#HStockOutOrgID').val()
                                    //条码核对标记
                                    if (result.data.hSourceBarCodeFlagField) {
                                        $("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
@@ -1153,6 +1447,7 @@
                                        layer.confirm(result.data.hRemarkField, {
                                            icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                            btn2: function () {
                                                location.replace('Kf_MoveStockBill_Check_PDA.html?OperationType=1&HInterID=0');
                                            }//关闭
                                        }
                                        , function () {
@@ -1193,6 +1488,52 @@
                                $("#HQty").val("");
                                //显示表体明细
                                DisBillEntryList();
                            }
                            //启用先进先出仅提示控制，条码不在先进先出列表中时提示
                            else if (result.count == 2) {
                                playSound();
                                element.tabChange('tab-Kf_MateReplenishOutBill_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": sHSCWHID, "HSPID": sHSCSPID, "HSCWHID": sHWHID, "HSCSPID": sHSPID, "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();
@@ -1280,6 +1621,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);
@@ -1356,9 +1704,34 @@
        //以上为layui模块
        //此处方法涉及到被外部页面parent.方法名调用的必须放在Layui方法外部

        //点击按钮选择后   è¿”回仓库信息
        function GetHWHValue(obj)
        {
        //点击按钮选择后   è¿”回调出仓库信息
        function GetHSCWHNAMEValue(obj) {
            if (obj.length > 0) {
                $("#HSCWHName").val(obj[0].HName);
                $("#HSCWHID").val(obj[0].HItemID);
                $("#HOutStockPlaceName").val(obj[0].HSPName);
                $("#HOutStockPlaceID").val(obj[0].HSPID);
                if (obj[0].HSPFlag == 0) {
                    $("#HOutStockPlaceName").attr("disabled", "disabled");
                    $('#HSCSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//按钮禁用
                }
                else {
                    $("#HOutStockPlaceName").removeAttr("disabled");
                    $('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//按钮恢复正常状态
                }
            }
        }
        //点击按钮选择后   è¿”回调出仓位信息
        function GetHOutStockPlaceIDValue(obj) {
            if (obj.length > 0) {
                $("#HOutStockPlaceName").val(obj[0].HName);
                $("#HOutStockPlaceID").val(obj[0].HItemID);
                $("#HSCWHName").val(obj[0].HWhName);
                $("#HSCWHID").val(obj[0].HWHID);
            }
        }
        //点击按钮选择后   è¿”回调入仓库信息
        function GetHWHValue(obj) {
            if (obj.length > 0) {
                $("#HWHName").val(obj[0].HName);
                $("#HWHID").val(obj[0].HItemID);
@@ -1374,7 +1747,7 @@
                }
            }
        }
        //点击按钮选择后   è¿”回仓位信息
        //点击按钮选择后   è¿”回调入仓位信息
        function GetHSpValue(obj) {
            if (obj.length > 0) {
                $("#HStockPlaceName").val(obj[0].HName);

 WebTM/views/WMSɨÂëÄ£¿é/²É¹ºÈë¿â/Kf_POStockInBill_Check_PDA.html

@@ -888,6 +888,7 @@
                                layer.confirm(result.data.hRemarkField, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                    btn2: function () {
                                        location.replace('Kf_POStockInBill_Check_PDA.html?OperationType=1&HInterID=0');
                                    }//关闭
                                }
                                , function () {
@@ -1067,7 +1068,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 +1115,7 @@
                                        layer.confirm(result.data.hRemarkField, {
                                            icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['清空', '关闭'],
                                            btn2: function () {
                                                location.replace('Kf_POStockInBill_Check_PDA.html?OperationType=1&HInterID=0');
                                            }//关闭
                                        }
                                        , function () {

 WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_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">
                                <!--表头信息-->
@@ -96,10 +97,10 @@
                                                    <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                </div>
                                                <!--<div class="layui-col-xs2">
                                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                    </button>
                                                </div>-->
                                                <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
                                                </button>
                                            </div>-->
                                                <div class="layui-col-xs2" style="float: right;">
                                                    <button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
                                                </div>
@@ -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_SellOutBill_Check_PDA";
            var ModRightName = "CE_SellOutCheck";    //模块权限参数
@@ -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_SellOutBill_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_SellOutBill_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_MateReplenishOutBill_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);

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html

@@ -381,7 +381,7 @@
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_BarCodeDetailQuery.aspx?linterid=" + value, true, "");
                break;
            case "HGy_BarCodeBill_xiaowei": //zutuoxiaowei明细
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlzuotuo_xiaowei.aspx?linterid=" + value, true, "");
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_HGy_BarCodeBill_ZB.aspx?linterid=" + value, true, "");
                break;
        }
    </script>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_HGy_BarCodeBill_ZB.aspx

New file
@@ -0,0 +1,29 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_HGy_BarCodeBill_ZB.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_HGy_BarCodeBill_ZB" %>

<!DOCTYPE html>

<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title></title>
    <script runat="server"> 
        protected void Page_Load(object sender, EventArgs e)
        {
            //★特别提示★：
            //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
            //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_BarCodeBillList where hmainid in(" + Request.Params["linterid"]+ ") order by hmainid desc");
            SqlXMLReportData.GenOneRecordset(this,"select * from h_v_Gy_BarCodeList_Pallet where HInterID = " + Request.Params["linterid"]);
        }
</script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_HGy_BarCodeBill_ZB.aspx.cs

New file
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;

namespace WebTM.views.基础资料.公用基础资料
{
    public partial class xmlLBM_HGy_BarCodeBill_ZB : System.Web.UI.Page
    {
        //protected void Page_Load(object sender, EventArgs e)
        //{

        //}
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_HGy_BarCodeBill_ZB.aspx.designer.cs

New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能导致不正确的行为，如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------

namespace WebTM.views.基础资料.公用基础资料
{


    public partial class xmlLBM_HGy_BarCodeBill_ZB
    {

        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„字段。
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.aspx

New file
@@ -0,0 +1,29 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_xiaoweizutuo.aspx.cs" Inherits="WebTM.views.基础资料.公用基础资料.xmlLBM_xiaoweizutuo" %>

<!DOCTYPE html>

<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title></title>
     <script runat="server"> 
    protected void Page_Load(object sender, EventArgs e)
    {
        //★特别提示★：
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_EquipFileMainList where hmainid=" + Request.Params["linterid"]);
        SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack æ ˆæ¿ç ,HBarCode ä¸­ç®±ç ,b.hnumber ç‰©æ–™ä»£ç ,b.hname ç‰©æ–™åç§° from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid  where HBarCode_Pack in (" + Request.Params["linterid"] + ") ", "select 1");
    }
</script>
</head>
<body>
    <form id="form1" runat="server">
        <div>
        </div>
    </form>
</body>
</html>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_xiaoweizutuo.aspx.designer.cs

New file
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <自动生成>
//     æ­¤ä»£ç ç”±å·¥å…·ç”Ÿæˆã€‚
//
//     å¯¹æ­¤æ–‡ä»¶çš„更改可能导致不正确的行为，如果
//     é‡æ–°ç”Ÿæˆä»£ç ï¼Œåˆ™æ‰€åšæ›´æ”¹å°†ä¸¢å¤±ã€‚
// </自动生成>
//------------------------------------------------------------------------------

namespace WebTM.views.基础资料.公用基础资料
{


    public partial class xmlLBM_xiaoweizutuo
    {

        /// <summary>
        /// form1 æŽ§ä»¶ã€‚
        /// </summary>
        /// <remarks>
        /// è‡ªåŠ¨ç”Ÿæˆçš„字段。
        /// è‹¥è¦è¿›è¡Œä¿®æ”¹ï¼Œè¯·å°†å­—段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlzuotuo_xiaowei.aspx

@@ -7,16 +7,17 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title></title>
    <script runat="server"> 
    protected void Page_Load(object sender, EventArgs e)
    {
        //★特别提示★：
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据
        protected void Page_Load(object sender, EventArgs e)
        {
            //★特别提示★：
            //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from Sc_PackUnionBillMain where HBarCode_Pack in(" + Request.Params["linterid"]+ ") ");
    }
            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
            //SqlXMLReportData.GenOneRecordset(this, "select * from Sc_PackUnionBillMain where HBarCode_Pack in(" + Request.Params["linterid"]+ ") ");
            SqlXMLReportData.GenEntireData(this, "select a.HInterID,HBarCode_Pack æ ˆæ¿ç ,HBarCode ä¸­ç®±ç ,b.hnumber ç‰©æ–™ä»£ç ,b.hname ç‰©æ–™åç§° from Sc_PackUnionBillsub a left join Gy_Material b on a.HMaterID = b. hitemid  where a.HInterID = " + Request.Params["linterid"], "select 1");
        }
</script>
</head>
<body>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapOutBill.html

@@ -53,7 +53,7 @@
                                <!--<li>其他信息</li>-->
                                <!--</ul>-->
                                <div class="layui-tab-content">
                                    <h1 style="text-align:center;"><b>器具维修记录单</b></h1>
                                    <h1 style="text-align:center;"><b>器具处理出库单</b></h1>
                                    <ul class="layui-tab-title" lay-filter="tab-all">
                                        <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                                        <li lay-id="2" style="padding:1px;">制单信息</li>
@@ -93,7 +93,7 @@
                                                    <input type="text" name="HManagerName" id="HManagerName" readonly
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HManagerID" id="HManagerID"
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                        class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn"
                                                        lay-filter="ZRPerson" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -108,7 +108,7 @@
                                                    <input type="text" name="HWHName" id="HWHName" readonly
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HWHID" id="HWHID" class="layui-input"
                                                        value="" style="float:left;width:150px;">
                                                        value="0" style="float:left;width:150px;">
                                                    <input type="hidden" name="HWHNumber" id="HWHNumber"
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn"
@@ -125,7 +125,7 @@
                                                    <input type="text" name="HKeeperName" id="HKeeperName" readonly
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HKeeperID" id="HKeeperID"
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                        class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn"
                                                        lay-filter="FHPerson" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -141,7 +141,7 @@
                                                        readonly class="layui-input" value=""
                                                        style="float:left;width:150px;">
                                                    <input type="hidden" name="HSecManagerID" id="HSecManagerID"
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                        class="layui-input" value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn"
                                                        lay-filter="SMPerson" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -156,7 +156,7 @@
                                                    <input type="text" name="HDeptName" id="HDeptName" readonly
                                                        class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input"
                                                        value="" style="float:left;width:150px;">
                                                        value="0" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn"
                                                        lay-filter="Department" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"
@@ -422,8 +422,16 @@
            if (OperationType == 1) {//无源单
                set_AddFNew();
                init_BillStatus(0)
                $("#HWHID").val(sessionStorage["HWHID"]);
                $("#HWHName").val(sessionStorage["HWHName"]);
                $("#HDeptID").val(sessionStorage["HDeptID"]);
                $("#HDeptName").val(sessionStorage["HDept"]);
                $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
                $("#HSecManagerName").val(sessionStorage["HSecManager"]);
                $("#HKeeperID").val(sessionStorage["HKeeperID"]);
                $("#HKeeperName").val(sessionStorage["HKeeper"]);
            }
            if (OperationType == 2) {//无源单
            else if (OperationType == 2) {//无源单
                set_EditFromGrid();
                set_AddFNew();
                $("#HMakeDate").val('')
@@ -1654,26 +1662,26 @@
        function AllowLoadData(sSubStr) {  //非空验证
            var Result = true;

            if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
                layer.msg("负责人不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
                layer.msg("仓库不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            //if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
            //    layer.msg("负责人不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return Result = false;
            //}
            //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
            //    layer.msg("仓库不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return Result = false;
            //}
            if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
                layer.msg("发货员不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
                layer.msg("部门不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HSupID").val() == '' || $("#HSupID").val() == null) {
                layer.msg("往来单位不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            //if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
            //    layer.msg("部门不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return Result = false;
            //}
            //if ($("#HSupID").val() == '' || $("#HSupID").val() == null) {
            //    layer.msg("往来单位不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //    return Result = false;
            //}
            if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                layer.msg("列表明细记录不能为空", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
@@ -1685,10 +1693,10 @@
                        layer.msg("明细记录第" + (i + 1) + "行,器具代码为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (sSubStr[i].HUnitID == "") {
                        layer.msg("明细记录第" + (i + 1) + "行,计量单位信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    //if (sSubStr[i].HUnitID == "") {
                    //    layer.msg("明细记录第" + (i + 1) + "行,计量单位信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    //    return Result = false;
                    //}
                    // è®¾è®¡å¯¿å‘½ éžå¿…录项目
                    // if (sSubStr[i].HDesignLife == "") {
                    //     layer.msg("明细记录第" + (i + 1) + "行,设计寿命信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html

@@ -231,6 +231,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-view" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print-zx" lay-event="btn-print-zx"><i class="layui-icon layui-icon-print"></i>中箱标签打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print-zb" lay-event="btn-print-zb"><i class="layui-icon layui-icon-print"></i>栈板码打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
@@ -380,6 +381,9 @@
                    case 'btn-print-zx':
                        PrintZX();
                        break;
                    case 'btn-print-zb':
                        PrintZB();
                        break;                       
                    //刷新
                    case 'btn-reload':
                        $("#HBarCode").val("");

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -2432,6 +2432,7 @@
            function get_Export() {
                var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel";
                var data = getExportData();
                var ajaxLoad = layer.load();
                //逻辑审核方法
                $.ajax({
                    type: "GET",
@@ -2453,12 +2454,14 @@
                                    }
                                }
                            });

                            layer.close(ajaxLoad);
                            table.exportFile(ins.config.id, data, "xls");
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(get_MessageError("[当前模块没有导出权限]当前模块没有导出权限!", sessionStorage["HTranSlate"]), { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert(get_MessageError("[0000-1-002]接口请求失败!", sessionStorage["HTranSlate"]), { icon: 5 });
                    }
                });