From 00c4a44769acc6e336969e40709a9e4cae9b09ae Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 09 一月 2025 09:09:50 +0800
Subject: [PATCH] 提料运算单独加个菜单栏;列设置,标题筛选(提料计划报表,);排产添加锁定工单功能;批改上班工时;

---
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html      |  135 ++++
 WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html |  173 ++++++
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html         |   89 +++
 WebTM/views/生产管理/生产计划平台/Sc_BulkEditWorkTime.html         |  416 ++++++++++++++++
 WebTM/views/生产管理/提料计划/JIT_PickUpCalculate.html           |  166 ++++++
 WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html  |    4 
 WebTM/views/计划管理/工艺路线/Gy_BulkEditWorkQty.html            |  531 ++++++++++++++++++++
 WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html             |   16 
 8 files changed, 1,496 insertions(+), 34 deletions(-)

diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_PickUpCalculate.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_PickUpCalculate.html"
new file mode 100644
index 0000000..1557859
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_PickUpCalculate.html"
@@ -0,0 +1,166 @@
+锘�<!DOCTYPE html>
+<html>
+<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, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <h1 style="text-align: center; padding: 30px 0;"><b>鎻愭枡杩愮畻</b></h1>
+                            <div class="layui-colla-item" style="padding-top:20px;">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鎻愭枡绫诲瀷</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HTLType" id="HTLType" lay-verify="HTLType">
+                                            <option value="缂烘枡" selected="selected">缂烘枡</option>
+                                            <option value="鐢熶骇鐢ㄦ枡娓呭崟">鐢熶骇鐢ㄦ枡娓呭崟</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate" style="padding:0 30px;margin-left:50px;">寮�濮嬫彁鏂欒繍绠�</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel" style="padding:0 20px">閫�鍑�</button>
+                            </div>
+                            <div class="layui-colla-item" style="height:600px;margin-top:20px;">
+                                <font size="5" color="blue" id="HRemark"></font>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript">
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            var HModName = "JIT_PickUpCalculate";
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+            //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
+            function set_ClearBill() {
+                Organ();
+            }
+            //#endregion
+
+            //#region 寮�濮嬫彁鏂欒繍绠�
+            form.on('submit(btn_Calculate)', function (data) {
+                set_Calculate(data);
+            });
+
+            function set_Calculate(data) {
+                var sWhere = {
+                    HProdORGID: $("#HProdORGID").val()
+                    , HWorkShopID: 0
+                }
+                var HTLType = $("#HTLType").val();
+                sWhere = JSON.stringify(sWhere);
+                var ajaxLoad = layer.load();
+
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_TLYS',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["Czybm"], "HTLType": HTLType },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.msg(data1.Message);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HProdORGID").append(Organization);
+                            $("#HProdORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btn_Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(2);
+                });
+            })
+            //#endregion
+
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index 38a2265..7d46883 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -433,7 +433,7 @@
         function set_InitGrid() {
             option = {
                 elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
+                //, toolbar: '#toolbarDemo'
                 , height: 'full-50'
                 , page: true
                 , cellMinWidth: 90
@@ -1046,7 +1046,7 @@
                 }
             })
         }
-            //#endregion
+        //#endregion
 
         //#endregion
         //浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
index e6cc8e9..1abe3b9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
@@ -5,13 +5,14 @@
     <title>鎻愭枡璁″垝鎶ヨ〃</title>
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
-    <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>--><!--鏍囬绛涢�変笉鑳藉紩鐢ㄦjs鏂囦欢-->
 </head>
 <body>
     <div class="layui-fluid">
@@ -49,6 +50,7 @@
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">瀵煎嚭</button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="bthHideColumn" id="bthHideColumn">鍒楄缃�</button>
                                 <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                     <div class="layui-row" style="margin-top:10px;">
                                         <div class="layui-inline">
@@ -189,6 +191,7 @@
         base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
     }).extend({
         index: 'lib/index', //涓诲叆鍙fā鍧�
+        soulTable: '../ext/soulTable',
     }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable','flow'], function () {
         //#region 鍏敤鍙橀噺
         var $ = layui.$
@@ -207,6 +210,7 @@
         var sWhere = " where 1=1 ";
         var option = [];
         var ins;                        //鐢ㄤ簬瀵煎嚭excel
+        var HModName = "ReportPODemandPlanBillList_S";
         //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -248,6 +252,12 @@
         });
         //#endregion       
 
+        //#region 鍒楄缃寜閽�
+        form.on('submit(bthHideColumn)', function (data) {
+            get_HideColumn();
+        });
+        //#endregion
+
         //#endregion
 
         //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -272,19 +282,19 @@
             var columns = [];
 
             columns.push({ type: 'checkbox', fixed: 'left', sort: true});
-            columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐', sort: true});
-            columns.push({ field: 'FMATERIALNAME', title: '鐗╂枡鍚嶇О', sort: true});
-            columns.push({ field: 'FSPECIFICATION', title: '鐗╂枡瑙勬牸', sort: true});
-            columns.push({ field: 'FNAME', title: '渚涘簲鍟�', sort: true });
-            columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true, hide: true });
-            columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', sort: true, hide: true });
-            columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�', sort: true, hide: true });
+            columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐', sort: true, filter: true });
+            columns.push({ field: 'FMATERIALNAME', title: '鐗╂枡鍚嶇О', sort: true, filter: true });
+            columns.push({ field: 'FSPECIFICATION', title: '鐗╂枡瑙勬牸', sort: true, filter: true });
+            columns.push({ field: 'FNAME', title: '渚涘簲鍟�', sort: true, filter: true  });
+            columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true, hide: true, filter: true  });
+            columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', sort: true, hide: true, filter: true  });
+            columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�', sort: true, hide: true, filter: true  });
             //columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿' });
             //columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞' });
             //columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�' });
-            columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true});
-            columns.push({ field: '璁¢噺鍗曚綅鍚嶇О', title: '璁¢噺鍗曚綅', sort: true});
-            columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺', sort: true, totalRow: true});
+            columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true, filter: true });
+            columns.push({ field: '璁¢噺鍗曚綅鍚嶇О', title: '璁¢噺鍗曚綅', sort: true, filter: true });
+            columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true });
             //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
             var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
             var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
@@ -300,7 +310,7 @@
 
             var k = 0;//鏀堕泦寰幆娆℃暟
             for (var j = 0; j <= (Days - k); j++) {
-                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true})
+                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true, filter: true })
                 //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
                 if (MM == 12 && (HBEGINDATE + j) == 31) {
                     yyyy += 1;
@@ -317,7 +327,7 @@
                     j = 0;
                 }
             }
-            columns.push({ field: '', title: '鎻愭枡璁″垝鍚堣' });
+            columns.push({ field: '', title: '鎻愭枡璁″垝鍚堣', filter: true  });
 
             option = {
                 elem: '#mainTable'
@@ -371,6 +381,10 @@
 
                         option.data = result.data;
                         table.render(option);
+
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+
                         layer.close(ajaxLoad);
                         //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                     } else {
@@ -751,6 +765,139 @@
             form.render('select');
         }
 
+        //#region 闅愯棌鍒楄缃�
+        function get_HideColumn() {
+            var colName = "";
+            var contentUrl = "";
+            for (var i = 1; i < option.cols[0].length; i++) {
+                colName += option.cols[0][i]["field"] + ",";
+            }
+            var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+            var urlLen = urlStr.split('/');
+            for (var i = 0; i < urlLen.length - 4; i++) {
+                contentUrl += "../";
+            }
+            colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+            contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
+
+            layer.open({
+                type: 2
+                , skin: "layui-layer-rim" //鍔犱笂杈规
+                , title: "闅愯棌鍒楄缃�"  //鏍囬
+                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                , area: ["50%", "90%"] //绐椾綋澶у皬
+                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                , content: [contentUrl, "yes"]
+                , btn: ["纭畾", "鍙栨秷"]
+                , btn1: function (index, laero) {
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    DisPlay_HideColumn();
+                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                    layer.close(index);//鍏抽棴寮圭獥
+                }
+            })
+        }
+        //#endregion
+
+        //#region 鏄剧ず鍒楁暟鎹�
+        function DisPlay_HideColumn() {
+            $.ajax({
+                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                type: "GET",
+                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.data.length != 0) {
+                        titleData = [];
+                        var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                        var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+                        newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+                        dataCol = data1.data[0].HGridString.split(',');
+                        //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+                        if (dataCol.length == option.cols[0].length - 1) {
+                            //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+                            for (var j = 0; j < option.cols[0].length - 1; j++) {
+                                for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                    var dataCols = dataCol[j].split('|');
+                                    //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                                    if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                                        //闅愯棌鍒�
+                                        if (dataCols[1] == 1) {
+                                            option.cols[0][i + 1]["hide"] = true;
+                                        }
+                                        //璁剧疆鍒楀
+                                        if (dataCols[3] > 0) {
+                                            option.cols[0][i + 1]["width"] = dataCols[3];
+                                        }
+                                        //璁剧疆鍐呭瀛椾綋澶у皬
+                                        if (data1.data[0].HFontSize != 0) {
+                                            option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                        } else {
+                                            option.cols[0][i + 1]["style"] = "font-size:100%";
+                                        }
+                                        //鏄剧ず鍒�
+                                        if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                            option.cols[0][i + 1]["hide"] = false;
+                                        }
+                                        //缁熻鍒�
+                                        if (dataCols[6] == 1) {
+                                            option.cols[0][i + 1]["totalRow"] = true;
+                                        }
+                                        //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                        switch (dataCols[2]) {
+                                            case "L":
+                                                option.cols[0][i + 1]["align"] = "left";
+                                                break;
+                                            case "M":
+                                                option.cols[0][i + 1]["align"] = "center";
+                                                break;
+                                            case "R":
+                                                option.cols[0][i + 1]["align"] = "right";
+                                                break;
+                                        }
+                                        //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                        if (dataCols[4] != null && dataCols[4] != "") {
+                                            option.cols[0][i + 1]["title"] = dataCols[4];
+                                        }
+                                        newCols[0].push(option.cols[0][i + 1]);
+                                    }
+                                }
+                            }
+                            //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+                            if (dataCol.length == newCols[0].length - 1) {
+                                option.cols = newCols;
+                                //鍙栨秷鍐荤粨鍒�
+                                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                    if (option.cols[0][i]["fixed"] != null) {
+                                        option.cols[0][i]["fixed"] = null;
+                                    }
+                                    else {
+                                        break;
+                                    }
+                                }
+                                //鍐荤粨鍒�
+                                if (data1.data[0].HFixCols != 0) {
+                                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                            data1.data[0].HFixCols += 1;
+                                        }
+                                        option.cols[0][i + 1]["fixed"] = "left";
+                                    }
+                                }
+                            }
+                        }
+                        table.render(option);
+                    } else {
+                        table.render(option);
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+        //#endregion
+
         //#endregion
         //浠ヤ笂鏄痩ayui妯″潡
     });
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index c72e002..3e1b595 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -30,6 +30,8 @@
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">鍑嗗</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">鎺掍骇</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙i攣宸ュ崟</button>
                         </div>
                         <div class="layui-collapse resizable-container">
                             <div class="layui-colla-item">
@@ -784,6 +786,16 @@
             }
         })
 
+        //閿佸畾宸ュ崟
+        form.on('submit(btnLockOrder)', function (data) {
+            get_btnLockOrder();
+        })
+
+        //瑙i攣宸ュ崟
+        form.on('submit(btnUnlockOrder)', function (data) {
+            get_btnUnlockOrder();
+        })
+
         //#endregion
 
         //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -1048,6 +1060,7 @@
             columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
             columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
             columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
+            columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, sort: true, filter: true });//0
             columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
             option_columns = columns;
             option = {
@@ -1917,7 +1930,7 @@
             });
 
             //鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
-            var sql = "delete from Sc_WorkBillSortBillSub  where  HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20)  and HInterID in(select  HInterID  from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + ")";
+            var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select  HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
             $.ajax({
                 url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
                 type: "GET",
@@ -3051,6 +3064,80 @@
             }
         }
 
+        //閿佸畾宸ュ崟
+        function get_btnLockOrder() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+
+            if (data.length > 0) {
+                var HInterIDArr = [];
+
+                for (var i = 0; i < data.length; i++) {
+                    HInterIDArr.push(data[i].hmainid);
+                }
+
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedOrder',
+                    type: "GET",
+                    data: { "HInterIDs": HInterIDArr.toString() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.msg("宸ュ崟宸查攣瀹�");
+                            get_FastQuery(2);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            } else {
+                layer.msg('璇烽�夋嫨浣犺閿佸畾鐨勫伐鍗曪紒');
+            }
+        }
+
+        //瑙i攣宸ュ崟
+        function get_btnUnlockOrder() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+
+            if (data.length > 0) {
+                var HInterIDArr = [];
+
+                for (var i = 0; i < data.length; i++) {
+                    HInterIDArr.push(data[i].hmainid);
+                }
+
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockOrder',
+                    type: "GET",
+                    data: { "HInterIDs": HInterIDArr.toString() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.msg("宸ュ崟宸茶В閿�");
+                            get_FastQuery(2);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            } else {
+                layer.msg('璇烽�夋嫨浣犺瑙i攣鐨勫伐鍗曪紒');
+            }
+        }
+
         //鏌ヨ鏈帓浜х殑鐢熶骇璁㈠崟
         function get_Display2(sWhere_ICMO) {
             var ajaxLoad = layer.load();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
index aae73a6..a7eb017 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
@@ -32,6 +32,8 @@
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">宸ヨ壓璺嚎</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">缁勮鎺掍骇</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">閿佸畾宸ュ崟</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">瑙i攣宸ュ崟</button>
                         </div>
                         <div class="layui-collapse resizable-container">
                             <div class="layui-colla-item">
@@ -69,6 +71,9 @@
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+                                <div class="layui-progress layui-progress-big" lay-showpercent="true" lay-filter="demo">
+                                    <div class="layui-progress-bar layui-bg-primary" lay-percent="0%"></div>
+                                </div>
                                 <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                     <div class="layui-row" style="margin-top:10px;">
                                         <div class="layui-inline">
@@ -756,6 +761,8 @@
 
         //缁勮鎺掍骇
         form.on('submit(btnProZZPC)', function (data) {
+            element.progress('demo', 0 + '%')
+
             var HWorkShopID = $("#HWorkShopID").val();//鐢熶骇杞﹂棿
             if (HWorkShopID == 0) {
                 return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
@@ -828,6 +835,16 @@
                 get_btnUnlock(HWorkShopID);
             }
         })
+        
+        //閿佸畾宸ュ崟
+        form.on('submit(btnLockOrder)', function (data) {
+            get_btnLockOrder();
+        })
+
+        //瑙i攣宸ュ崟
+        form.on('submit(btnUnlockOrder)', function (data) {
+            get_btnUnlockOrder();
+        })
 
         //#endregion
 
@@ -887,12 +904,12 @@
             columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true, filter: true});
             columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true, filter: true });
             columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true, filter: true });
+            columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, sort: true, filter: true });//0
             columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true, filter: true });
             columns.push({ field: '鐗╂枡浠g爜', title: '鐗╂枡缂栫爜', width: 150, sort: true, filter: true });
             columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true, filter: true });
             columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true, filter: true });
             columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text', filter: true });
-            columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true, filter: true });//0
             columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true, filter: true });//0
             columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true, filter: true});//0
             columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true, filter: true });//0
@@ -1092,7 +1109,8 @@
             columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
             columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
             columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
-            columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });           
+            columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
+            columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true, filter: true });//0
             columns.push({ field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', width: 150, edit: 'text', event: "HEmpID" });
             columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
             option_columns = columns;
@@ -1668,7 +1686,7 @@
             $("#ColName2").val("0");
             $("#Comparator2").val("0");
             form.render('select');
-            sWhere = "";
+            sWhere = "";           
         }
 
         //閲嶇疆
@@ -2048,7 +2066,7 @@
             });
 
             //鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
-            var sql = "delete from Sc_WorkBillSortBillSub  where  HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20)  and HInterID in(select  HInterID  from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + ")";
+            var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select  HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
             $.ajax({
                 url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
                 type: "GET",
@@ -2343,8 +2361,7 @@
         }
 
         //缁勮鎺掍骇
-        function get_btnProZZPC(HWorkShopID) {
-
+        function get_btnProZZPC(HWorkShopID) {           
             var JDTLen = 0;
             var lMainID = 0;
             var sICMOBillNo = "";
@@ -2372,7 +2389,7 @@
             var HDelData = 0;
             JDTLen = (100 / option.data.length).toFixed(2);
             var HJDLen = 0;
-            var HReportQty = 0;
+            var HReportQty = 0;            
 
             //濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
             //鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
@@ -2401,7 +2418,7 @@
             });
 
             //鏍规嵁杞﹂棿鍒犻櫎娌℃湁閿佸畾鐨勬暟鎹�
-            var sql = "delete from Sc_WorkBillSortBillSub  where  HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20)  and HInterID in(select  HInterID  from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + ")";
+            var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select  HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
             $.ajax({
                 url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
                 type: "GET",
@@ -2440,18 +2457,25 @@
             window.HIsPriority = false;//鏄惁浼樺厛鎺掍骇
             var HDataLen = option.data.length;//鎬绘帓浜ц鍗曢暱搴�
 
-            //鎸変换鍔″崟浼樺厛绾� 寰幆
-            for (var i = 0; i < HDataLen; i++) {               
+            var HProgress = parseInt(100 / HDataLen);
 
+            //鎸変换鍔″崟浼樺厛绾� 寰幆
+            for (var i = 0; i < HDataLen; i++) {                
+                var timer = setInterval(function () {
+                    if ((i + 1) * HProgress > 100) {
+                        clearInterval(timer);
+                    }
+                    element.progress('demo', Math.round(Math.random() * 100) + '%')
+                },  500);
+                //element.progress('demo', (i + 1) * HProgress + '%')
                 //鍒ゆ柇鏁扮粍闀垮害鏄惁鍙戠敓鍙樺寲锛屾槸鍒欓噸缃暟缁勯暱搴�
                 if (HDataLen != option.data.length) {
                     HDataLen = option.data.length;
                     if (i == option.data.length) {
                         i = option.data.length - 1;
                     }                   
-                }
-
-                console.log("1.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
+                }              
+                //console.log("1.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
 
                 //鎺掍骇鏈�鍚庝竴绗旇鍗曪紙鑻ユ湰娆′负鏈�鍚庝竴绗旇鍗曟帓浜э紝浣嗗綋鍓嶆帓浜ф棩鏈熻繕涓嶆弧瓒虫渶鏃╁紑宸ユ棩鏈燂紝鍒欏綋鍓嶆棩鏈熻繘琛岀疮鍔狅紝鐩村埌婊¤冻鏈�鏃╁紑宸ユ棩鏈熶负姝級
                 if (HArrIndex_PC.length == option.data.length - 1 && HArrIndex.length > 0 && Format(option.data[HArrIndex[0]].鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd') > HPCDate) {
@@ -2512,8 +2536,7 @@
                 }
                 //璁板綍宸茬粡鎺掍骇鐨勮鍗曚笅鏍�
                 HArrIndex_PC.push(i);
-
-                console.log("2.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
+                //console.log("2.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
 
                 //濡傛灉鏈鏈�鍚庝竴绗旇鍗曟帓浜э紝浣嗚繕瀛樺湪鍥犳渶鏃╁紑宸ユ棩鏈熶笉婊¤冻鐨勮�屾帓浜т笉浜嗙殑璁㈠崟鍒欏姞闀垮惊鐜暱搴�
                 if (i == HDataLen - 1 && HArrIndex.length > 0) {
@@ -2555,7 +2578,6 @@
                 else {
                     sLeftProdTimes = iLeftQty / sWorkQty;
                 }                
-
                 //鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
                 if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
                     //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
@@ -2600,7 +2622,6 @@
                         }
                     });
                 }
-
                 if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
                 {
                     get_HFData(1, i);
@@ -2648,11 +2669,13 @@
                                 });
 
                                 if (dsSub == null || dsSub.length == 0) {
+                                    console.log("i鍊�1锛氾細锛�" + (i + 1));
                                     get_HFData(1, i);
                                     continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
                                 }
                                 if (dsSub != null)//涓嶅姞鐝帓绋�
                                 {
+                                    console.log("i鍊�2锛氾細锛�" + (i + 1));
                                     iRow = i + 1;
                                     //灏嗘暟鎹帓鍒扮綉鏍间腑
                                     SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
@@ -2667,7 +2690,7 @@
                             get_HFData(1, i);
                         }
                     }              
-                }
+                }               
             }
             table.render(option);
             get_FastQuery(2);
@@ -2932,6 +2955,7 @@
                 }
 
             }
+            console.log("i鍊�3锛氾細锛�" + (iRow + 1));
         }
 
         //鏌ヨ鐢熶骇璁㈠崟
@@ -3370,6 +3394,7 @@
                     layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 }
             });
+            console.log("i鍊�4锛氾細锛�");
         }
 
         //琛屽唴蹇嵎閿�
@@ -3559,6 +3584,80 @@
                 });
             }
         }
+        
+        //閿佸畾宸ュ崟
+        function get_btnLockOrder() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+
+            if (data.length > 0) {
+                var HInterIDArr = [];
+
+                for (var i = 0; i < data.length; i++) {
+                    HInterIDArr.push(data[i].hmainid);
+                }
+
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedOrder',
+                    type: "GET",
+                    data: { "HInterIDs": HInterIDArr.toString() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.msg("宸ュ崟宸查攣瀹�");
+                            get_FastQuery(2);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            } else {
+                layer.msg('璇烽�夋嫨浣犺閿佸畾鐨勫伐鍗曪紒');
+            }
+        }
+        
+        //瑙i攣宸ュ崟
+        function get_btnUnlockOrder() {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+
+            if (data.length > 0) {
+                var HInterIDArr = [];
+
+                for (var i = 0; i < data.length; i++) {
+                    HInterIDArr.push(data[i].hmainid);
+                }
+
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockOrder',
+                    type: "GET",
+                    data: { "HInterIDs": HInterIDArr.toString() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.msg("宸ュ崟宸茶В閿�");
+                            get_FastQuery(2);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            } else {
+                layer.msg('璇烽�夋嫨浣犺瑙i攣鐨勫伐鍗曪紒');
+            }
+        }
 
         //鏌ヨ鏈帓浜х殑鐢熶骇璁㈠崟
         function get_Display2(sWhere_ICMO) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_BulkEditWorkTime.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_BulkEditWorkTime.html"
new file mode 100644
index 0000000..66a3c28
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_BulkEditWorkTime.html"
@@ -0,0 +1,416 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎵规敼涓婄彮宸ユ椂</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px;">
+                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">纭淇敼</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮浠g爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HSourceNumber1" lay-verify="HSourceNumber1" id="HSourceNumber1" style="width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HSourceID1" lay-verify="HSourceID1" id="HSourceID1" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource1" id="btnHSource1" style="padding: 0 10px;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </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="HSourceNumber2" lay-verify="HSourceNumber2" id="HSourceNumber2" style="width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HSourceID2" lay-verify="HSourceID2" id="HSourceID2" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource2" id="btnHSource2" style="padding: 0 10px;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </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="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="width:183px;padding-left: 70px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="margin-left:45px;">
+                                            <label class="layui-form-label" style="width: 85px;">鑷�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="width:183px;padding-left: 70px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HWorkTime" lay-verify="HWorkTime" id="HWorkTime">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+
+    //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+    var childPage = null;                       //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+    var currRowIndex = 0;                       //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+    var childData = null;                       //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+    //#endregion
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+        
+        //淇濆瓨鎻愪氦
+        form.on('submit(btnSave)', function (data) {//鎻愪氦
+            set_AddNew(data);
+        });
+        
+        //閫�鍑�
+        form.on('submit(Exit)', function () {
+            Pub_Close(1);
+        })
+
+        //閫夋嫨鐢熶骇璧勬簮1鎸夐挳
+        form.on('submit(btnHSource1)', function () {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇璧勬簮'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HSourceID1").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HSourceNumber1").val(checkStatus.data[0].鐢熶骇璧勬簮浠g爜);//鐗╂枡鍚嶇О                  
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+
+        //閫夋嫨鐢熶骇璧勬簮2鎸夐挳
+        form.on('submit(btnHSource2)', function () {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇璧勬簮'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HSourceID2").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HSourceNumber2").val(checkStatus.data[0].鐢熶骇璧勬簮浠g爜);//鐗╂枡鍚嶇О                  
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+        
+        //#endregion
+
+        //#region 鏂囨湰妗嗙洃鍚�
+        $(document).ready(function () {
+            //#region 鏍规嵁鐢熶骇璧勬簮浠g爜鑾峰彇鐢熶骇璧勬簮鍩虹璧勬枡绛涢�夊脊绐�
+            //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+            $("#HSourceNumber1").on('keydown', function (data) {
+                //================================================================================================
+                var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                    if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                        var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                        var innerHeight = window.innerHeight;
+                        var top = offset.top + 0.05 * innerHeight;
+                        var left = offset.left;
+                        if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                            top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                        }
+                        layer.open({
+                            type: 2                                                                                     //寮圭獥绫诲瀷
+                            , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                            , area: ['35%', '50%']                                                                      //澶у皬
+                            , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                            , offset: [top, left]
+                            , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                            //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                            , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                            , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                            , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]                           
+                            , success: function (layero, index) {
+                                setTimeout(function () {
+                                    //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                                    var value = $("#HSourceNumber1").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                    currRowIndex = 0;
+                                    var tableView = "h_v_Gy_SourceList";
+                                    var childSWhere = "select top(10) HItemID,鐢熶骇璧勬簮浠g爜,鐢熶骇璧勬簮鍚嶇О from " + tableView + " where 1=1 and (鐢熶骇璧勬簮浠g爜 like '%" + value + "%') order by 鐢熶骇璧勬簮浠g爜 desc";
+                                    childPage.getData(childSWhere, tableView);
+                                    //===================================================================================================================================
+                                }, 200);
+                            }
+                            , end: function () {
+                                childPage = null;
+                                currRowIndex = 0;
+                                if (childData != null) {
+                                    //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                                    //鑾峰彇鏁版嵁
+                                    $("#HSourceID1").val(childData.HItemID);//鐢熶骇璧勬簮id
+                                    $("#HSourceNumber1").val(childData.鐢熶骇璧勬簮浠g爜);//鐢熶骇璧勬簮鍚嶇О
+                                    //===============================================================================================================================
+
+                                    childData = null;
+                                }
+                            }
+                        });
+                    } else {
+                        setTimeout(function () {
+                            //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                            var value = $("#HSourceNumber1").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                            currRowIndex = 0;
+                            var tableView = "h_v_Gy_SourceList";
+                            var childSWhere = "select top(10) HItemID,鐢熶骇璧勬簮浠g爜,鐢熶骇璧勬簮鍚嶇О from " + tableView + " where 1=1 and (鐢熶骇璧勬簮浠g爜 like '%" + value + "%') order by 鐢熶骇璧勬簮浠g爜 desc";
+                            childPage.getData(childSWhere, tableView);
+                            //=================================================================================================================================
+                        }, 200);
+                    }
+                } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                    if (event.key == "ArrowUp") {
+                        currRowIndex--;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "ArrowDown") {
+                        currRowIndex++;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "Enter") {
+                        //鎵嬪姩澶辩劍
+                        var element = document.getElementById("HSourceNumber1");
+                        element.blur();
+
+                        childPage.getSelectedData(currRowIndex);
+
+                        if (childData != null) {
+                            //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                            //鑾峰彇鏁版嵁
+                            $("#HSourceID1").val(childData.HItemID);//鐢熶骇璧勬簮id
+                            $("#HSourceNumber1").val(childData.鐢熶骇璧勬簮浠g爜);//鐢熶骇璧勬簮鍚嶇О
+                            //===============================================================================================================================
+
+                            childData = null;
+                        }
+
+
+                        childPage = null;
+                        currRowIndex = 0;
+                        childData = null;
+                    }
+                }
+            });
+            //#endregion
+            //#region 鏍规嵁鐢熶骇璧勬簮浠g爜鑾峰彇鐢熶骇璧勬簮鍩虹璧勬枡绛涢�夊脊绐�
+            //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+            $("#HSourceNumber2").on('keydown', function (data) {
+                //================================================================================================
+                var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                    if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                        var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                        var innerHeight = window.innerHeight;
+                        var top = offset.top + 0.05 * innerHeight;
+                        var left = offset.left;
+                        if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                            top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                        }
+                        layer.open({
+                            type: 2                                                                                     //寮圭獥绫诲瀷
+                            , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                            , area: ['35%', '50%']                                                                      //澶у皬
+                            , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                            , offset: [top, left]
+                            , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                            //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                            , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                            , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                            , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                            , success: function (layero, index) {
+                                setTimeout(function () {
+                                    //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                                    var value = $("#HSourceNumber2").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                    currRowIndex = 0;
+                                    var tableView = "h_v_Gy_SourceList";
+                                    var childSWhere = "select top(10) HItemID,鐢熶骇璧勬簮浠g爜,鐢熶骇璧勬簮鍚嶇О from " + tableView + " where 1=1 and (鐢熶骇璧勬簮浠g爜 like '%" + value + "%') order by 鐢熶骇璧勬簮浠g爜 desc";
+                                    childPage.getData(childSWhere, tableView);
+                                    //===================================================================================================================================
+                                }, 200);
+                            }
+                            , end: function () {
+                                childPage = null;
+                                currRowIndex = 0;
+                                if (childData != null) {
+                                    //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                                    //鑾峰彇鏁版嵁
+                                    $("#HSourceID2").val(childData.HItemID);//鐢熶骇璧勬簮id
+                                    $("#HSourceNumber2").val(childData.鐢熶骇璧勬簮浠g爜);//鐢熶骇璧勬簮鍚嶇О
+                                    //===============================================================================================================================
+
+                                    childData = null;
+                                }
+                            }
+                        });
+                    } else {
+                        setTimeout(function () {
+                            //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                            var value = $("#HSourceNumber2").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                            currRowIndex = 0;
+                            var tableView = "h_v_Gy_SourceList";
+                            var childSWhere = "select top(10) HItemID,鐢熶骇璧勬簮浠g爜,鐢熶骇璧勬簮鍚嶇О from " + tableView + " where 1=1 and (鐢熶骇璧勬簮浠g爜 like '%" + value + "%') order by 鐢熶骇璧勬簮浠g爜 desc";
+                            childPage.getData(childSWhere, tableView);
+                            //=================================================================================================================================
+                        }, 200);
+                    }
+                } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                    if (event.key == "ArrowUp") {
+                        currRowIndex--;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "ArrowDown") {
+                        currRowIndex++;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "Enter") {
+                        //鎵嬪姩澶辩劍
+                        var element = document.getElementById("HSourceNumber2");
+                        element.blur();
+
+                        childPage.getSelectedData(currRowIndex);
+
+                        if (childData != null) {
+                            //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                            //鑾峰彇鏁版嵁
+                            $("#HSourceID2").val(childData.HItemID);//鐢熶骇璧勬簮id
+                            $("#HSourceNumber2").val(childData.鐢熶骇璧勬簮浠g爜);//鐢熶骇璧勬簮鍚嶇О
+                            //===============================================================================================================================
+
+                            childData = null;
+                        }
+
+
+                        childPage = null;
+                        currRowIndex = 0;
+                        childData = null;
+                    }
+                }
+            });
+            //#endregion
+        });
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //鍒濆鍖栨棩鏈�
+            $("#HBeginDate").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+            $("#HEndDate").val(Format(new Date($("#HBeginDate").val()).setDate(new Date($("#HBeginDate").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+            var HSourceNumber1 = $("#HSourceNumber1").val();
+            var HSourceNumber2 = $("#HSourceNumber2").val();
+            var HBeginDate = $("#HBeginDate").val();
+            var HEndDate = $("#HEndDate").val();
+            var HWorkTime = $("#HWorkTime").val();
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_PlanShifts/BulkWorkTime',
+                type: "GET",
+                data: { "HSourceNumber1": HSourceNumber1, "HSourceNumber2": HSourceNumber2, "HBeginDate": HBeginDate, "HEndDate": HEndDate, "HWorkTime": HWorkTime },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.msg(data1.Message);
+                    } else {
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+    });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
index 23da22c..80660ef 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
@@ -56,6 +56,7 @@
                                 <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="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime" style="padding:0 5px">鎵规敼涓婄彮宸ユ椂</button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Exit" id="btn_Exit" style="padding:0 5px">閫�鍑�</button>
                                 <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>-->
                             </div>
@@ -248,6 +249,21 @@
                     Pub_Close(2); 
                 }               
             });
+
+            //鎵归噺淇敼涓婄彮宸ユ椂            
+            form.on('submit(btn_BulkEditWorkTime)', function (data) {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "鎵规敼涓婄彮宸ユ椂"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "80%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['./Sc_BulkEditWorkTime.html', "yes"]
+                })
+            });
+
             //#endregion
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_BulkEditWorkQty.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_BulkEditWorkQty.html"
new file mode 100644
index 0000000..9fbe9b2
--- /dev/null
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_BulkEditWorkQty.html"
@@ -0,0 +1,531 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎵规敼灏忔椂浜ц兘</title>
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px;">
+                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Exit" id="Exit">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">纭淇敼</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaterNumber1" lay-verify="HMaterNumber1" id="HMaterNumber1" style="width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HMaterID1" lay-verify="HMaterID1" id="HMaterID1" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMater1" id="btnHMater1" style="padding: 0 10px;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </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="HMaterNumber2" lay-verify="HMaterNumber2" id="HMaterNumber2" style="width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HMaterID2" lay-verify="HMaterID2" id="HMaterID2" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMater2" id="btnHMater2" style="padding: 0 10px;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </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="HProcName" lay-verify="HProcName" id="HProcName" style="width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HProcID" lay-verify="HProcID" id="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>                                       
+                                    </div>
+                                    <div class="layui-row">
+                                        <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="HWorkQty" lay-verify="HWorkQty" id="HWorkQty">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script>
+
+    //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+    var childPage = null;                       //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+    var currRowIndex = 0;                       //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+    var childData = null;                       //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+    //#endregion
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙fā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var sWhere = "";
+        var option = [];
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+        //鍒濆鍖栫晫闈�
+        set_ClearBill();
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        //淇濆瓨鎻愪氦
+        form.on('submit(btnSave)', function (data) {//鎻愪氦
+            set_AddNew(data);
+        });
+
+        //閫�鍑�
+        form.on('submit(Exit)', function () {
+            Pub_Close(1);
+        })
+
+        //閫夋嫨鐗╂枡1鎸夐挳
+        form.on('submit(btnHMater1)', function () {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HMaterID1").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HMaterNumber1").val(checkStatus.data[0].鐗╂枡浠g爜);//鐗╂枡鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+
+        //閫夋嫨鐗╂枡2鎸夐挳
+        form.on('submit(btnHMater2)', function () {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐗╂枡'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HMaterID2").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HMaterNumber2").val(checkStatus.data[0].鐗╂枡浠g爜);//鐗╂枡鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });
+
+        //閫夋嫨宸ュ簭鎸夐挳
+        form.on('submit(btnHProc)', function () {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '宸ュ簭'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HProcID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                    $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        });        
+        //#endregion
+
+        //#region 鏂囨湰妗嗙洃鍚�
+        $(document).ready(function () {
+            //#region 鏍规嵁鐗╂枡浠g爜鑾峰彇鐗╂枡鍩虹璧勬枡绛涢�夊脊绐�
+            //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+            $("#HMaterNumber1").on('keydown', function (data) {
+                //================================================================================================
+                var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                    if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                        var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                        var innerHeight = window.innerHeight;
+                        var top = offset.top + 0.05 * innerHeight;
+                        var left = offset.left;
+                        if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                            top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                        }
+                        layer.open({
+                            type: 2                                                                                     //寮圭獥绫诲瀷
+                            , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                            , area: ['35%', '50%']                                                                      //澶у皬
+                            , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                            , offset: [top, left]
+                            , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                            //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                            , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                            , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                            , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                            , success: function (layero, index) {
+                                setTimeout(function () {
+                                    //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                                    var value = $("#HMaterNumber1").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                    currRowIndex = 0;
+                                    var tableView = "h_v_Gy_MaterialList";
+                                    var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О from " + tableView + " where 1=1 and (鐗╂枡浠g爜 like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                                    childPage.getData(childSWhere, tableView);
+                                    //===================================================================================================================================
+                                }, 200);
+                            }
+                            , end: function () {
+                                childPage = null;
+                                currRowIndex = 0;
+                                if (childData != null) {
+                                    //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                                    //鑾峰彇鏁版嵁
+                                    $("#HMaterID1").val(childData.HItemID);//鐗╂枡id
+                                    $("#HMaterNumber1").val(childData.鐗╂枡浠g爜);//鐗╂枡鍚嶇О
+                                    //===============================================================================================================================
+
+                                    childData = null;
+                                }
+                            }
+                        });
+                    } else {
+                        setTimeout(function () {
+                            //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                            var value = $("#HMaterNumber1").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                            currRowIndex = 0;
+                            var tableView = "h_v_Gy_MaterialList";
+                            var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О from " + tableView + " where 1=1 and (鐗╂枡浠g爜 like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                            childPage.getData(childSWhere, tableView);
+                            //=================================================================================================================================
+                        }, 200);
+                    }
+                } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                    if (event.key == "ArrowUp") {
+                        currRowIndex--;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "ArrowDown") {
+                        currRowIndex++;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "Enter") {
+                        //鎵嬪姩澶辩劍
+                        var element = document.getElementById("HMaterNumber");
+                        element.blur();
+
+                        childPage.getSelectedData(currRowIndex);
+
+                        if (childData != null) {
+                            //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                            //鑾峰彇鏁版嵁
+                            $("#HMaterID1").val(childData.HItemID);//鐗╂枡id
+                            $("#HMaterNumber1").val(childData.鐗╂枡浠g爜);//鐗╂枡鍚嶇О
+                            //===============================================================================================================================
+
+                            childData = null;
+                        }
+
+
+                        childPage = null;
+                        currRowIndex = 0;
+                        childData = null;
+                    }
+                }
+            });
+            //#endregion
+            //#region 鏍规嵁鐗╂枡浠g爜鑾峰彇鐗╂枡鍩虹璧勬枡绛涢�夊脊绐�
+            //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+            $("#HMaterNumber2").on('keydown', function (data) {
+                //================================================================================================
+                var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                    if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                        var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                        var innerHeight = window.innerHeight;
+                        var top = offset.top + 0.05 * innerHeight;
+                        var left = offset.left;
+                        if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                            top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                        }
+                        layer.open({
+                            type: 2                                                                                     //寮圭獥绫诲瀷
+                            , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                            , area: ['35%', '50%']                                                                      //澶у皬
+                            , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                            , offset: [top, left]
+                            , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                            //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                            , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                            , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                            , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                            , success: function (layero, index) {
+                                setTimeout(function () {
+                                    //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                                    var value = $("#HMaterNumber2").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                    currRowIndex = 0;
+                                    var tableView = "h_v_Gy_MaterialList";
+                                    var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О from " + tableView + " where 1=1 and (鐗╂枡浠g爜 like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                                    childPage.getData(childSWhere, tableView);
+                                    //===================================================================================================================================
+                                }, 200);
+                            }
+                            , end: function () {
+                                childPage = null;
+                                currRowIndex = 0;
+                                if (childData != null) {
+                                    //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                                    //鑾峰彇鏁版嵁
+                                    $("#HMaterID2").val(childData.HItemID);//鐗╂枡id
+                                    $("#HMaterNumber2").val(childData.鐗╂枡浠g爜);//鐗╂枡鍚嶇О
+                                    //===============================================================================================================================
+
+                                    childData = null;
+                                }
+                            }
+                        });
+                    } else {
+                        setTimeout(function () {
+                            //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                            var value = $("#HMaterNumber2").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                            currRowIndex = 0;
+                            var tableView = "h_v_Gy_MaterialList";
+                            var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О from " + tableView + " where 1=1 and (鐗╂枡浠g爜 like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                            childPage.getData(childSWhere, tableView);
+                            //=================================================================================================================================
+                        }, 200);
+                    }
+                } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                    if (event.key == "ArrowUp") {
+                        currRowIndex--;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "ArrowDown") {
+                        currRowIndex++;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "Enter") {
+                        //鎵嬪姩澶辩劍
+                        var element = document.getElementById("HMaterNumber2");
+                        element.blur();
+
+                        childPage.getSelectedData(currRowIndex);
+
+                        if (childData != null) {
+                            //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                            //鑾峰彇鏁版嵁
+                            $("#HMaterID2").val(childData.HItemID);//鐗╂枡id
+                            $("#HMaterNumber2").val(childData.鐗╂枡浠g爜);//鐗╂枡鍚嶇О
+                            //===============================================================================================================================
+
+                            childData = null;
+                        }
+
+
+                        childPage = null;
+                        currRowIndex = 0;
+                        childData = null;
+                    }
+                }
+            });
+            //#endregion
+            //#region 鏍规嵁宸ュ簭鑾峰彇鐗╂枡鍩虹璧勬枡绛涢�夊脊绐�
+            //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+            $("#HProcName").on('keydown', function (data) {
+                //================================================================================================
+                var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                    if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                        var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                        var innerHeight = window.innerHeight;
+                        var top = offset.top + 0.05 * innerHeight;
+                        var left = offset.left;
+                        if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                            top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                        }
+                        layer.open({
+                            type: 2                                                                                     //寮圭獥绫诲瀷
+                            , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                            , area: ['35%', '50%']                                                                      //澶у皬
+                            , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                            , offset: [top, left]
+                            , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                            //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                            , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                            , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                            , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                            , success: function (layero, index) {
+                                setTimeout(function () {
+                                    //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                                    var value = $("#HProcName").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                    currRowIndex = 0;
+                                    var tableView = "h_v_Gy_ProcessList";
+                                    var childSWhere = "select top(10) HItemID,宸ュ簭浠g爜,宸ュ簭鍚嶇О from " + tableView + " where 1=1 and (宸ュ簭浠g爜 like '%" + value + "%' or 宸ュ簭鍚嶇О like '%" + value + "%') order by 宸ュ簭浠g爜 desc";
+                                    childPage.getData(childSWhere, tableView);
+                                    //===================================================================================================================================
+                                }, 200);
+                            }
+                            , end: function () {
+                                childPage = null;
+                                currRowIndex = 0;
+                                if (childData != null) {
+                                    //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                                    //鑾峰彇鏁版嵁
+                                    $("#HProcID").val(childData.HItemID);//鐗╂枡id
+                                    $("#HProcName").val(childData.宸ュ簭鍚嶇О);//鐗╂枡鍚嶇О
+                                    //===============================================================================================================================
+
+                                    childData = null;
+                                }
+                            }
+                        });
+                    } else {
+                        setTimeout(function () {
+                            //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                            var value = $("#HProcName").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                            currRowIndex = 0;
+                            var tableView = "h_v_Gy_ProcessList";
+                            var childSWhere = "select top(10) HItemID,宸ュ簭浠g爜,宸ュ簭鍚嶇О from " + tableView + " where 1=1 and (宸ュ簭浠g爜 like '%" + value + "%' or 宸ュ簭鍚嶇О like '%" + value + "%') order by 宸ュ簭浠g爜 desc";
+                            childPage.getData(childSWhere, tableView);
+                            //=================================================================================================================================
+                        }, 200);
+                    }
+                } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                    if (event.key == "ArrowUp") {
+                        currRowIndex--;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "ArrowDown") {
+                        currRowIndex++;
+                        childPage.setSelectedRow(currRowIndex);
+                    } else if (event.key == "Enter") {
+                        //鎵嬪姩澶辩劍
+                        var element = document.getElementById("HProcName");
+                        element.blur();
+
+                        childPage.getSelectedData(currRowIndex);
+
+                        if (childData != null) {
+                            //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                            //鑾峰彇鏁版嵁
+                            $("#HProcID").val(childData.HItemID);//鐗╂枡id
+                            $("#HProcName").val(childData.宸ュ簭鍚嶇О);//鐗╂枡鍚嶇О
+                            //===============================================================================================================================
+
+                            childData = null;
+                        }
+
+
+                        childPage = null;
+                        currRowIndex = 0;
+                        childData = null;
+                    }
+                }
+            });
+            //#endregion
+        });
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
+            var HMaterNumber1 = $("#HMaterNumber1").val();
+            var HMaterNumber2 = $("#HMaterNumber2").val();
+            var HProcID = $("#HProcID").val();
+            var HWorkQty = $("#HWorkQty").val();
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_RoutingBill/BulkWorkQty',
+                type: "GET",
+                data: { "HMaterNumber1": HMaterNumber1, "HMaterNumber2": HMaterNumber2, "HProcID": HProcID, "HWorkQty": HWorkQty },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.msg(data1.Message);
+                    } else {
+                        $('#btnSave').removeClass("layui-btn-disabled").attr("disabled", false);//鍚敤淇濆瓨鎸夐挳
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    $('#btnSave').removeClass("layui-btn-disabled").attr("disabled", false);//鍚敤淇濆瓨鎸夐挳
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+    });
+
+
+</script>
\ No newline at end of file

--
Gitblit v1.9.1