From ccd2eb19f83850b4d2b042d35b40e928ffa6d228 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 10 一月 2025 16:08:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html         |   89 +
 WebTM/views/生产管理/提料计划/JIT_PickUpCalculate.html           |  166 ++
 WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html  |    4 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html            |   81 +
 WebTM/views/设备管理/设备报表/Sb_EquipmentLoadReport.html        |  108 +
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillWorkQty.html         |  494 +++++++
 WebTM/views/车间管理/报表分析/Sc_BadReasonReport.html            |  115 +
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html      |  135 +
 WebTM/views/生产管理/日计划报表/ReportPODemandPlanBillList_S.html |  173 ++
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                |   45 
 WebTM/views/生产管理/生产计划平台/Sc_BulkEditWorkTime.html         |  416 ++++++
 WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_Check_PDA.html | 1426 ++++++++++++++++++++++
 WebTM/views/计划管理/工艺路线/Gy_BulkEditWorkQty.html            |  531 ++++++++
 WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html             |   16 
 WebTM/WebTM.csproj                                       |    5 
 15 files changed, 3,765 insertions(+), 39 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 50e74b6..abd71f8 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -341,6 +341,7 @@
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_CheckList_PDA.html" />
+    <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_Check_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBillList_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBill_PDA.html" />
     <Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBillList_PDA.html" />
@@ -551,6 +552,7 @@
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind_Button.html" />
     <Content Include="views\鐢熶骇绠$悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBill_Add_Edit.html" />
+    <Content Include="views\鐢熶骇绠$悊\鎻愭枡璁″垝\JIT_PickUpCalculate.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillOrProcessExchangeResumeList.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList_PDA.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_ProductionInProgressReport.html" />
@@ -561,6 +563,7 @@
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\JIT_DayPlanPlatForm_BCP.html" />
     <Content Include="views\鐢熶骇绠$悊\璁㈠崟鐘舵�佸垎甯僜Sc_EquipmentProcessList.html" />
     <Content Include="views\鐢熶骇绠$悊\璁㈠崟鐘舵�佸垎甯僜Sc_OEEStatusReport.html" />
+    <Content Include="views\鐢熶骇绠$悊\鐢熶骇璁″垝骞冲彴\Sc_BulkEditWorkTime.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBill_PDA.html" />
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillSumSave.html" />
     <Content Include="views\鐪嬫澘\閲囪喘鏀舵枡\KB_CGSL.html" />
@@ -571,9 +574,11 @@
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserRightQuery.html" />
     <Content Include="views\绯荤粺绠$悊\绯荤粺閰嶇疆\Xt_AutoLoadBillList.html" />
     <Content Include="views\璁″垝绠$悊\Excel\Gy_Group_Excel.html" />
+    <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_BulkEditWorkQty.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillCheckQuery.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillCloseList.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillToInvalidatedList.html" />
+    <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillWorkQty.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Pay_ProcPriceTypeChangeReport.html" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_MaterialTechParamBill_Excel.html" />
     <Content Include="views\璁惧绠$悊\Sb_Add_EquipRepairSignBillList.html" />
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Check_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Check_PDA.html"
new file mode 100644
index 0000000..0aeb52d
--- /dev/null
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_Check_PDA.html"
@@ -0,0 +1,1426 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐩存帴璋冩嫧鍗曟牎楠�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <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-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
+            <div class="layui-card-body" style="padding: 0px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐩存帴璋冩嫧鍗曟牎楠�</span>
+                    </div>
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
+                        <div class="layui-row">
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width: 30px;padding-left: 0px;">鏉$爜</label>
+                                </div>
+                                <div class="layui-col-xs9">
+                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">鏁伴噺</label>
+                                </div>
+                                <div class="layui-col-xs5">
+                                    <input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                                <div class="layui-col-xs4">
+                                    <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
+                                </div>
+                                <div class="layui-col-xs6">
+                                    <input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                    <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs6">
+                                <div class="layui-col-xs3">
+                                    <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撲綅</label>
+                                </div>
+                                <div class="layui-col-xs6">
+                                    <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                    <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                </div>
+                                <div class="layui-col-xs3">
+                                    <button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MoveStockBill_Check_PDA">
+                            <ul class="layui-tab-title" lay-filter="tab-all">
+                                <li lay-id="1" style="padding:1px;">琛ㄥご淇℃伅</li>
+                                <li lay-id="2" style="padding:1px;">鐗╂枡淇℃伅</li>
+                                <li lay-id="3" style="padding:1px;">鏉$爜淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <!--琛ㄥご淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row" style="margin-top: 0px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <div class="layui-col-xs10">
+                                                    <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                </div>
+                                                <!--<div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo" class="layui-btn" id="cmdHBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
+                                    </button>
+                                </div>-->
+                                                <div class="layui-col-xs2" style="float: right;">
+                                                    <button type="button" lay-submit="" lay-filter="HBillNo-BT" class="layui-btn" id="HBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <div class="layui-col-xs8">
+                                                    <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                                </div>
+                                                <div class="layui-col-xs4" style="float: right;">
+                                                    <button type="button" lay-submit="" lay-filter="cmdHBillNo_Add" class="layui-btn" id="cmdHBillNo_Add" style="width: 100px; margin-left: -20px;padding-left:8px">閲嶆柊鍚屾鍗曟嵁</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭缁勭粐</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HStockOutOrgName" id="HStockOutOrgName" lay-verify="HStockOutOrgName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                                <input type="hidden" name="HStockOutOrgID" id="HStockOutOrgID" lay-verify="HStockOutOrgID" value="0" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆缁勭粐</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HStockInOrgName" id="HStockInOrgName" lay-verify="HStockInOrgName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                                <input type="hidden" name="HStockInOrgID" id="HStockInOrgID" lay-verify="HStockInOrgID" value="0" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-row" style="margin: 1% 2%;text-align: right;">
+                                            <input type="checkbox" name="chkHBarflag" id="chkHBarflag" lay-skin="primary" lay-filter="chkHBarflag" value="true" title="鏉$爜鏍稿" disabled="disabled">
+                                            <input type="hidden" value="false" name="HBarflag" id="HBarflag">
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--鐗╂枡淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--鏉$爜淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HBarCode_B" id="HBarCode_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鐗╂枡</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMaterName_B" id="HMaterName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">瑙勬牸</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HMaterModel_B" id="HMaterModel_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鎵规</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HBatchNo_B" id="HBatchNo_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鍗曚綅</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HUnitName_B" id="HUnitName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HQty_B" id="HQty_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2">
+                                                <label class="layui-form-label" style="width:40px;padding-left:0px;">瀹归噺</label>
+                                            </div>
+                                            <div class="layui-col-xs10">
+                                                <input type="text" name="HTMQty_B" id="HTMQty_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撳簱</label>
+                                            </div>
+                                            <div class="layui-col-xs10" style="margin-left:10px">
+                                                <input type="text" name="HWHName_B" id="HWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
+                                            </div>
+                                            <div class="layui-col-xs10" style="margin-left:10px">
+                                                <input type="text" name="HSPName_B" id="HSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
+                                            </div>
+                                            <div class="layui-col-xs10" style="margin-left:10px">
+                                                <input type="text" name="HSCWHName_B" id="HSCWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item" style="padding:0px;margin:0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs2" style="margin-left:-10px">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
+                                            </div>
+                                            <div class="layui-col-xs10" style="margin-left:10px">
+                                                <input type="text" name="HSCSPName_B" id="HSCSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+                            <button type="button" lay-submit="" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
+                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                    </div>
+
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HBillType" id="HBillType">
+                    <input type="hidden" name="HSourceBillListCtl" id="HSourceBillListCtl">
+                    <input type="hidden" name="HStockOrgID" id="HStockOrgID" value="0">
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script>
+        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
+                , laydate = layui.laydate
+                , element = layui.element;
+            var HInterID = $('#HInterID').val()
+            var HBillNo = $('#HBillNo').val()
+            var HBillType = '1207'
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var HSourceBarCodeCtl = "N" //鏄惁杩涜婧愬崟瀵瑰簲鏉$爜鏍稿锛�'Y'涓烘牳瀵癸級
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var listOption = [];
+            var columns = "";
+            var HModName = "Kf_MoveStockBill_Check_PDA";
+            var ModRightName = "CE_MoveStockCheck";    //妯″潡鏉冮檺鍙傛暟
+            var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();
+            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var HBillNo_Temp = params[params[1]];      //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
+
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login_pda.html"; });
+            }
+
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
+
+            function CheckModRight() {
+                layer.load(3);
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                    success: function (d) {
+                        if (d.count == 1) {
+                        }
+                        else {
+                            layer.msg(d.Message, {
+                                icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                layer.closeAll("loading");
+            }
+            //#endregion
+
+            //澶辫触鎻愮ず闊�
+            function playSound() {
+                console.log("playSound");
+                var audio = document.getElementById("cs");
+                audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
+            }
+            //鎴愬姛鎻愮ず闊�
+            function playSound_OK() {
+                console.log("playSound_OK");
+                var audio = document.getElementById("cs2");
+                audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
+            }
+
+            //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
+            function set_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HStockOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HStockOutOrgName").val(sessionStorage["Organization"]);
+                $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HStockInOrgName").val(sessionStorage["Organization"]);
+                $("#HBillType").val("1207");
+
+                //榛樿鏄剧ず椤甸潰
+                element.tabChange('tab-Kf_MoveStockBill_Check_PDA', '1');
+
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                var data = [];
+                listOption.cols = [[
+                    { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '鍗曟嵁鏁伴噺', title: '鍗曟嵁鏁伴噺', width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                    , { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
+                    , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+                    , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 100 }
+                    , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 100 }
+                    , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 100 }
+                    , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 100 }
+                    , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+                    , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                    , { field: '鏉$爜涓暟', title: '鏉$爜涓暟', width: 100 }
+                ]];
+                listOption.data = data;
+                table.render(listOption);
+
+                //鍏夋爣榛樿鍦ㄥ崟鎹彿浣嶇疆涓�
+                var pFocus = $("#HBillNo");
+                pFocus.select();
+                pFocus.focus();     //鑾峰彇鍏夋爣
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                listOption = {
+                    elem: '#wl-table'
+                    //, toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , height: 'full-60'
+                    , cellMinWidth: 90
+                    , limit: 100
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                };
+            }
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(wl-table)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                $(".layui-table-body tr ").attr({ "style": "background:" });    //鍏朵粬tr鎭㈠鍘熸牱
+                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //閫変腑琛屾牱寮�
+                obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //閫変腑radio鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+            })
+            //#endregion
+
+            //#region  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(wl-table)', function (obj) {
+                var data = obj.data;
+
+                //鐗╂枡浠g爜瓒呴摼鎺�
+                if (obj.event == '鐗╂枡浠g爜') {                      //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐗╂枡浠g爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var HMaterNumber = data.鐗╂枡浠g爜.toString();    //澹版槑鍙橀噺HMaterNumber 涓� data.鐗╂枡浠g爜
+                    layer.open({                                    //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
+                        type: 2                                     //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '鍙婃椂搴撳瓨淇℃伅'                     //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1                               //鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6                                //閬僵閫忔槑搴�
+                        , maxmin: false                              //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0                                   //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,                            //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                        }
+                    })
+                }
+            });
+             //#endregion
+
+            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+            if (OperationType == 2) {
+                $("#HBillNo").val(HBillNo_Temp);
+                GetMeesageByBillNo();
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                //鏄剧ず琛ㄤ綋鏄庣粏
+                DisBillEntryList();
+                element.tabChange('tab-Kf_MoveStockBill_Check_PDA', '2');
+            }
+
+            //#endregion
+
+            //#region 鍩虹璧勬枡閫夋嫨
+
+            //#region 浠撳簱
+            //鎵弿浠撳簱鏉$爜
+            $('#HWHName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    var HWHName = $('#HWHName').val()
+                    if (HWHName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        $("#HStockPlaceName").removeAttr("disabled");
+                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                        layer.msg("浠撳簱鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HWHName").select();
+                            $("#HWHName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetWarehouse_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HWHName, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HWHID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                if (result.data[0].HSPFlag == 0) {
+                                    $("#HStockPlaceName").attr("disabled", "disabled");
+                                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                }
+                                else {
+                                    $("#HStockPlaceName").removeAttr("disabled");
+                                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                }
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                $("#HStockPlaceName").removeAttr("disabled");
+                                $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HWHName").select();
+                                    $("#HWHName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //浠撳簱鎸夐挳
+            form.on('submit(HWHID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#region 浠撲綅
+            //鎵弿浠撲綅鏉$爜
+            $('#HStockPlaceName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                    if ($("#HWHName").val() == '') {
+                        $("#HWHID").val("0");
+                    }
+                    var sHWHID = $("#HWHID").val()
+                    var HStockPlaceName = $('#HStockPlaceName').val()
+                    if (HStockPlaceName == '') {
+                        playSound();
+                        $("#HWHID").val("0");
+                        $("#HWHName").val("");
+                        $("#HStockPlaceID").val("0");
+                        $("#HStockPlaceName").val("");
+                        layer.msg("浠撲綅鏉$爜涓虹┖锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HStockPlaceName").select();
+                            $("#HStockPlaceName").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3);
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/GetStockPlace_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": HStockPlaceName, "HWhID": sHWHID, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHName").val(result.data[0].HWhName);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                //鍏夋爣鏄剧ず鍒版潯鐮佷笂
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            }
+                            else {
+                                playSound();
+                                $("#HWHID").val("0");
+                                $("#HWHName").val("");
+                                $("#HStockPlaceID").val("0");
+                                $("#HStockPlaceName").val("");
+                                layer.msg(result.Message, {
+                                    icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HStockPlaceName").select();
+                                    $("#HStockPlaceName").focus();
+                                });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                    });
+                }
+            });
+
+            //浠撲綅鎸夐挳
+            form.on('submit(HSpID-BT)', function () {
+                //浠撳簱鏂囨湰妗嗕负绌烘椂锛屾竻绌哄搴擨D
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + $("#HWHID").val() + '&Type=HSpID&HOrgID=' + HStockOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //#endregion
+
+            //#endregion
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 鎻愪氦
+            form.on('submit(cmdSaver)', function (data) {
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/WEBSController/set_SaveMoveStockBill_BillCheck_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm(data.Message, {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+                                        btn2: function () {
+                                            if (OperationType == 2) {
+                                                parent.location.href = "../../WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_CheckList_PDA.html";
+                                            }
+                                            else {
+                                                parent.location.href = "../../../views/index_Mobile.html";
+                                            }
+                                        }//鍏抽棴
+                                    }
+                                        , function () {
+                                            location.replace('Kf_MoveStockBill_Check_PDA.html?OperationType=1&HInterID=0');
+                                        });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    layer.closeAll("loading");
+                    return;
+                }
+            });
+
+            //#endregion
+
+            //#region 缂栬緫
+
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length == 1) {
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏄庣粏鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '&HBillType =' + data[0].HBillType, 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                        , end: function () {
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇峰厛閫夋嫨涓�琛岃褰曪紝杩涜缂栬緫锛�');
+                }
+            });
+
+
+            //#endregion
+
+            //#region 鍒犻櫎
+
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length == 1) {
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var sSourceInterID = data[0].HSourceInterID
+                        var sSourceEntryID = data[0].HSourceEntryID
+
+                        layer.load(3)
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json",
+                                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                data: { "HInterID": HInterID, "HBillType": HBillType, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HSourceBarCodeCtl": HSourceBarCodeCtl },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) {
+                                        layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            //鏄剧ず琛ㄤ綋鏄庣粏
+                                            DisBillEntryList();
+                                        });
+                                    }
+                                    else {
+                                        playSound();
+                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    }
+                                },
+                                complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            });
+                        layer.closeAll("loading");
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                }
+            });
+
+            //#endregion
+
+            //#region 閫�鍑�
+
+            form.on('submit(cmdCancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 2) {
+                        var index = parent.layer.getFrameIndex(window.name);    //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                        parent.location.reload();                               //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+                        parent.layer.close(index);                              //鍐嶆墽琛屽叧闂�
+                    }
+                    else {
+                        parent.location.href = "../../../views/index_Mobile.html";
+                    }
+                });
+            })
+
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鍗曟嵁閫夋嫨
+
+            form.on('submit(cmdHBillNo)', function () {
+                var HSourceTitle = "鐩存帴璋冩嫧鍗�";
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: HSourceTitle + '鍒楄〃'//鏍囬
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_SourceBillEditDlg_PDA.html?HBillType =' + HBillType + '&HSourceBillType =' + HBillType + '&HStockOrgID =' + HStockOrgID, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                    , end: function () {
+                        if ($("#HSourceBillListCtl").val() == '1') {
+                            GetMeesageByBillNo();
+                            $("#HSourceBillListCtl").val("0");  //鐢ㄤ簬鍖哄垎婧愬崟鍒楄〃鐣岄潰鍏抽棴鐘舵�侊紙1涓鸿繑鍥烇紝0涓洪��鍑猴級
+                        }
+                    }
+                })
+            });
+
+            //#endregion
+
+
+            //#region 閲嶆柊鍚屾鍗曟嵁
+
+            form.on('submit(cmdHBillNo_Add)', function () {
+                if ($('#HBillNo').val() == '') {
+                    playSound();
+                    layer.msg("鍗曟嵁鍙蜂负绌猴紝鏃犳硶閲嶆柊鍚屾鍗曟嵁锛�", {
+                        icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBillNo").select();
+                        $("#HBillNo").focus();
+                    });
+                    return;
+                }
+                GetMeesageByBillNo();
+            });
+
+            //#endregion
+
+
+            //#region 鎵弿鍗曟嵁鍙锋潯鐮�
+
+            //鎵弿鍗曟嵁鍙锋潯鐮�
+            $('#HBillNo').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBillNo();
+                }
+            });
+
+            //鍗曟嵁鍙锋寜閽�
+            form.on('submit(HBillNo-BT)', function (data) {
+                GetMeesageByBillNo();
+            });
+
+            //鎵弿鍗曟嵁鍙锋潯鐮�
+            function GetMeesageByBillNo(obj) {
+                HBillNo = $('#HBillNo').val()
+                layer.load(3)
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/get_BillBarCode_BillCheck_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillNo": HBillNo, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $('#HInterID').val(result.data.hInterIDField)
+                            $('#HBillNo').val(result.data.hBillNoField)
+                            $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField)
+                            $("#HStockOutOrgName").val(result.data.hStockOutOrgNameField)
+                            $("#HStockInOrgID").val(result.data.hStockInOrgIDField)
+                            $("#HStockInOrgName").val(result.data.hStockInOrgNameField)
+                            $("#HBillNo").attr("disabled", "disabled");
+                            $('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            $('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            HInterID = $('#HInterID').val()
+                            //鏉$爜鏍稿鏍囪
+                            if (result.data.hSourceBarCodeFlagField) {
+                                $("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
+                                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    "HBarflag": result.data
+                                });
+                                HSourceBarCodeCtl = "Y"
+                            }
+                            element.tabChange('tab-Kf_MoveStockBill_Check_PDA', '2');
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
+
+                            //宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁
+                            if (result.data.hBackField == '2') {
+                                playSound();
+                                layer.confirm(result.data.hRemarkField, {
+                                    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
+                                    btn2: function () {
+                                    }//鍏抽棴
+                                }
+                                , function () {
+                                    $.ajax({
+                                        type: "GET",
+                                        url: GetWEBURL() + "/WEBSController/get_ClearBarCode_BillCheck_Json",
+                                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                        data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                                        success: function (result) {
+                                            if (result.count == 1) {
+                                                var data = result.data[0];
+                                                $('#HInterID').val(data.HInterID)
+                                                $('#HBillNo').val(data.HBillNo)
+                                                HInterID = $('#HInterID').val()
+                                                layer.closeAll();
+                                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                                DisBillEntryList();
+                                            }
+                                            else {
+                                                playSound();
+                                                layer.msg(result.Message, {
+                                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                                }, function () {
+                                                    element.tabChange('tab-Kf_MoveStockBill_Check_PDA', '1');
+                                                    $("#HBillNo").select();
+                                                    $("#HBillNo").focus();
+                                                });
+                                            }
+                                        },
+                                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                                        error: function (err) {
+                                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                        }
+                                    });
+                                });//娓呯┖
+                            }
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                element.tabChange('tab-Kf_MoveStockBill_Check_PDA', '1');
+                                $("#HBillNo").select();
+                                $("#HBillNo").focus();
+                            });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                layer.closeAll("loading");
+            }
+
+            //#endregion
+
+
+            //#region 鎵弿鐗╂枡鏉$爜
+
+            //鎵弿鏉$爜
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                    $("#HBarCode").select();
+                    $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                }
+            });
+
+            //鏉$爜鎸夐挳
+            form.on('submit(HBarCode-BT)', function (data) {
+                GetMeesageByBarCode();
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+            });
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {
+                //浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
+                if ($("#HWHName").val() == '') {
+                    $("#HWHID").val("0");
+                }
+                if ($("#HStockPlaceName").val() == '') {
+                    $("#HStockPlaceID").val("0");
+                }
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+                var sHWHID = $("#HWHID").val()
+                var sHSPID = $("#HStockPlaceID").val()
+                var sHQty = $("#HQty").val()
+
+                //鍒犻櫎鎵�鎵弿鏉$爜
+                if (HDeleteFlag == "*") {
+                    if (HSourceBarCodeCtl == "Y") {
+                        playSound();
+                        layer.msg("鏍¢獙鏉$爜锛屾棤闇�鍒犻櫎锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    else if (sBarCode == "") {
+                        playSound();
+                        layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮侊紒", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    else {
+                        $('#HBarCode').val("");
+                    }
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_BarCode_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HBillType": HBillType, "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound_OK();
+                                    //娓呯┖鏁伴噺
+                                    $("#HQty").val("");
+                                    element.tabChange('tab-Kf_MoveStockBill_Check_PDA', '2');//璺宠浆椤电
+                                    //鏄剧ず琛ㄤ綋鏄庣粏
+                                    DisBillEntryList();
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, {
+                                        icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HBarCode").select();
+                                        $("#HBarCode").focus();
+                                    });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, {
+                                    icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        });
+                    layer.closeAll("loading");
+                }
+                //鎵弿鏉$爜
+                else {
+                    var sBarCode = $('#HBarCode').val()
+                    if (sBarCode == '') {
+                        playSound();
+                        layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    if (sHQty == "") {
+                        sHQty = 0;
+                    }
+                    layer.load(3)
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/get_CheckTypeByBarCode_BillCheck_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "sBarCode": sBarCode, "HBillID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HMaker": HMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sHQty, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                playSound_OK();
+                                if (result.data.hBarTypeField == '浠撳簱鏉$爜') {
+                                    $("#HWHName").val(result.data.hWhNameField);
+                                    $("#HWHID").val(result.data.hWhIDField);
+                                    $("#HStockPlaceName").val("");
+                                    $("#HStockPlaceID").val("0");
+                                    if (result.data.hSPFlagField == 0) {
+                                        $("#HStockPlaceName").attr("disabled", "disabled");
+                                        $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                    }
+                                    else {
+                                        $("#HStockPlaceName").removeAttr("disabled");
+                                        $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                                    }
+                                    return;//缁撴潫
+                                }
+                                else if (result.data.hBarTypeField == '浠撲綅鏉$爜') {
+                                    $("#HStockPlaceName").val(result.data.hSPNameField);
+                                    $("#HStockPlaceID").val(result.data.hSPIDField);
+                                    $("#HWHName").val(result.data.hWhNameField);
+                                    $("#HWHID").val(result.data.hWhIDField);
+                                    return;//缁撴潫
+                                }
+                                else if (result.data.hBarTypeField == '婧愬崟鏉$爜') {
+                                    $('#HInterID').val(result.data.hInterIDField)
+                                    $('#HBillNo').val(result.data.hBillNoField)
+                                    $("#HBillNo").attr("disabled", "disabled");
+                                    $('#HBillNo-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                    $('#cmdHBillNo').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                                    HInterID = $('#HInterID').val()
+                                    //鏉$爜鏍稿鏍囪
+                                    if (result.data.hSourceBarCodeFlagField) {
+                                        $("input[name='chkHBarflag'][value='" + result.data.hSourceBarCodeFlagField + "']").attr("checked", true);
+                                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                            "HBarflag": result.data
+                                        });
+                                        HSourceBarCodeCtl = "Y"
+                                    }
+
+                                    //宸插瓨鍦ㄦ壂鐮佽褰曚笖鍗曟嵁鍙戠敓鍙樻洿鍚庝袱杈规暟鎹笉涓�鑷存椂锛屾竻绌哄師鎵爜鏁版嵁
+                                    if (result.data.hBackField == '2') {
+                                        layer.confirm(result.data.hRemarkField, {
+                                            icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['娓呯┖', '鍏抽棴'],
+                                            btn2: function () {
+                                            }//鍏抽棴
+                                        }
+                                        , function () {
+                                            $.ajax({
+                                                type: "GET",
+                                                url: GetWEBURL() + "/WEBSController/get_ClearBarCode_BillCheck_Json",
+                                                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                                data: { "HInterID": HInterID, "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                                                success: function (result) {
+                                                    if (result.count == 1) {
+                                                        var data = result.data[0];
+                                                        $('#HInterID').val(data.HInterID)
+                                                        $('#HBillNo').val(data.HBillNo)
+                                                        HInterID = $('#HInterID').val()
+                                                        layer.closeAll();
+                                                        //鏄剧ず琛ㄤ綋鏄庣粏
+                                                        DisBillEntryList();
+                                                    }
+                                                    else {
+                                                        playSound();
+                                                        layer.msg(result.Message, {
+                                                            icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                                        }, function () {
+                                                        });
+                                                    }
+                                                },
+                                                complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                                            });
+                                        });//娓呯┖
+                                    }
+                                    element.tabChange('tab-Kf_MoveStockBill_Check_PDA', '2');
+                                }
+                                //鐗╂枡鏉$爜
+                                else {
+                                    element.tabChange('tab-Kf_MoveStockBill_Check_PDA', '2');
+                                }
+                                //娓呯┖鏁伴噺
+                                $("#HQty").val("");
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
+                            }
+                            else {
+                                playSound();
+                                layer.msg(result.Message, {
+                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        },
+                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                        error: function (err) {
+                            playSound();
+                            layer.msg("閿欒锛�" + err, {
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
+                        }
+                    });
+                    layer.closeAll("loading");
+                }
+            }
+
+            //#endregion
+
+
+            //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+            function DisBillEntryList() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/WEBSController/GetKf_PonderationBillMain_Temp_BillCheck_New_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HBillType": HBillType, "sWhere": '', "HSourceBarCodeCtl": HSourceBarCodeCtl },
+                    success: function (result) {
+                        var data = [];
+                        var col = [];
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in result.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(result.list[key].ColmCols)) {
+                                    titleData[key] = result.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'radio', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                } else if (data[i].name == '鐗╂枡浠g爜') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: '鐗╂枡浠g爜', event: '鐗╂枡浠g爜', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鐗╂枡浠g爜 + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                } else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+                                            break;
+                                        default:
+
+                                        if (data[i].name == '鏁伴噺' || data[i].name == '鍗曟嵁鏁伴噺' || data[i].name == '鏉$爜涓暟') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+                                        } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+                                        }
+                                    }
+                                }
+                            }
+                            columns = col;
+                            listOption.cols = [columns];
+                            listOption.data = result.data.Materlist;
+                            listOption.totalRow = true;
+                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                            table.render(listOption);
+
+                            //鏉$爜淇℃伅
+                            $("#HBarCode_B").val(result.data.BarCodeDetailslist[0].HBarCode);
+                            if ($("#HBarCode_B").val() == '') {
+                                $("#HMaterName_B").val("");
+                                $("#HMaterModel_B").val("");
+                                $("#HBatchNo_B").val("");
+                                $("#HUnitName_B").val("");
+                                $("#HQty_B").val("");
+                                $("#HTMQty_B").val("");
+                                $("#HWHName_B").val("");
+                                $("#HSPName_B").val("");
+                                $("#HSCWHName_B").val("");
+                                $("#HSCSPName_B").val("");
+                            }
+                            else {
+                                $("#HMaterName_B").val(result.data.BarCodeDetailslist[0].HMaterName);
+                                $("#HMaterModel_B").val(result.data.BarCodeDetailslist[0].HMaterModel);
+                                $("#HBatchNo_B").val(result.data.BarCodeDetailslist[0].HBatchNo);
+                                $("#HUnitName_B").val(result.data.BarCodeDetailslist[0].HUnitName);
+                                $("#HQty_B").val(result.data.BarCodeDetailslist[0].HQty);
+                                $("#HTMQty_B").val(result.data.BarCodeDetailslist[0].HTMQty);
+                                $("#HWHName_B").val(result.data.BarCodeDetailslist[0].HWHName);
+                                $("#HSPName_B").val(result.data.BarCodeDetailslist[0].HSPName);
+                                $("#HSCWHName_B").val(result.data.BarCodeDetailslist[0].HSCWHName);
+                                $("#HSCSPName_B").val(result.data.BarCodeDetailslist[0].HSCSPName);
+                            }
+                        }
+                        else {
+                            listOption.cols = [[
+                                { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                                , { field: '鍗曟嵁鏁伴噺', title: '鍗曟嵁鏁伴噺', width: 100 }
+                                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                , { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
+                                , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 100 }
+                                , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 100 }
+                                , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 100 }
+                                , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 100 }
+                                , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 100 }
+                                , { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 100 }
+                                , { field: '鏈夋晥鏈熻嚦', title: '鏈夋晥鏈熻嚦', width: 100 }
+                                , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                                , { field: '鏉$爜涓暟', title: '鏉$爜涓暟', width: 100 }
+                            ]];
+                            listOption.data = data;
+                            table.render(listOption);
+
+                            //鏉$爜淇℃伅
+                            $("#HBarCode_B").val("");
+                            $("#HMaterName_B").val("");
+                            $("#HMaterModel_B").val("");
+                            $("#HBatchNo_B").val("");
+                            $("#HUnitName_B").val("");
+                            $("#HQty_B").val("");
+                            $("#HTMQty_B").val("");
+                            $("#HWHName_B").val("");
+                            $("#HSPName_B").val("");
+                            $("#HSCWHName_B").val("");
+                            $("#HSCSPName_B").val("");
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+            }
+
+            //#endregion
+
+
+            
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撳簱淇℃伅
+        function GetHWHValue(obj)
+        {
+            if (obj.length > 0) {
+                $("#HWHName").val(obj[0].HName);
+                $("#HWHID").val(obj[0].HItemID);
+                $("#HStockPlaceName").val("");
+                $("#HStockPlaceID").val("0");
+                if (obj[0].HSPFlag == 0) {
+                    $("#HStockPlaceName").attr("disabled", "disabled");
+                    $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                }
+                else {
+                    $("#HStockPlaceName").removeAttr("disabled");
+                    $('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝e父鐘舵��
+                }
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖浠撲綅淇℃伅
+        function GetHSpValue(obj) {
+            if (obj.length > 0) {
+                $("#HStockPlaceName").val(obj[0].HName);
+                $("#HStockPlaceID").val(obj[0].HItemID);
+                $("#HWHName").val(obj[0].HWhName);
+                $("#HWHID").val(obj[0].HWHID);
+            }
+        }
+        //鐐瑰嚮鎸夐挳閫夋嫨鍚�   杩斿洖鍗曟嵁鍙�
+        function GetHSourceBillValue(obj) {
+            if (obj.length > 0) {
+                $("#HBillNo").val(obj[0].鍗曟嵁鍙�);
+                $("#HSourceBillListCtl").val("1");
+            }
+        }
+
+        //鍗曟嵁涓婁紶鍓嶅垽鏂�
+        function AllowLoadData(sSubStr) {
+            if (HInterID == 0) {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忓崟鎹潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (HBillNo == '') {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忓崟鎹潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (sSubStr.length == 0) {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //鍒ゆ柇鏄惁宸叉壂鎻忕墿鏂欐潯鐮�
+            else {
+                var s = 0;
+                for (var i = 0; i <= sSubStr.length - 1; i++) {
+                    if (sSubStr[i].鏁伴噺 > 0) {
+                        s = 1;
+                    }
+                }
+                if (s == 0) {
+                    layer.msg("娌℃湁鎵弿鐗╂枡鏉$爜锛岃鍏堟壂鎻忕墿鏂欐潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+            }
+            return true;
+        }
+    </script>
+
+</body>
+</html>
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
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_RoutingBill.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_RoutingBill.html"
index c8ea292..3f0cdc9 100644
--- "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_RoutingBill.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_RoutingBill.html"
@@ -588,6 +588,7 @@
                 , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                 , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                 , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
+                ,"HSubStdEmpAvg_S": 0
             }];
             var HModName = "Gy_RoutingBill";
             //#endregion
@@ -648,7 +649,9 @@
                     , { field: 'HQCSchemeID_Patrol', title: '宸℃妫�楠屾柟妗圛D', hide: true }//f7
                     , { field: 'HQCSchemeNumber_Patrol', title: '宸℃妫�楠屾柟妗堜唬鐮�', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125 }
                     , { field: 'HQCSchemeName_Patrol', title: '宸℃妫�楠屾柟妗堝悕绉�', width: 125 }//f7
-                    , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', width: 125}
+                    , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text', width: 125 }
+                    , { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text', width: 125 }
+                    , { field: 'HSubStdEmpAvg_S', title: '浜哄潎浜ц兘', edit: 'text', width: 125}
                     //, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
                     //, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
                     ////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
@@ -1205,6 +1208,7 @@
                     , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                     , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                     , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
+                    , "HSubStdEmpAvg_S": 0
                 };
                 switch (obj.event) {
                     case 'btn-AddLine':
@@ -1366,6 +1370,33 @@
                             return false;
                         }
                     }
+                }
+            })
+
+            //鏄庣粏缃戞牸鍗曞厓鏍肩紪杈戜簨浠�
+            table.on('edit(mainTable)', function (obj) {
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                switch (field) {
+                    case 'HSubStdEmpQty_S': //浜х嚎浜烘暟
+                        if (value != 0 && value != "" && data.HSubStdEmpAvg_S != 0 && data.HSubStdEmpAvg_S != "") {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HWorkQty: Number((value * data.HSubStdEmpAvg_S).toFixed(2))
+                            });
+                            //table.render(option)
+                        }                       
+                        break;
+                    case 'HSubStdEmpAvg_S': //浜х嚎浜哄潎浜ц兘
+                        if (value != 0 && value != "" && data.HSubStdEmpQty_S != 0 && data.HSubStdEmpQty_S != "") {
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HWorkQty: Number((value * data.HSubStdEmpQty_S).toFixed(2))
+                            });
+                            //table.render(option)
+                        }
+                        break;
                 }
             })
 
@@ -2209,7 +2240,8 @@
                                                 , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
                                                 , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                                                 , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
-                                                , "HQCFst": false, "HQCProc": false, "HQCPatrol": false,"HMaterToSourceCtrl":false
+                                                , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
+                                                , "HSubStdEmpAvg_S": 0
                                             })
                                             j++;
                                         }
@@ -2656,6 +2688,7 @@
                                     , "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].杞簭妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Proc": d.data[i].杞簭妫�楠屾柟妗�
                                     , "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].宸℃妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Patrol": d.data[i].宸℃妫�楠屾柟妗�
                                     , "HQCFst": d.data[i].HQCFst == 1 ? true : false, "HQCProc": d.data[i].HQCProc == 1 ? true : false, "HQCPatrol": d.data[i].HQCPatrol == 1 ? true : false, "HMaterToSourceCtrl": d.data[i].HMaterToSourceCtrl == 1 ? true : false
+                                    , "HSubStdEmpAvg_S": d.data[i].浜哄潎浜ц兘
                                 }
                             )
                         }
@@ -2714,6 +2747,14 @@
                 for (var i = 0; i < table.cache["mainTable"].length; i++) {
                     if (table.cache["mainTable"][i] != "") {
                         table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+
+                        //鍔犲伐鏁伴噺=浜х嚎浜烘暟 * 浜х嚎浜哄潎浜ц兘
+                        if (table.cache["mainTable"][i].HSubStdEmpQty_S != 0 && table.cache["mainTable"][i].HSubStdEmpQty_S != "" && table.cache["mainTable"][i].HSubStdEmpAvg_S != 0 && table.cache["mainTable"][i].HSubStdEmpAvg_S != "") {
+
+                            table.cache["mainTable"][i].HWorkQty = Number((table.cache["mainTable"][i].HSubStdEmpQty_S * table.cache["mainTable"][i].HSubStdEmpAvg_S).toFixed(2))
+
+                        }
+
                         num.push(table.cache["mainTable"][i])
                     }                 
                 }
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_RoutingBillList.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_RoutingBillList.html"
index aa3c505..6909d7e 100644
--- "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_RoutingBillList.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_RoutingBillList.html"
@@ -227,6 +227,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_BulkEditWorkTime" id="btn_BulkEditWorkTime"><i class="layui-icon layui-icon-set"></i>鎵规敼灏忔椂浜ц兘</button>                               
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SourceWorkQty" id="btn_SourceWorkQty"><i class="layui-icon layui-icon-set"></i>浜х嚎浜ц兘</button>                               
                             </div>
                         </script>
                     </form>
@@ -389,6 +391,12 @@
                         break;
                     //璇诲彇鏂规
                     case 'btn_ReadScheme': set_ReadScheme();
+                        break;
+                    //鎵规敼灏忔椂浜ц兘
+                    case 'btn_BulkEditWorkTime': set_BulkEditWorkTime();
+                        break;
+                    //浜х嚎浜ц兘
+                    case 'btn_SourceWorkQty': set_SourceWorkQty();
                         break;
                 };
             });
@@ -614,6 +622,32 @@
                         l.LAY_CHECKED = flag;
                     }
                 });
+            })
+            //#endregion
+
+            //#region 鍙屽嚮琛屽脊鍑哄脊妗嗭紝缁存姢涓嶅悓鐢熶骇璧勬簮鐨勫皬鏃朵骇鑳�
+            table.on('rowDouble(mainTable)', function (obj) {
+                var HMaterNumber = obj.data.鐗╂枡浠g爜;
+                var HMaterName = obj.data.鐗╂枡鍚嶇О;
+                var HMaterModel = obj.data.瑙勬牸鍨嬪彿;
+                var HProcName = obj.data.宸ュ簭;
+                var HBillInterID = obj.data.hmainid;
+                var HBillEntryID = obj.data.hsubid;
+                var HSortProcFlag = obj.data.鎺掍骇宸ュ簭鏍囪;
+
+                if (HSortProcFlag == "true" || HSortProcFlag == "1" || HSortProcFlag == "鏄�" || HSortProcFlag == true) {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '鐢熶骇璧勬簮浜ц兘璁剧疆'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillWorkQty.html?HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel + '&HProcName=' + HProcName + '&HBillInterID=' + HBillInterID + '&HBillEntryID=' + HBillEntryID, 'yes']
+                    })
+                } else {
+                    layer.msg('鎵�閫夊伐搴忥細' + HProcName + '锛屼笉涓烘帓浜у伐搴忥紒');
+                }
             })
             //#endregion
 
@@ -2417,6 +2451,53 @@
 
             //#endregion
 
+            //#region 鎵规敼灏忔椂浜ц兘
+            function set_BulkEditWorkTime() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "鎵规敼灏忔椂浜ц兘"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "80%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['./Gy_BulkEditWorkQty.html', "yes"]
+                })
+            }
+            //#endregion
+
+            //#region 浜х嚎浜ц兘
+            function set_SourceWorkQty() {               
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HMaterNumber = data[0].鐗╂枡浠g爜;
+                    var HMaterName = data[0].鐗╂枡鍚嶇О;
+                    var HMaterModel = data[0].瑙勬牸鍨嬪彿;
+                    var HProcName = data[0].宸ュ簭;
+                    var HBillInterID = data[0].hmainid;
+                    var HBillEntryID = data[0].hsubid;
+                    var HSortProcFlag = data[0].鎺掍骇宸ュ簭鏍囪;
+
+                    if (HSortProcFlag == "true" || HSortProcFlag == "1" || HSortProcFlag == "鏄�" || HSortProcFlag == true) {
+                        layer.open({
+                            type: 2
+                            , area: ['80%', '80%']
+                            , title: '鐢熶骇璧勬簮浜ц兘璁剧疆'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../../璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillWorkQty.html?HMaterNumber=' + HMaterNumber + '&HMaterName=' + HMaterName + '&HMaterModel=' + HMaterModel + '&HProcName=' + HProcName + '&HBillInterID=' + HBillInterID + '&HBillEntryID=' + HBillEntryID, 'yes']
+                        })
+                    } else {
+                        layer.msg('鎵�閫夊伐搴忥細' + HProcName + '锛屼笉涓烘帓浜у伐搴忥紒');
+                    }                   
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }                
+            }
+            //#endregion            
+
             //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
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_RoutingBillWorkQty.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_RoutingBillWorkQty.html"
new file mode 100644
index 0000000..12d705d
--- /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_RoutingBillWorkQty.html"
@@ -0,0 +1,494 @@
+锘�<!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="HMaterNumber" lay-verify="HMaterNumber" id="HMaterNumber" style="width: 100%; display: inline-block; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" class="layui-input" name="HMaterID" lay-verify="HMaterID" id="HMaterID" value="0">
+                                            </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="HMaterName" lay-verify="HMaterName" id="HMaterName" style="width: 100%; display: inline-block; background-color: #efefef4d;" readonly>
+                                            </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="HMaterModel" lay-verify="HMaterModel" id="HMaterModel" style="width: 100%; display: inline-block; background-color: #efefef4d;" readonly>
+                                            </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: 100%; display: inline-block; background-color: #efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊浼樺厛绾�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<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 () {
+        //鍙傛暟
+        var params = getUrlVars();
+        var HMaterNumber = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鐗╂枡浠g爜
+        var HMaterName = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鐗╂枡鍚嶇О
+        var HMaterModel = params[params[2]];  //浠庡崟鎹幏鍙� 瑙勬牸鍨嬪彿
+        var HProcName = params[params[3]];  //浠庡崟鎹幏鍙� 宸ュ簭鍚嶇О
+        var HBillInterID = params[params[4]];  //浠庡崟鎹幏鍙� 鍗曟嵁ID
+        var HBillEntryID = params[params[5]];  //浠庡崟鎹幏鍙� 鍗曟嵁瀛怚D
+
+        //#region 鍏叡鍙橀噺
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element;
+        //鏌ヨ鏉′欢
+        var sWhere = "";
+        var option = [];
+        var rowdata = [{
+            "HInterID": HBillInterID, "HEntryID": HBillEntryID, "HSourceID": 0, "HSourceNumber": "", "HSourceName": ""
+            , "HWorkQty_Source": "", "HEntryStdEmpQty": "", "HEntryStdEmpAvg": "", "HSortNum": "", "HRemark": ""
+        }];
+        //#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);
+        })
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            var checkStatus = table.checkStatus('mainTable')
+                , data = checkStatus.data;
+            //鏂板琛岃〃鏍兼暟鎹�
+            var NewRow = {
+                "HInterID": HBillInterID, "HEntryID": HBillEntryID, "HSourceID": 0, "HSourceNumber": "", "HSourceName": ""
+                , "HWorkQty_Source": "", "HEntryStdEmpQty": "", "HEntryStdEmpAvg": "", "HSortNum": "", "HRemark": ""
+            };
+
+            switch (obj.event) {
+                case 'btn-AddLine':
+                    table.cache["mainTable"].push(NewRow);
+                    option.data = table.cache["mainTable"];
+
+                    table.render(option);
+                    break;
+                case 'btn-CopyLine':
+                    var copydata = JSON.stringify(data);
+                    if (data.length <= 0) {
+                        layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                    }
+                    else if (data.length > 1) {
+                        layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                    }
+                    else {
+                        var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                        var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                        table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    }
+                    break;
+                //鍒锋柊娴佹按鍙�
+                case 'btn_Refresh':
+                    btn_Refresh(data);
+                    break;
+            }
+        });
+
+        //琛屽唴浜嬩欢
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+            set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+        });
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            $("#HMaterNumber").val(getParams("HMaterNumber"));
+            $("#HMaterName").val(getParams("HMaterName"));
+            $("#HMaterModel").val(getParams("HMaterModel"));
+            $("#HProcName").val(getParams("HProcName"));
+
+            set_InitGrid();
+
+            RoadBillMain(HBillInterID, HBillEntryID);
+        }
+
+        //淇濆瓨HMaker
+        function set_AddNew(data) {
+            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
+
+            var num = [];
+            for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                if (table.cache["mainTable"][i] != "") {
+                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                    num.push(table.cache["mainTable"][i])
+                }
+            }
+
+            var sSubStr = JSON.stringify(num);
+            //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+            var sMainSub = sSubStr + ";" + sessionStorage["HUserName"];
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_RoutingBillSub/AddWorkQty',
+                type: "POST",
+                data: { "sMainSub": sMainSub },
+                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 });
+                }
+            });
+        }
+
+        //鍒濆鍖栭〉闈�
+        function set_InitGrid() {
+            option = {
+                elem: '#mainTable'
+                , toolbar: '#toolbarDemo'
+                , limit: 500
+                , height: 500
+                , totalRow: true
+                , loading: false
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                    , { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HInterID', title: 'HInterID', hide: true }
+                    , { field: 'HEntryID', title: 'HEntryID', hide: true }
+                    , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', hide: true }
+                    , { field: 'HSourceNumber', title: '鐢熶骇璧勬簮浠g爜', edit: 'text', event: "HSourceNumber" }
+                    , { field: 'HSourceName', title: '鐢熶骇璧勬簮' }
+                    , { field: 'HWorkQty_Source', title: '浜ц兘', edit: 'text' }
+                    , { field: 'HEntryStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
+                    , { field: 'HEntryStdEmpAvg', title: '浜哄潎浜ц兘', edit: 'text' }//f7
+                    , { field: 'HSortNum', title: '浼樺厛绾�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }//f7
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ]]
+            }
+
+            option.data = rowdata;
+            table.render(option);
+        }
+
+        //#region缂栬緫 椤甸潰璧嬪��
+        function RoadBillMain(HInterID,HEntryID)//鍔犺浇琛ㄥご
+        {
+
+            $.ajax({
+                url: GetWEBURL() + "/Gy_RoutingBill/EditWorkQty",
+                type: "GET",
+                async: false,
+                data: { "HInterID": HInterID, "HEntryID": HEntryID },
+                success: function (result) {
+                    if (result.count == 1) {
+                        var data = result.data;
+
+                        var HDataArr = [];
+                        for (var i = 0; i < data.length; i++) {
+                            HDataArr.push({
+                                "HInterID": data[i].hmainid, "HEntryID": data[i].hsubid, "HSourceID": data[i].HSourceID, "HSourceNumber": data[i].鐢熶骇璧勬簮浠g爜
+                                , "HSourceName": data[i].鐢熶骇璧勬簮鍚嶇О, "HWorkQty_Source": data[i].鐢熶骇璧勬簮浜ц兘, "HEntryStdEmpQty": data[i].鐢熶骇璧勬簮鏍囧噯浜烘暟
+                                , "HEntryStdEmpAvg": data[i].鐢熶骇璧勬簮浜哄潎浜ц兘, "HSortNum": data[i].浼樺厛绾�, "HRemark": data[i].澶囨敞
+                            })
+                        }
+
+                        option.data = HDataArr
+                        table.render(option);
+                    } else {
+                        option.data = rowdata;
+                        table.render(option);
+                    }                   
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            })
+        }
+        //#endregion
+
+        //鑷姩閰嶇疆浼樺厛绾�
+        function btn_Refresh(data) {
+            for (var i = 0; i < option.data.length; i++) {
+                option.data[i]["HSortNum"] = (i + 1) * 10;
+            }
+            table.render(option);
+        }
+
+        //#region F7蹇嵎閿�
+        function set_GridCellCheck(obj) {
+            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
+                if (event.key != "F7") {
+                    var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                    if (obj.event == "HSourceNumber") {                           //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+                        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: ['25%', '30%']                                                                      //澶у皬
+                                    , 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 = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                            currRowIndex = 0;
+                                            var tableView = "h_v_Gy_SourceList";
+                                            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 () {
+                                        obj.event = "";
+                                        childPage = null;
+                                        currRowIndex = 0;
+                                        if (childData != null) {
+                                            obj.update({
+                                                "HSourceID": childData.HItemID
+                                                , "HSourceNumber": childData.鐢熶骇璧勬簮浠g爜
+                                                , "HSourceName": childData.鐢熶骇璧勬簮鍚嶇О
+                                            })
+
+                                            childData = null;
+                                        }
+                                    }
+                                });
+                            } else {
+                                setTimeout(function () {
+                                    var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                    currRowIndex = 0;
+                                    var tableView = "h_v_Gy_SourceList";
+                                    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("HBillNo");
+                                element.focus();
+
+                                childPage.getSelectedData(currRowIndex);
+
+                                if (childData != null) {
+                                    obj.update({
+                                        "HSourceID": childData.HItemID
+                                        , "HSourceNumber": childData.鐢熶骇璧勬簮浠g爜
+                                        , "HSourceName": childData.鐢熶骇璧勬簮鍚嶇О
+                                    })
+
+                                    childData = null;
+                                }
+
+
+                                childPage = null;
+                                currRowIndex = 0;
+                                childData = null;
+                                obj.event = "";
+                            }
+                        }
+                    }
+
+                }
+                //#endregion
+
+                if (event.key == "F7") {
+                    //鐢熶骇璧勬簮
+                    if (obj.event == "HSourceNumber") {
+                        //鎵撳紑浜哄憳琛�  灏忕獥浣�
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "鐢熶骇璧勬簮鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length != 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                obj.update({
+                                    "HSourceID": checkStatus.data[0].HItemID
+                                    , "HSourceNumber": checkStatus.data[0].鐢熶骇璧勬簮浠g爜
+                                    , "HSourceName": checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О
+                                })
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                        })
+                    }
+
+                    obj.event = "";
+                    return false;
+                }
+            })
+        }
+        //#endregion
+
+        //琛屽唴鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                    obj.del();
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.reload(option);
+                    layer.close(index);
+                });
+            }
+        }
+
+        //鑾峰彇鍙傛暟
+        function getUrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+
+        //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+        function getParams(key) {
+            var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+            //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+            var r = encodeURI(window.location.search).substr(1).match(reg);
+            if (r != null) {
+                //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+                return decodeURI(unescape(r[2]));
+            }
+            return null;
+        };
+
+        //#endregion
+
+    });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipmentLoadReport.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipmentLoadReport.html"
index 718e448..18c8008 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipmentLoadReport.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipmentLoadReport.html"
@@ -117,6 +117,8 @@
             var DateClo = [];
             var ZHUData = [];
             var HModName = "Sb_EquipmentLoadReport";
+
+            var HWorkTimeArr = [];
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -160,6 +162,48 @@
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery();
             });
+
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+
+                    var HIsExist = true;
+                    //鍒ゆ柇鎵�閫夌敓浜ц祫婧愭槸鍚﹀湪鏁扮粍涓瓨鍦�
+                    for (var i = 0; i < ZHUData.length; i++) {
+                        if (ZHUData[i].鐢熶骇璧勬簮 == obj.data.HSourceName) {
+                            for (let j = 0; j < HWorkTimeArr.length; j++) {
+                                if (HWorkTimeArr[j].鐢熶骇璧勬簮.indexOf(obj.data.HSourceName) != -1 && i == 0) {
+                                    HIsExist = false;
+                                    break;
+                                }
+                            }
+                            if (HIsExist) {
+                                HWorkTimeArr.push(ZHUData[i])
+                            }                           
+                        }
+                    }
+                    //閲嶆柊鍔犺浇鏌辩姸鍥�
+                    set_Graphics();
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                    //绉婚櫎鏁版嵁鏁版嵁
+                    HWorkTimeArr = HWorkTimeArr.filter(item => item.鐢熶骇璧勬簮 != obj.data.HSourceName)
+                    //閲嶆柊鍔犺浇鏌辩姸鍥�
+                    set_Graphics();
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+
             //#endregion
             
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -268,15 +312,73 @@
                 var HXTitle = [];//X杞存爣棰樺悕绉�
                 var TimeCount = []; //宸ユ椂鏁版嵁
                 var NumCount = 0;
+
+                var HWorkTimeSum = [];
+                var num = [];
+
+                if (HWorkTimeArr.length > 0) {
+                    for (let i = 0; i < HWorkTimeArr.length; i++) {
+                        if (HWorkTimeSum.length == 0) {
+                            //HWorkTimeSum.push(HWorkTimeArr[i])
+                            HWorkTimeSum.push({ "HMasterDate": HWorkTimeArr[i].HMasterDate, "HTimeSum": Number(HWorkTimeArr[i].HTimeSum) })
+                        } else {
+                            for (let j = 1; j <= HWorkTimeSum.length; j++) {
+                                if (HWorkTimeSum[j - 1].HMasterDate.indexOf(HWorkTimeArr[i].HMasterDate) == -1) {
+                                    if (j == HWorkTimeSum.length) {
+                                        //HWorkTimeSum.push(HWorkTimeArr[i])
+                                        HWorkTimeSum.push({ "HMasterDate": HWorkTimeArr[i].HMasterDate, "HTimeSum": Number(HWorkTimeArr[i].HTimeSum) })
+                                        break;
+                                    }
+                                } else {
+                                    HWorkTimeSum[j - 1].HTimeSum = Number(HWorkTimeSum[j - 1].HTimeSum) + Number(HWorkTimeArr[i].HTimeSum);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    for (let i = 0; i < ZHUData.length; i++) {
+                        if (HWorkTimeSum.length == 0) {
+                            //HWorkTimeSum.push(ZHUData[i])
+                            HWorkTimeSum.push({ "HMasterDate": ZHUData[i].HMasterDate, "HTimeSum": Number(ZHUData[i].HTimeSum) })
+                        } else {
+                            for (let j = 1; j <= HWorkTimeSum.length; j++) {
+                                if (HWorkTimeSum[j - 1].HMasterDate.indexOf(ZHUData[i].HMasterDate) == -1) {
+                                    if (j == HWorkTimeSum.length) {
+                                        //HWorkTimeSum.push(ZHUData[i])
+                                        HWorkTimeSum.push({ "HMasterDate": ZHUData[i].HMasterDate, "HTimeSum": Number(ZHUData[i].HTimeSum) })
+                                        break;
+                                    }
+                                } else {
+                                    HWorkTimeSum[j - 1].HTimeSum = Number(HWorkTimeSum[j - 1].HTimeSum) + Number(ZHUData[i].HTimeSum);
+                                    //num.push({ "HMasterDate": ZHUData[i].HMasterDate, "HTimeSum": Number(HWorkTimeSum[j - 1].HTimeSum) + Number(ZHUData[i].HTimeSum) });
+                                    break;
+                                }
+                            }
+                        }
+                    }                  
+                }
+
                 for (let i = 0; i < 14; i++) {
                         
                     HXTitle.push(DateClo[i]["title"]);
-                    if (ZHUData.length > NumCount) {
-                        TimeCount.push(ZHUData[NumCount]['HTimeSum']);
+
+                    if (HWorkTimeSum.length > NumCount) {
+                        TimeCount.push(HWorkTimeSum[NumCount]['HTimeSum']);
                         NumCount += 1;
                     } else {
                         TimeCount.push(0);
                     }
+
+                    //if (ZHUData.length > NumCount && HWorkTimeArr.length == 0) {
+                    //    TimeCount.push(ZHUData[NumCount]['HTimeSum']);
+                    //    NumCount += 1;
+                    //} else if (HWorkTimeArr.length > NumCount && HWorkTimeArr.length > 0) {
+                    //    TimeCount.push(HWorkTimeArr[NumCount]['HTimeSum']);
+                    //    NumCount += 1;
+                    //} else {
+                    //    TimeCount.push(0);
+                    //}
                   
                 }
                 option_ZZT = {
@@ -340,6 +442,8 @@
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
                 var columns = [];
+                //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                columns.push({ type: 'checkbox', fixed: 'left' });
                 columns.push({ type: 'numbers', title: '搴忓彿'});
                 columns.push({ field: 'HSourceName', title: '鐢熶骇璧勬簮', width: 120 });
                 var myDate = new Date();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_BadReasonReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_BadReasonReport.html"
index 52ad820..c7705d5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_BadReasonReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_BadReasonReport.html"
@@ -42,6 +42,13 @@
                                         </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;">
+                                        <input type="text" class="layui-input" name="HGroupName" lay-verify="HGroupName" id="HGroupName" style="width: 60%;display: inline-block;">
+                                        <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0">
+                                    </div>
+                                </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
@@ -162,6 +169,11 @@
     </div>
 
     <script>
+        //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+        var childPage = null;                       //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+        var currRowIndex = 0;                       //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+        var childData = null;                       //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+        //#endregion
 
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -589,12 +601,13 @@
             //鍔犺浇缃戞牸
             function get_Display(sWhere) {
                 sWhere = $("#HYear").val();
+                var HGroupID = $("#HGroupID").val();
                 var wait = layer.load();//閬僵
                 $.ajax({
                     url: GetWEBURL() + '/Sc_BadReasonReport/list',
                     type: "GET",
                     async: false,
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HGroupID": HGroupID },
                     success: function (data1) {
                         var col = [];
                         if (data1.count == 1) {
@@ -757,6 +770,8 @@
                 $("#ColContent2").val("");
                 $("#ColName2").val("0");
                 $("#Comparator2").val("0");
+                $("#HGroupID").val("0");
+                $("#HGroupName").val("");
                 form.render('select');
 
                 sWhere = " ";
@@ -885,6 +900,104 @@
                 })
             }
 
+            //#region 鏂囨湰妗嗙洃鍚�
+            $(document).ready(function () {
+                //#region 鏍规嵁鐝粍浠g爜鑾峰彇鐝粍鍩虹璧勬枡绛涢�夊脊绐�
+                //鏍规嵁鍏冪礌ID瀵瑰厓绱犺繘琛岀洃鍚�=============================================================================
+                $("#HGroupName").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 = $("#HGroupName").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                        currRowIndex = 0;
+                                        var tableView = "h_v_Gy_GroupList";
+                                        var childSWhere = "select top(10) HItemID,鐝粍浠g爜,鐝粍鍚嶇О from " + tableView + " where 1=1 and (鐝粍鍚嶇О like '%" + value + "%') order by 鐝粍浠g爜 desc";
+                                        childPage.getData(childSWhere, tableView);
+                                        //===================================================================================================================================
+                                    }, 200);
+                                }
+                                , end: function () {
+                                    childPage = null;
+                                    currRowIndex = 0;
+                                    if (childData != null) {
+                                        //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                                        //鑾峰彇鏁版嵁
+                                        $("#HGroupID").val(childData.HItemID);//鐝粍id
+                                        $("#HGroupName").val(childData.鐝粍鍚嶇О);//鐝粍鍚嶇О
+                                        //===============================================================================================================================
+
+                                        childData = null;
+                                    }
+                                }
+                            });
+                        } else {
+                            setTimeout(function () {
+                                //淇敼锛屾牴鎹枃鏈鏁版嵁锛岀紪鍐欐煡璇㈣鍙�================================================================================================
+                                var value = $("#HGroupName").val().replace(/'/g, "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                currRowIndex = 0;
+                                var tableView = "h_v_Gy_GroupList";
+                                var childSWhere = "select top(10) HItemID,鐝粍浠g爜,鐝粍鍚嶇О from " + tableView + " where 1=1 and (鐝粍鍚嶇О 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("HGroupName");
+                            element.blur();
+
+                            childPage.getSelectedData(currRowIndex);
+
+                            if (childData != null) {
+                                //鏍规嵁寮圭獥杩斿洖鏁版嵁璁剧疆鏂囨湰妗嗘暟鎹�=================================================================================================
+                                //鑾峰彇鏁版嵁
+                                $("#HGroupID").val(childData.HItemID);//鐝粍id
+                                $("#HGroupName").val(childData.鐝粍鍚嶇О);//鐝粍鍚嶇О
+                                //===============================================================================================================================
+
+                                childData = null;
+                            }
+
+
+                            childPage = null;
+                            currRowIndex = 0;
+                            childData = null;
+                        }
+                    }
+                });
+                //#endregion               
+            });
+        //#endregion
+
             //#endregion
         });
     </script>

--
Gitblit v1.9.1