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

yangle

2023-04-11 dfb6546bf808be7134a773fa01d12bf8cd1cc633

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

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

@@ -85,6 +85,12 @@
                , { field: 'HItemID', title: '工序ID', hide: true }
                , { field: '工序代码', title: '工序代码' }
                , { field: '工序', title: '工序名称', sort: true }
                , { field: '工作中心ID', title: '工作中心ID', hide: true }
                , { field: '工作中心代码', title: '工作中心代码', hide: true }
                , { field: '工作中心', title: '工作中心', sort: true, hide: true }
                , { field: '部门ID', title: '部门ID', hide: true, hide: true }
                , { field: '部门代码', title: '部门代码', hide: true }
                , { field: '部门', title: '部门', sort: true, hide: true }
              ]]
              , page: true
            });

 WebTM/views/index_Mobile.html

@@ -107,7 +107,7 @@
                              å·¥åºå‡ºç«™æ±‡æŠ¥å•æ‰¹é‡
                          </a>
                      </dd>-->
                      <dd>
                      <!--<dd>
                          <a lay-href="车间管理/委外工序发出单/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              å·¥åºå§”外发出单
@@ -142,7 +142,7 @@
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              äº§çº¿å…³é”®ä»¶ç»‘定
                          </a>
                      </dd>
                      </dd>-->
                      <!--<dd>
                          <a lay-href="" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />

 WebTM/views/user/login.html

@@ -153,9 +153,9 @@
            //密码框回车执行登录
            $('#LAY-user-login-password').on('keydown', function (e) {
                if (e.keyCode == 13) {
                    //playSound();
                    loging();
                }
            });
            });          
            //用户名框回车光标移到密码框
            $('#LAY-user-login-username').on('keydown', function (e) {
                if (e.keyCode == 13) {
@@ -268,7 +268,7 @@
                    $("body").append('<audio id="cs" hidden controls> <source src = "../video/jingbao.wav" type = "audio/ogg"> </audio >');
                var audio = document.getElementById("cs");
                audio.play();
            }
            }          

        });
    </script>

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -253,6 +253,10 @@
            //加载条码类型数据
            set_HBarCodeType();                      

            var rowdata = [{
                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
            }];
            //初始化表格
            set_InitGrid();
            set_CountGrid();
@@ -272,12 +276,7 @@
            else {
                layer.alert("未知操作类型！", { icon: 5 });
            }
            //#endregion
           
            var rowdata = [{
                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0,"HPackQty":0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
            }];
            //#endregion                     

            //#region ç‚¹å‡»äº‹ä»¶ï¼ŒåŒ…括on和form事件
            //头工具栏
@@ -506,12 +505,14 @@
                                    HMaterID = result.list[0].HMaterID;
                                    HBatchNo = result.list[0].HBatchNo;
                                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                        BatchNoArray = result.list;  //获取批号，用来给批次按钮功能中的批号赋值

                                        for (let i = 0; i < result.list.length; i++) {
                                            result.list[i].HMinQty = '';//点击单元格的时候默认值0不会清除，客户看了会觉得很怪，所以先用空字符串取代;
                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0]  //保留小数点后两位小数     
                                        }

                                                                             
                                        BatchNoArray = result.list;  //获取批号，用来给批次按钮功能中的批号赋值
                                        //for (let i = 0; i < result.list.length; i++) {
                                        //    result.list[i].HMinQty = '';//点击单元格的时候默认值0不会清除，客户看了会觉得很怪，所以先用空字符串取代;
                                        //}
                                        table.reload('mainTable', {
                                            data: result.list // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                                        });
@@ -638,7 +639,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].物料代码, HMaterName: checkStatus.data[0].物料名称, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].计量单位代码, HUnitName: checkStatus.data[0].计量单位, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].数量, HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].物料代码, HMaterName: checkStatus.data[0].物料名称, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].计量单位代码, HUnitName: checkStatus.data[0].计量单位, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].数量.toString("#0.00"), HMinQty: checkStatus.data[0].最小包装数, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
                        //同步更新表格和缓存对应的值
                        table.reload('mainTable', {
                            data: arr // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
@@ -793,7 +794,7 @@
            function set_InitGrid() {
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 75 }
                    , { field: 'HMainID', title: '源单主内码',  width: 100, hide: true }
                    , { field: 'HSubID', title: '源单子内码',  width: 100, hide: true }
                    , { field: 'HBillNo', title: '源单单号', width: 200 }
@@ -801,34 +802,32 @@
                    , { field: 'HMaterNumber', title: '物料代码', edit: 'text', event: 'HMaterNumber', width: 200 }
                    , { field: 'HMaterName', title: '物料名称',  width: 200 }
                    , { field: 'HMaterModel', title: '规格型号', width: 200 }
                    , { field: 'HBatchNo', title: '批号', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '数量', edit: 'text', width: 100 }
                    , { field: 'HMinQty', title: '最小包装数', edit: 'text', width: 100 }
                    , { field: 'HBQty', title: '箱数', width: 100 }
                    , { field: 'HPackQty', title: '外箱数', edit: 'text', width: 100 }
                    , { field: 'HCoilNO', title: '钢卷捆包号', edit: 'text', width: 100 }
                    , { field: 'HFurnaceNO', title: '炉号', edit: 'text', width: 100 }
                    , { field: 'HFactory', title: '厂商', edit: 'text', width: 100 }
                    , { field: 'HCusID', title: '客户ID',  width: 100, hide: true }
                    , { field: 'HCusNumber', title: '客户代码', edit: 'text', event: 'HCusNumber', width: 120 }
                    , { field: 'HCusName', title: '客户名称', width: 120 }
                    , { field: 'HSeOrderBillNo', title: '销售订单号', width: 200 }
                    , { field: 'HRemark', title: '备注', edit: 'text', width: 100 }
                    , { field: 'HProduceDate', title: '生产日期', event: 'HProduceDate', width: 100 }
                    , { field: 'HExpiryDate', title: '保质期至', event: 'HExpiryDate', width: 100 }
                    , { field: 'HheatNO', title: '热处理', edit: 'text', width: 100 }
                    , { field: 'HAuxPropID', title: '辅助属性ID',  width: 100, hide: true }
                    , { field: 'HAuxPropNumber', title: '辅助属性代码', edit: 'text', event: 'HAuxPropNumber', width: 100 }
                    , { field: 'HAuxPropName', title: '辅助属性名称',  width: 100 }
                    , { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }
                    , { field: 'HUnitNumber', title: '计量单位代码', edit: 'text', event: 'HUnitNumber', width: 100 }
                    , { field: 'HUnitName', title: '计量单位',width: 100 }
                    , { field: 'HBatchNo', title: '批号', edit: 'text', width: 100 }

                    , { field: 'HCoilNO', title: '钢卷捆包号', edit: 'text', width: 100 }
                    , { field: 'HFurnaceNO', title: '炉号', edit: 'text', width: 100 }
                    , { field: 'HFactory', title: '厂商', edit: 'text', width: 100 }
                    , { field: 'HAuxQty', title: '辅单位数量', edit: 'text', width: 100 }
                    , { field: 'HheatNO', title: '热处理', edit: 'text', width: 100 }
                    , { field: 'HProduceDate', title: '生产日期', event: 'HProduceDate', width: 100 }
                    , { field: 'HExpiryDate', title: '保质期至', event: 'HExpiryDate', width: 100 }
                    , { field: 'HExpirationDateFlag', title: '是否启用保质期', width: 100, templet: '#switchTp3', unresize: false }

                    , { field: 'HGiveAwayFlag', title: '是否赠品', width: 100, templet: '#switchTpl', unresize: false }
                    , { field: 'HQty', title: '数量', edit: 'text', width: 100 }
                    , { field: 'HMinQty', title: '最小包装数', edit: 'text', width: 100 }
                    , { field: 'HBQty', title: '箱数', width: 100 }
                    , { field: 'HPackQty', title: '外箱数', edit: 'text', width: 100 }
                    , { field: 'HDate', title: '进料日期',  width: 100 }
                    , { field: 'HCusID', title: '客户ID',  width: 100, hide: true }
                    , { field: 'HCusNumber', title: '客户代码', edit: 'text', event: 'HCusNumber', width: 120 }
                    , { field: 'HCusName', title: '客户名称', width: 120 }
                    , { field: 'HSeOrderBillNo', title: '销售订单号', width: 200 }
                    , { field: 'HRemark', title: '备注', edit: 'text', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ];
                option = {
@@ -836,7 +835,7 @@
                    , elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: false
                    , cellMinWidth: 120
                    , cellMinWidth: 75
                    , height: 'full-325'
                    , cols: [columns]
                    , limit: 500 //每页默认显示的数量

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

@@ -14,7 +14,7 @@
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenEntireData(this, "select  distinct b.流水号,a.任务单号,a.流转卡数量,a.产品代码,a.版本,a.成品编号,a.产品名称,a.日期,a.计划完工日期,a.单据号,a.材质,b.工序名称,b.模具编号,b.工艺参数,a.包装标识,a.包装标识编码,a.销售订单号,a.子件规格,a.流转卡数量 ç”Ÿäº§æ•°é‡,a.单据号 + '&' + ltrim(b.HEntryID) æ¡ç ç¼–号  from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] ,"select 1");
            SqlXMLReportData.GenEntireData(this, "select  distinct b.流水号,a.任务单号,a.流转卡数量,a.产品代码,a.版本,a.成品编号,a.产品名称,a.日期,a.计划完工日期,a.单据号,a.生产订单号,a.材质,b.工序名称,b.模具编号,b.工艺参数,a.包装标识,a.包装标识编码,a.销售订单号,a.子件规格,a.流转卡数量 ç”Ÿäº§æ•°é‡,a.单据号 + '&' + ltrim(b.HEntryID) æ¡ç ç¼–号  from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] ,"select 1");
        }
    </script>
</head>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -153,10 +153,10 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-lg" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>下推</button>
                                <button type="button" class="layui-btn" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>批量下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>

 WebTM/views/ϵͳ¹ÜÀí/»á¼ÆÆÚ¼ä/Xt_AccountPeriodList.html

@@ -68,7 +68,7 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>修改</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
@@ -77,7 +77,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>

 WebTM/views/ϵͳ¹ÜÀí/¹«¸æ/GG_NoticeBillList.html

@@ -115,11 +115,11 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>

 WebTM/views/ϵͳ¹ÜÀí/µ¥¾ÝÀàÐÍ/Xt_BillTypeList.html

@@ -22,7 +22,7 @@
                                <div style="padding: 10px;">
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">重置</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">删除</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">修改</button>
                                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">修改</button>-->
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">禁用</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">反禁用</button>
                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>

 WebTM/views/ϵͳ¹ÜÀí/ÈÕÖ¾¹ÜÀí/Xt_SystemLogList.html

@@ -87,12 +87,12 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>

 WebTM/views/ϵͳ¹ÜÀí/Ä£¿é¹ÜÀí/Xt_XtgnbList.html

@@ -77,11 +77,11 @@
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete" style="padding:0 5px">删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>

 WebTM/views/ϵͳ¹ÜÀí/ϵͳ²ÎÊý¹ÜÀí/Xt_SystemParameterList.html

@@ -70,13 +70,13 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -1138,7 +1138,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '物料表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_MaterialList_LSQP.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -447,6 +447,7 @@
                if (HOrgID) {
                    sWhere += " and HOrgID = '" + HOrgID + "'";
                }
                sWhere += " and å·¥åºä»£ç  != '9999'"
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

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

@@ -80,18 +80,17 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">流转卡数量</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"><span style="color:red;">*</span>单据日期</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产组织</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                            </div>
                                        </div>
                                        </div>                                       
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -157,17 +156,18 @@
        </div>
    </div>-->
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">流转卡数量</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">未出站数量</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;" id="NoOutboundHqty">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产组织</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">

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

@@ -29,6 +29,18 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">操作员代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">操作员名称</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HEmpName" id="HEmpName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">状态</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
@@ -39,22 +51,24 @@
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                <div class="layui-row" style="margin-top:5px">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">开始日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">结束日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content">
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -176,7 +190,7 @@
            var option = [];

            var HModName = "JIT_LiftMaterPlaBillnList";
            var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID","选择","查询日期","成本对象","成本对象名称","HBillStatus","HBillType","HPRDORGID"];//不需要显示的字段 å¯æ‰©å±•
            //初始化表格
            set_InitGrid();

@@ -601,6 +615,8 @@
                $("#Comparator").val("0");
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HEmpNumber").val("");
                $("#HEmpName").val("");
                form.render('select');
                sWhere = "";
            }
@@ -619,6 +635,8 @@
                var ColContent = $("#ColContent").val();
                var HNumber = $("#HNumber").val(); //产品代码 å³ç‰©æ–™ç¼–码
                var HName = $("#HName").val(); //当前工序
                var HEmpNumber = $("#HEmpNumber").val(); //操作员代码
                var HEmpName = $("#HEmpName").val(); //操作员名称

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
@@ -669,6 +687,12 @@
                if (HName) {
                    sWhere += " and å½“前工序 like '%" + HName + "%'";
                }
                if (HEmpNumber) {
                    sWhere += " and æ“ä½œå‘˜ä»£ç  like '%" + HEmpNumber + "%'";
                }
                if (HEmpName) {
                    sWhere += " and æ“ä½œå‘˜ like '%" + HEmpName + "%'";
                }

                if (HStatus) {
                    switch (HStatus) {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -1143,11 +1143,17 @@
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    }                                   
                                    obj.update({
                                        HProcName: checkStatus.data[0].工序
                                        , HProcID: checkStatus.data[0].HItemID
                                        , HProcNumber: checkStatus.data[0].工序代码
                                        , HCenterID: checkStatus.data[0].工作中心ID
                                        , HCenterNumber: checkStatus.data[0].工作中心代码
                                        , HCenterName: checkStatus.data[0].工作中心
                                        , HDeptID: checkStatus.data[0].部门ID
                                        , HDeptNumber: checkStatus.data[0].部门代码
                                        , HDeptName: checkStatus.data[0].部门
                                    });

                                    layer.close(layer.index);
@@ -1666,7 +1672,7 @@
                    type: "get",
                    url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
                    async: true,
                    data: { "sWhere": " and å•æ®å·='" + HBillNo + "'", "user": sessionStorage["HUserName"] },
                    data: { "sWhere": " and å•æ®å·='" + HBillNo + "'" + " and å·¥åºä»£ç  !='" + 9999 + "'", "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        var data = result.data;
                            var Tablerow = [];

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeIssueBillList.html

@@ -30,28 +30,26 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">打印状态</label>
                                    <div class="layui-input-block" style="width:100px">
                                        <select name="city" lay-verify="required" id="SHPrintQty">
                                            <option value="全部">全部</option>
                                            <option value="未打印">未打印</option>
                                            <option value="已打印">已打印</option>
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产车间</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                            <!--动态渲染车间-->
                                        </select>
                                    </div>
                                </div>
                                <input type="checkbox" id="wybj" name="wybj" title="只显示委外" lay-filter="wybj" lay-skin="primary">
                                </div>                               
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <label class="layui-form-label">规格型号</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate">
                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate1">
                                    </div>
                                </div>

                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -76,12 +74,27 @@
                                                <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <label class="layui-form-label">打印状态</label>
                                            <div class="layui-input-block" style="width:100px">
                                                <select name="city" lay-verify="required" id="SHPrintQty">
                                                    <option value="全部">全部</option>
                                                    <option value="未打印">未打印</option>
                                                    <option value="已打印">已打印</option>
                                                </select>
                                            </div>
                                        </div>
                                        <input type="checkbox" id="wybj" name="wybj" title="只显示委外" lay-filter="wybj" lay-skin="primary">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">开始日期</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                                <input type="date" class="layui-input" id="HDate">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">结束日期</label>
                                            <div class="layui-input-block">
                                                <input type="date" class="layui-input" id="HDate1">
                                            </div>
                                        </div>
                                    </div>
@@ -138,6 +151,7 @@
            var option2 = "";
            var HBillNo = "";
            var wybj = false;
            var HDeptID = 0;
            //#endregion

            //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -145,8 +159,8 @@
            //
            var HModName = "Sc_ProcessExchangeIssueBillList";
            //初始化界面
            set_ClearBill();

            set_ClearBill();            
           
            //#endregion

            //#region å¤´å·¥å…·æ äº‹ä»¶
@@ -224,8 +238,29 @@
                set_InitGrid();
                //查询
                get_FastQuery();
                //车间列表
                getDept();
            }

            //获取车间列表
            function getDept() {
                var HDeptName = '<option value="0" style="color:red;" selected>全部车间</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                            }
                            $("#HDeptName").append(HDeptName);
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
@@ -237,9 +272,12 @@
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#SHname").val("");//物料|子件名称|子件规格
                $("#HBillNo").val("");//单据号
                $("#HModel").val("");//规格型号
                $("#HDeptName").val("0");//车间
                form.render('select');
                //$("#btnSearch").click();
                sWhere = "";
                get_FastQuery() ;
                sWhere = "";
            }
            //#endregion

@@ -252,6 +290,8 @@
                var HWorkBillNo = $("#HWorkBillNo").val();
                var SHname = $("#SHname").val();//物料|子件名称|子件规格
                var HBillNo = $("#HBillNo").val();//单据号
                var HModel = $("#HModel").val();//规格型号
                var HDeptName = $("#HDeptName").val();//车间
                if (SHPrintQty) {//判断打印状态
                    if (SHPrintQty == "全部") {
                        sWhere = " and æ‰“印次数 >= 0 ";
@@ -284,6 +324,12 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'"
                }
                if (HDeptName && HDeptName != "0") {
                    sWhere += " and HWorkShopID = '" + HDeptName + "'";
                }
                if (HModel) {
                    sWhere += " and å­ä»¶è§„æ ¼ like '%" + HModel + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -312,6 +358,29 @@
                        , { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', width: 90, hide: true }
                        , { field: '下达状态', title: '下达状态' }
                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
                        , { field: '生产车间', title: '生产车间' }
                        , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
                        , { field: '子件名称', title: '产品名称' }
                        , { field: '子件规格', title: '规格型号' }
                        , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
                        , { field: '单位', title: '单位' }
                        , { field: '流水号', title: '流水号' }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序名称', title: '工序名称' }
                        , { field: '流转卡数量', title: '流转卡数量', width: 100 }
                        , {
                            field: '计划开工日期', title: '计划开工日期', width: 120, sort: true, templet: "<div>{{d.计划开工日期 ==null ?'':layui.util.toDateString(d.计划开工日期, 'yyyy-MM-dd')}}</div>"
                        }
                       , {
                            field: '计划完工日期', title: '计划完工日期', width: 120, sort: true, templet: "<div>{{d.计划完工日期 ==null ?'':layui.util.toDateString(d.计划完工日期, 'yyyy-MM-dd')}}</div>"
                        }
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '产品代码', title: '产品代码' }
                        , { field: '单位代码', title: '单位代码' }


                        , { field: '打印次数', title: '打印次数' }
                        , {
                            field: '日期', title: '日期', width: 120, sort: true, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>"
@@ -321,38 +390,16 @@
                        , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
                        , { field: '任务单号', title: '任务单号', width: 140 }
                        , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间' }
                        , { field: '流水号', title: '流水号' }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序名称', title: '工序名称' }
                        , {
                            field: '计划开工日期', title: '计划开工日期', width: 120, sort: true, templet: "<div>{{d.计划开工日期 ==null ?'':layui.util.toDateString(d.计划开工日期, 'yyyy-MM-dd')}}</div>"
                        }
                       , {
                            field: '计划完工日期', title: '计划完工日期', width: 120, sort: true, templet: "<div>{{d.计划完工日期 ==null ?'':layui.util.toDateString(d.计划完工日期, 'yyyy-MM-dd')}}</div>"
                        }
                        , { field: '流转卡数量', title: '流转卡数量', width: 100 }
                        , { field: '委外标记', title: '委外标记' }
                        , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
                        , { field: '子件代码', title: '子件代码' }
                        , { field: '子件名称', title: '子件名称' }
                        , { field: '子件规格', title: '子件规格' }
                        , { field: '产品名称', title: '子件名称' }
                        , { field: '规格型号', title: '子件规格' }
                        , { field: '批号', title: '批号' }
                        , { field: '原料批次号', title: '原料批次号' }
                        , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
                        , { field: '产品代码', title: '产品代码' }
                        , { field: '产品名称', title: '产品名称' }
                        , { field: '规格型号', title: '规格型号' }
                        , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
                        , { field: '单位代码', title: '单位代码' }
                        , { field: '单位', title: '单位' }
                        , { field: '设备模具代码', title: '设备模具代码' }
                        , { field: '设备模具', title: '设备模具' }
                        , { field: '生产数量', title: '生产数量' }
                        , { field: '流转卡数量', title: '流转卡数量' }

                        , { field: '摘要', title: '摘要' }
                        , { field: '内部单据号', title: '内部单据号' }
@@ -379,7 +426,7 @@
            }
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and å·¥åºåç§° != '转工序'";
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeIssueBillList_Json',

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -1119,7 +1119,9 @@
                                //$("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HWHID").val(result.data[0].HItemID);
                                $("#HWHNAME").val(result.data[0].HName);
                                element.tabChange('tab-POStockInBill', '2');
                                element.tabChange('tab-SellOutBill', '3');
                                //扫源单成功后，光标显示到条码上
                                $("#HBarCode").focus();
                            }
                            else {
                                // $("#verifycode").click();
@@ -1680,9 +1682,9 @@
                            //$("#HDeptID").val(result.data[0].HDeptID);
                            //$("#HDeptName").val(result.data[0].HDeptName);
                            HSourceFlag = true;
                            element.tabChange('tab-SellOutBill', '3');
                            element.tabChange('tab-SellOutBill', '2');
                            //扫源单成功后，光标显示到条码上
                            $("#HBarCode").focus();
                            $("#HWHNAME").focus();                            
                            //table.reload('wl-table', {
                            //    where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                            //});

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html

@@ -416,7 +416,7 @@
            $("#HBillerID").hide();
            var HSourceFlag = sessionStorage["SourceFlag"];//源单已标记

            //光标默认显示在原单号位置
            //光标默认显示在源单号位置
            $("#HSourceBillNo").focus();

            //监听当前处于哪一个页签
@@ -801,7 +801,9 @@
                                //$("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HWHID").val(result.data[0].HItemID);
                                $("#HWHNAME").val(result.data[0].HName);
                                element.tabChange('tab-POStockInBill', '2');
                                element.tabChange('tab-MateOutBill', '3');
                                //扫源单成功后，光标显示到条码上
                                $("#HBarCode").focus();
                            }
                            else {
                                // $("#verifycode").click();
@@ -1272,9 +1274,9 @@
                        if (result.data.hMulSourceFlagField == 0) {
                            $("#HSourceBillNo").attr("readonly", "readonly");
                        }
                        element.tabChange('tab-MateOutBill', '3');
                        //扫源单成功后，光标显示到条码上
                        $("#HBarCode").focus();
                        element.tabChange('tab-MateOutBill', '2');
                        //扫源单成功后，光标显示到仓库上
                        $("#HWHNAME").focus();                       
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            playSound1();//播放声音
                            layer.load(3)                           

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -120,7 +120,7 @@
                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">仓库</label>
                                        </div>
                                        <div class="layui-col-xs6">
                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
@@ -357,7 +357,7 @@
            var HSourceFlag = sessionStorage["SourceFlag"];
            //默认带入的仓库，如果启用仓位则仓位有效，如果没有启用则仓位灰度 new

            $("#HBarCode").focus();
            $("#HWHNAME").focus();                 

            // ç¼–辑获取表头时时间格式矫正方式
            function formatDate(date) {
@@ -1167,6 +1167,7 @@
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                //$("#HStockPlaceName").val(result.data[0].HName);
                                //$("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HBarCode").focus();      
                                $("#HWHID").val(result.data[0].HItemID);
                                $("#HWHNAME").val(result.data[0].HName);
                                element.tabChange('tab-POStockInBill', '2');

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_Fast.html

@@ -556,8 +556,8 @@
            else {
                //默认进入单据信息页签
                element.tabChange('tab-POStockInBill', '2');
                //默认光标显示在条码里面
                var pFocus = $("#HBarCode");
                //默认光标显示在仓库里面
                var pFocus = $("#HWHNAME");
                pFocus.focus();
                pFocus.select();
            }
@@ -911,6 +911,7 @@
                            if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                //$("#HStockPlaceName").val(result.data[0].HName);
                                //$("#HStockPlaceID").val(result.data[0].HItemID);
                                $("#HBarCode").focus();
                                $("#HWHID").val(result.data[0].HItemID);
                                $("#HWHNAME").val(result.data[0].HName);
                                element.tabChange('tab-POStockInBill', '2');