duhe
6 天以前 0a89b74461bea603e557c2dd4956fd23f99d54f4
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
1个文件已添加
43个文件已修改
607 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_DepartmentList_PDA.html 151 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/其他入库/Kf_OtherInBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBillList_PDA.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/其他出库/Kf_OtherOutBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/委外入库/Kf_EntrustInBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/委外领料/Kf_EntrustOutBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/小车锁定/Kf_TrolleyPositionBill_PDA.html 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/库存查询/KF_ICInventory_WorkShopByCLD_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBillList_PDA.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产入库/Kf_ProductInBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产汇报/Sc_ICMOReportBill_PDA.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBillList_PDA.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_CusBar_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_Mould_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_Mould_PDA.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepInBill_PDA.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_CusBar_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_Mould_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockStepOutBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBackBill_PDA.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBillList_PDA.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/生产领料/Kf_MateOutBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBackBill_PDA.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_Mould_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/采购入库/Kf_POStockInBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBackBill_PDA.html 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_CusBar_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_Mould_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/WMS扫码模块/销售出库/Kf_SellOutBill_PDA.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console_Mobile.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -184,6 +184,7 @@
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyTypeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_DepartmentList_PDA.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,15 +3,14 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    // var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置*/
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_DepartmentList_PDA.html
New file
@@ -0,0 +1,151 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <title>部门列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item" style="padding:15px;margin:0px">
                        <div class="layui-row">
                            <div class="layui-col-xs3">
                                <label class="layui-form-label" style="width:60px;padding-left:0px;">过滤列</label>
                            </div>
                            <div class="layui-col-xs9">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-row" style="margin-top: 10px; margin-bottom: 0px;">
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
                , form = layui.form
                , layer = layui.layer;
            var params = get_UrlVars();
            var HStockOrgID = params[params[0]];
            var Type = params[params[1]];
            if (Type == undefined || Type == '') {
                Type = "HDept1";
            }
            //快速查询
            form.on('submit(HQuery)', function () {
                RoadQuery($('#Value').val());
            });
            //返回
            form.on('submit(FH)', function () {
                var index = parent.layer.getFrameIndex(window.name);
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 0) {
                    parent.layer.close(index);
                    return;
                }
                switch (Type) {
                    case "HDept1":
                        parent.GetHDeptNameValue(data);
                        break;
                    case "HDept2":
                        parent.GetHDeptName2Value(data);
                        break;
                }
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                , data: []
                , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 æ–°å¢ž
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HItemID', width: 150, title: '部门ID', hide: true }
                    , { field: 'HNumber', width: 150, title: '部门代码' }
                    , { field: 'HName', width: 150, title: '部门名称', sort: true }
                ]]
                , page: true
                , limits: [50, 500, 5000, 50000],
                limit: 50
            });
            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                $(".layui-table-body tr ").attr({ "style": "background:" });    //其他tr恢复原样
                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //选中行样式
                obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //选中radio样式
                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //改变当前tr背景颜色和字体颜色
            })
            //#endregion
            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                switch (Type) {
                    case "HDept1":
                        parent.GetHDeptNameValue(data);
                        break;
                    case "HDept2":
                        parent.GetHDeptName2Value(data);
                        break;
                }
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            //#endregion
            ///加载显示数据
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/WEBSController/GetDepartmentList_Json",
                    async: true,
                    data: { "Department": Value, "HStockOrgID": HStockOrgID },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {
                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                    }
                });
            };
        });
    </script>
</body>
</html>
WebTM/views/WMSɨÂëÄ£¿é/ÆäËûÈë¿â/Kf_OtherInBill_PDA.html
@@ -1105,7 +1105,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1759,7 +1759,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/ÆäËû³ö¿â/Kf_OtherOutBillList_PDA.html
@@ -58,6 +58,7 @@
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
                                        <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">查询</button>
                                        <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">撤销</button>
                                        <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
@@ -82,9 +83,7 @@
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
                    <div id="" style="display:none;">
WebTM/views/WMSɨÂëÄ£¿é/ÆäËû³ö¿â/Kf_OtherOutBill_PDA.html
@@ -1229,7 +1229,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1920,7 +1920,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/ίÍâÈë¿â/Kf_EntrustInBill_PDA.html
@@ -1045,7 +1045,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1711,7 +1711,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/ίÍâÁìÁÏ/Kf_EntrustOutBill_PDA.html
@@ -1156,7 +1156,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1807,7 +1807,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/С³µËø¶¨/Kf_TrolleyPositionBill_PDA.html
@@ -667,7 +667,7 @@
                        }
                    });
                    $("#HEquipBarCode").val("");
                    //$("#HEquipBarCode").val("");
                }
            });
@@ -916,7 +916,7 @@
                });                              
                if (sBarCode != "") {
                    $('#HCarBarCode').val("");
                    //$('#HCarBarCode').val("");
                }
                //调转到第二个页签
                element.tabChange('tab-Kf_TrolleyPositionBill_PDA', '2');
@@ -998,8 +998,46 @@
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
            }
            //#endregion
            //单据上传前判断
            function AllowLoadData(sSubStr) {
                if (HInterID == 0) {
                    layer.msg("单据内码获取失败,错误的单据内码!", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (HBillNo == '') {
                    layer.msg("单据号获取失败,错误的单据号!", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (sSubStr.length == 0) {
                    layer.msg("没有扫码信息,请先扫描条码,确认无误后再提交!", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (table.cache['wl-table'].length >= 1) {
                    var sSubStr = JSON.stringify(table.cache['wl-table']);
                    if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                        sSubStr = JSON.parse(sSubStr);
                        for (var i = 0; i < sSubStr.length; i++) {
                            if (sSubStr[i].HCarBarCode == "" || sSubStr[i].HCarBarCode == undefined || sSubStr[i].HCarBarCode == null) {
                                layer.msg("明细记录第" + (i + 1) + "行,小车编号不允许为空!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                return Result = false;
                            }
                            if ((sSubStr[i].HSPID == 0 || sSubStr[i].HSPID == undefined || sSubStr[i].HSPID == null) && (sSubStr[i].HEquipID == 0 || sSubStr[i].HEquipID == undefined || sSubStr[i].HEquipID == null)) {
                                layer.msg("明细记录第" + (i + 1) + "行,需扫码绑定仓位或机台,不允许仓位和机台信息都为空!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                return Result = false;
                            }
                        }
                    }
                } else {
                    layer.msg("明细记录为空,不允许提交!请扫小车条码", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
                return true;
            }
            
        });
@@ -1034,24 +1072,7 @@
                HSPObj = obj;
            }
        }
        //单据上传前判断
        function AllowLoadData(sSubStr) {
            if (HInterID == 0) {
                layer.msg("单据内码获取失败,错误的单据内码!", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (HBillNo == '') {
                layer.msg("单据号获取失败,错误的单据号!", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (sSubStr.length == 0) {
                layer.msg("没有扫码信息,请先扫描条码,确认无误后再提交!", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            return true;
        }
        }
    </script>
</body>
WebTM/views/WMSɨÂëÄ£¿é/¿â´æ²éѯ/KF_ICInventory_WorkShopByCLD_PDA.html
@@ -428,9 +428,9 @@
                                            break;
                                        default:
                                            if (data[i].name == '仓库') {
                                            if (data[i].name == '仓库' || data[i].name == '批号') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
                                            } else if (data[i].name == '物料代码' || data[i].name == '物料名称' || data[i].name == '规格型号' || data[i].name == '组织') {
                                            } else if (data[i].name == '物料代码' || data[i].name == '物料名称' || data[i].name == '规格型号' || data[i].name == '组织' || data[i].name == '仓位代码' ) {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center' });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÈë¿â/Kf_ProductInBillList_PDA.html
@@ -58,6 +58,7 @@
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
                                        <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">查询</button>
                                        <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">撤销</button>
                                        <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
@@ -82,9 +83,9 @@
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                        <!--<div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                        </div>-->
                    </div>
                    <!--失败提示音-->
                    <div id="" style="display:none;">
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÈë¿â/Kf_ProductInBill_PDA.html
@@ -1078,7 +1078,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1709,7 +1709,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²ú»ã±¨/Sc_ICMOReportBill_PDA.html
@@ -844,7 +844,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1407,8 +1407,6 @@
                                        if (data[i].name == '数量' || data[i].name == '源单数量' || data[i].name == '条码个数') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
                                        } else if (data[i].name == '物料代码') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
                                        } else if (data[i].name == '物料名称' || data[i].name == '规格型号') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                        } else {
WebTM/views/WMSɨÂëÄ£¿é/Éú²ú²¹ÁÏ/Kf_MateReplenishOutBillList_PDA.html
@@ -58,6 +58,7 @@
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
                                        <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">查询</button>
                                        <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">撤销</button>
                                        <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
@@ -82,9 +83,7 @@
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
                    <div id="" style="display:none;">
WebTM/views/WMSɨÂëÄ£¿é/Éú²ú²¹ÁÏ/Kf_MateReplenishOutBill_PDA.html
@@ -1140,7 +1140,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1744,7 +1744,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBillList_PDA.html
@@ -58,6 +58,7 @@
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
                                        <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">查询</button>
                                        <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">撤销</button>
                                        <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
@@ -82,9 +83,7 @@
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
                    <div id="" style="display:none;">
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_CusBar_PDA.html
@@ -1742,7 +1742,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2874,7 +2874,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_Mould_PDA.html
@@ -1734,7 +1734,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2581,7 +2581,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_PDA.html
@@ -1692,7 +1692,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2525,7 +2525,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockBill_PDA_XiaBao.html
@@ -1486,7 +1486,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2503,7 +2503,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepInBill_Mould_PDA.html
@@ -1221,7 +1221,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1891,8 +1891,6 @@
                                        if (data[i].name == '数量' || data[i].name == '源单数量' || data[i].name == '条码个数') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
                                        } else if (data[i].name == '物料代码') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
                                        } else if (data[i].name == '物料名称' || data[i].name == '规格型号') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                        } else {
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepInBill_PDA.html
@@ -1173,7 +1173,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1794,8 +1794,6 @@
                                        if (data[i].name == '数量' || data[i].name == '源单数量' || data[i].name == '条码个数') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
                                        } else if (data[i].name == '物料代码') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
                                        } else if (data[i].name == '物料名称' || data[i].name == '规格型号') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                        } else {
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepOutBill_CusBar_PDA.html
@@ -1368,7 +1368,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2389,7 +2389,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepOutBill_Mould_PDA.html
@@ -1360,7 +1360,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2139,7 +2139,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úµ÷²¦/Kf_MoveStockStepOutBill_PDA.html
@@ -1312,7 +1312,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2042,7 +2042,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBackBill_PDA.html
@@ -970,7 +970,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1486,8 +1486,6 @@
                                        if (data[i].name == '数量' || data[i].name == '源单数量' || data[i].name == '条码个数') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
                                        } else if (data[i].name == '物料代码') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
                                        } else if (data[i].name == '物料名称' || data[i].name == '规格型号') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                        } else {
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBillList_PDA.html
@@ -58,6 +58,7 @@
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px; float: right;">
                                        <button type="button" lay-submit="" lay-filter="cmdQuery" class="layui-btn" id="cmdQuery">查询</button>
                                        <button type="button" lay-submit="" lay-filter="cmdRescind" class="layui-btn" id="cmdRescind">撤销</button>
                                        <button type="button" lay-submit="" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs12">
@@ -82,9 +83,7 @@
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">退出</button>
                        </div>
                        <div class="layui-col-xs2" style="margin-left:5px">
                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdQRCode" class="layui-btn" id="cmdQRCode">二维码</button>
                        </div>
                    </div>
                    <!--失败提示音-->
                    <div id="" style="display:none;">
WebTM/views/WMSɨÂëÄ£¿é/Éú²úÁìÁÏ/Kf_MateOutBill_PDA.html
@@ -1168,7 +1168,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1806,7 +1806,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/²É¹ºÈë¿â/Kf_POStockInBackBill_PDA.html
@@ -1021,7 +1021,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1668,8 +1668,6 @@
                                        if (data[i].name == '数量' || data[i].name == '源单数量' || data[i].name == '条码个数') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
                                        } else if (data[i].name == '物料代码') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
                                        } else if (data[i].name == '物料名称' || data[i].name == '规格型号') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                        } else {
WebTM/views/WMSɨÂëÄ£¿é/²É¹ºÈë¿â/Kf_POStockInBill_Mould_PDA.html
@@ -1093,7 +1093,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1808,7 +1808,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/²É¹ºÈë¿â/Kf_POStockInBill_PDA.html
@@ -1045,7 +1045,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1711,7 +1711,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBackBill_PDA.html
@@ -1003,7 +1003,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1611,8 +1611,6 @@
                                        if (data[i].name == '数量' || data[i].name == '源单数量' || data[i].name == '条码个数') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
                                        } else if (data[i].name == '物料代码') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
                                        } else if (data[i].name == '物料名称' || data[i].name == '规格型号') {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
                                        } else {
WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_CusBar_PDA.html
@@ -1224,7 +1224,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -2147,7 +2147,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_Mould_PDA.html
@@ -1216,7 +1216,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1927,7 +1927,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_PDA.html
@@ -1168,7 +1168,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_DepartmentList_PDA.html?HStockOrgID=' + HStockOrgID + '&Type=HDept1', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -1830,7 +1830,7 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '物料代码') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '物料代码', event: '物料代码', templet: function (d) {
                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 150, event: '物料代码', event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
WebTM/views/home/console_Mobile.html
@@ -225,12 +225,6 @@
                                                <cite style="white-space:pre-wrap">样品销售出库单</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-template-1"></i>
                                                <cite style="white-space:pre-wrap">调拨</cite>
                                            </a>
                                        </li>
                                    </ul>
                                </div>
                            </div>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_DepartmentList.html
@@ -615,7 +615,7 @@
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                form.render('select');
                sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
                //sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
                $("#btnSearch").click();
            }
            //#endregion
WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html
@@ -1620,6 +1620,7 @@
                                , "HSourceBillType": dataArray[i].单据类型
                                , 'HICMOTempID': "0"
                                , 'HRemark': ""
                                , 'HPRODUCEDATE': dataArray[i].生产日期
                            }
                        );
                    }
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -223,6 +223,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WithdrawCheck_Flow" id="WithdrawCheck_Flow"><i class="layui-icon layui-icon-form"></i>撤回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBillSetDate" id="set_CancelCloseBillSetDate"><i class="layui-icon layui-icon-form"></i>反关闭(设置时间)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>
@@ -377,6 +378,9 @@
                        break;
                    //反关闭
                    case 'set_CancelCloseBill': set_CloseBill(2);
                        break;
                    //反关闭设置时间
                    case 'set_CancelCloseBillSetDate': set_CloseBillSetDate(2);
                        break;
                    //作废按钮        ï¼ˆ1:作废、2:反作废)
                    case 'btn-Drop':set_DropBill(1);
@@ -1601,6 +1605,97 @@
                }
            }
            //关闭  [1 å…³é—­ã€2 åå…³é—­]
            function set_CloseBillSetDate(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var HInterID = data[0].hmainid;
                if (data.length == 1) {
                    // å¼¹å‡ºå±‚
                    layer.open({
                        type: 1,
                        title: '设置时间范围',
                        area: ['500px', '300px'],
                        content: `
                        <div class="layui-form" style="padding: 20px;">
                            <div class="layui-form-item">
                            <label class="layui-form-label">开始时间</label>
                            <div class="layui-input-block">
                                <input type="date" class="layui-input" id="startTime" placeholder="请选择开始时间">
                            </div>
                            </div>
                            <div class="layui-form-item">
                            <label class="layui-form-label">结束时间</label>
                            <div class="layui-input-block">
                                <input type="date" class="layui-input" id="endTime" placeholder="请选择结束时间">
                            </div>
                            </div>
                            <div class="layui-form-item">
                            <div class="layui-input-block" style="margin-left: 0; text-align: center;">
                                <button class="layui-btn" id="confirmTime">确定</button>
                                <button class="layui-btn layui-btn-primary" id="cancelTime">取消</button>
                            </div>
                            </div>
                        </div> `,
                        success: function (layero, index) {
                            $("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
                            $("#endTime").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
                            // ç¡®å®šæŒ‰é’®ç‚¹å‡»äº‹ä»¶
                            $('#confirmTime').on('click', function () {
                                var startTime = $('#startTime').val();
                                var endTime = $('#endTime').val();
                                if (!startTime) {
                                    layer.msg('请选择开始时间', { icon: 2 });
                                    return;
                                }
                                if (!endTime) {
                                    layer.msg('请选择结束时间', { icon: 2 });
                                    return;
                                }
                                if (new Date(endTime) < new Date(startTime)) {
                                    layer.msg('结束时间不能早于开始时间', { icon: 2 });
                                    return;
                                }
                                $.ajax({
                                    url: GetWEBURL() + '/Gy_RoutingBill/CloseSetDate',
                                    type: "GET",
                                    data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "", "HBeginDate": startTime, "HEndDate": endTime},
                                    success: function (result) {
                                        if (result.count == 1) {
                                            // è¿™é‡Œå¯ä»¥å¤„理获取到的时间范围
                                            layer.msg('时间范围已设置:' + startTime + ' è‡³ ' + endTime, { icon: 1 });
                                            // å…³é—­å¼¹å±‚
                                            layer.close(index);
                                            $("#btnSearch").trigger('click');
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                            // å…³é—­å¼¹å±‚
                                            layer.close(index);
                                        }
                                    }, error: function () {
                                        layer.alert("接口请求失败!", { icon: 5 });
                                        // å…³é—­å¼¹å±‚
                                        layer.close(index);
                                    }
                                });
                            });
                            // å–消按钮点击事件
                            $('#cancelTime').on('click', function () {
                                layer.close(index);
                            });
                        },
                    })
                }
                else {
                    layer.msg("请选择一条数据!");
                }
            }
            //#region åä½œåºŸ/作废数据 [1 ä½œåºŸã€2 åä½œåºŸ]
            function set_DropBill(num) {
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/³µ¼ä¹ÜÀí/ίÍ⹤Ðò·¢³öµ¥/Cj_StationEntrustInBillList.html
@@ -643,7 +643,7 @@
            function get_DisplayPage(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationEntrustOutBill/getStationEntrustOutBillPage',
                    url: GetWEBURL() + '/Cj_StationEntrustInBill/getStationEntrustInBillPage',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                    success: function (data1) {
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html
@@ -1215,6 +1215,96 @@
                                        get_HWorkShift(HDeptID);
                                    }                                  
                                    break;
                                default:
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HICMOInterID": data.hicmointerid,
                                        "HICMOBillNo": data.任务单号,
                                        "HMaterID": data.HMaterID,
                                        "HMaterName": data.产品,
                                        "HMaterNumber": data.产品代码,
                                        "HMaterModel": data.规格型号,
                                        "HPieceQty": data.流转卡数量,
                                        "HPlanQty": data.流转卡数量,
                                        "lngBillKey": data.hmainid,
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchHinteID": data.hmainid,
                                        "HProcPlanEntryID": data.hsubid,
                                        "HICMOQty": data.任务单数量,
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HCenterName": data.工作中心,
                                        "HCenterID": data.HCenterID,
                                        "HPRDOrgID": data.组织
                                    });
                                    //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    //$("#HBarCode").css("background-color", "#efefef4d");
                                    HProcExchBillNoFlag = true;
                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
                                    var HInterID = data.hmainid;
                                    HDeptID = data.HWorkShopID;
                                    //自动匹配流水号
                                    $.ajax({
                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                        type: "GET",
                                        async: false,
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = data1.data[0];
                                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                                    "lngBillSubKey": data.hsubid,
                                                    "HProcName": data.工序,
                                                    "HProcID": data.工序ID,
                                                    "HProcNo": data.流水号,
                                                    "HCenterName": data.工作中心,
                                                    "HCenterID": data.HCenterID,
                                                    "NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                                                });
                                                if (data.首道工序 == "是") {
                                                    FirstEndHProcNo = 1;
                                                } else if (data.末道工序 == "是") {
                                                    FirstEndHProcNo = 2;
                                                }
                                                $("#HProcNo").attr("readonly", "readonly");
                                                $("#HProcNo").css("background-color", "#efefef4d");
                                            }
                                        }
                                    })
                                    option = {
                                        elem: '#mainTable',
                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                        //, cellMinWidth: 80
                                        toolbar: '#toolbarDemo'
                                        , where: { HProcExchHinteID: HProcExchHinteID }
                                        , cols: [[
                                            { type: 'numbers', title: '序号', totalRow: true }
                                            , { field: 'HOrderProcNO', title: '订单跟踪号', edit: 'text' }
                                            , { field: 'hbillno', title: '流转卡号', hide: true }
                                            , { field: 'HICMOBillNo', title: '生产订单号', edit: 'text' }
                                            , { field: '产品代码', title: '产品代码' }
                                            , { field: '产品名称', title: '产品名称', edit: 'text' }
                                            , { field: '流转卡数量', title: '流转卡数量' }
                                            , { field: '流水号', title: '流水号', edit: 'text' }
                                            , { field: '工序名称', title: '工序名称' }
                                            , { field: '工作中心', title: '工作中心' }
                                            , { field: '是否委外', title: '是否委外', edit: 'text' }
                                            , { field: '供应商', title: '供应商' }
                                            , { field: '计划数量', title: '计划数量' }
                                            , { field: '进站数量', title: '进站数量', edit: 'text' }
                                            , { field: '出站数量', title: '出站数量' }
                                        ]]
                                        , height: 500
                                    }
                                    table.render(option)
                                    getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
                                    if (OperationType != 4) {
                                        //获取班次
                                        get_HWorkShift(HDeptID);
                                    }
                                    break;
                            }
                            //layer.close(index);
                            //set_InitGrid();
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -2225,7 +2225,7 @@
                sWhere += "  and HBillSubType<>''SUB''";            
                sWhere += getOrgIDByUser();//用户关联组织查询过滤     
                sWhere += getDeptIDByUser();//用户关联部门过滤
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -2774,6 +2774,34 @@
            }
            //#endregion
            //#region æ ¹æ®ç”¨æˆ·èŽ·å–ç”¨æˆ·å…³è”éƒ¨é—¨çš„è¿‡æ»¤æ¡ä»¶
            function getDeptIDByUser() {
                var res = "";
                $.ajax({
                    type: "GET",
                    async: false,
                    url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //方法所在页面和方法名
                    data: { "HUserID": sessionStorage["Czybm"]},
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data.length > 0) {
                                for (let item of result.data) {
                                    res += item.HItemID.toString() + ","
                                }
                                res = res.slice(0, -1);
                                res = ` and HDeptID in (${res})`
                            }
                        }
                    }, error: function (err) {
                        res = " and 1 = 0";
                        layer.alert(get_MessageError("[0000-1-002]接口请求失败!", sessionStorage["HTranSlate"]), { icon: 5 });
                    }
                });
                return res;
            }
            //#endregion
            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
@@ -2843,7 +2871,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery()
                            //get_FastQuery()
                            form.render("select");
                        }
                    }, error: function () {
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeArrangement_PG.html
@@ -279,6 +279,30 @@
                        break;
                };
            });
            table.on('sort(mainTable)', function (obj) { //注:sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序,如果不设的话,将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数(注意:这里面的参数可任意定义,并非下面固定的格式)
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });
            table.on('sort(mainTable2)', function (obj) { //注:sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                table.reload('mainTable2', {
                    initSort: obj //记录初始排序,如果不设的话,将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数(注意:这里面的参数可任意定义,并非下面固定的格式)
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option2.data = layui.table.cache["mainTable2"];
                table.render(option);
            });
            //#endregion
            //#region é‡ç½®æŒ‰é’®