From ed3b1ca9bd7571e336d5d83d48a69e03e87ccf00 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 13 四月 2023 15:41:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html         |   15 
 WebTM/views/index_Mobile.html                                  |    4 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html              |  348 +-
 WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html                 |   12 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html                  |   61 
 WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillEdit.html      |  291 +
 WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html            |  109 
 WebTM/views/index_QiaoYi.html                                  |  408 +-
 WebTM/views/userfiles/images/wy.jpg                            |    0 
 WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html        |  280 +
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html               |    8 
 WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html             |   34 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList.aspx |    2 
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html               |    5 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html            |  164 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill_QiaoYi.html          | 1392 +++++++++++
 WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html               |    5 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillListQuery.html             |    9 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html                  |    6 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html             |   23 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html             |  433 ++-
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html                      |   61 
 WebTM/views/系统管理/会计期间/Xt_AccountPeriodList.html                |    4 
 WebTM/views/系统管理/公告/GG_NoticeBillList.html                     |    4 
 WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html                  |   99 
 WebTM/views/系统管理/日志管理/Xt_SystemLogList.html                    |    4 
 WebTM/WebTM.csproj                                             |    5 
 WebTM/views/home/console_QiaoYi.html                           |  173 
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html       |   49 
 WebTM/views/user/login.html                                    |   16 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html                |   31 
 WebTM/views/系统管理/模块管理/Xt_XtgnbList.html                        |    8 
 WebTM/views/Baseset/基础资料/Gy_ProcList.html                      |    6 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html    |  143 
 WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html        |   53 
 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html                 |    8 
 WebTM/views/系统管理/单据类型/Xt_BillTypeList.html                     |    2 
 WebTM/views/index.html                                         |    2 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html            |   52 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_QiaoYi.html         | 2134 ++++++++++++++++
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html                |   28 
 WebTM/views/车间管理/工序流转卡/Sc_ProcExchWorkBackBillList.html        |    3 
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html            |   30 
 WebTM/views/index_Mobile_QiaoYi.html                           |   44 
 /dev/null                                                      |    0 
 WebTM/views/userfiles/images/pda.jpg                           |    0 
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html           |  496 +-
 WebTM/views/系统管理/系统参数管理/Xt_SystemParameterList.html            |    6 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                      |  384 +-
 WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html                 |   29 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html            |   55 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                    |   18 
 WebTM/views/车间管理/工序流转卡/Sc_ProcExchRecordBackBillList.html      |    2 
 53 files changed, 5,863 insertions(+), 1,695 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e5a5674..52f3780 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -184,8 +184,9 @@
     <Content Include="views\PublicPage\transfer.html" />
     <Content Include="views\ReportHtml.html" />
     <Content Include="views\test\testRenderAutomationList.html" />
-    <Content Include="views\userfiles\images\IMG_5566.jpg" />
+    <Content Include="views\userfiles\images\pda.jpg" />
     <Content Include="views\userfiles\images\loginBackground-New.jpg" />
+    <Content Include="views\userfiles\images\wy.jpg" />
     <Content Include="views\user\login_anrui.html" />
     <Content Include="views\user\login2.html" />
     <Content Include="views\video\1.wav" />
@@ -202,6 +203,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
     <Content Include="views\璁″垝绠$悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationInBill_PDA_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA_Detail.html" />
@@ -1196,6 +1198,7 @@
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcExchWorkBackBillList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBill_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationQty.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞MES_StationInBill_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
index 5e9a0eb..ca36b26 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
@@ -85,6 +85,12 @@
                 , { field: 'HItemID', title: '宸ュ簭ID', hide: true }
                 , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
                 , { field: '宸ュ簭', title: '宸ュ簭鍚嶇О', sort: true }
+                , { field: '宸ヤ綔涓績ID', title: '宸ヤ綔涓績ID', hide: true }
+                , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', hide: true }
+                , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', sort: true, hide: true }
+                , { field: '閮ㄩ棬ID', title: '閮ㄩ棬ID', hide: true, hide: true }
+                , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', hide: true }
+                , { field: '閮ㄩ棬', title: '閮ㄩ棬', sort: true, hide: true }
               ]]
               , page: true
             });
diff --git a/WebTM/views/home/console_QiaoYi.html b/WebTM/views/home/console_QiaoYi.html
index 9f690f8..7009c49 100644
--- a/WebTM/views/home/console_QiaoYi.html
+++ b/WebTM/views/home/console_QiaoYi.html
@@ -20,7 +20,7 @@
                     <div class="layui-col-md6">
                         <!-- 蹇嵎鏂瑰紡 -->
                         <div class="layui-card">
-                            <div class="layui-card-header">蹇嵎鏂瑰紡</div>
+                            <div class="layui-card-header"><!--蹇嵎鏂瑰紡--></div>
                             <div class="layui-card-body">
                                 <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
                                     <div carousel-item="">
@@ -75,68 +75,79 @@
                                             </li>
                                         </ul>
                                     </div>
-                                    <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+                                    <div class="layui-carousel-ind"></div>
+                                    <button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button>
+                                    <button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
                                 </div>
                             </div>
                         </div>
                     </div>
                     <div class="layui-col-md6">
                         <!-- 蹇嵎鏂瑰紡 -->
-                    </div>
-                    <div class="layui-col-md12">
-                        <!-- 鏁版嵁姒傝 -->
-                        <!--<div class="layui-card">
-                            <div class="layui-card-header">鏁版嵁姒傝</div>
+                        <div class="layui-card">
+                            <div class="layui-card-header"><!--蹇嵎鏂瑰紡--></div>
                             <div class="layui-card-body">
-                                <div class="layui-carousel layadmin-carousel layadmin-dataview" data-anim="fade" lay-filter="LAY-index-dataview" lay-anim="fade" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
-                                    <div carousel-item="" id="LAY-index-dataview">
-                                        <div class="" _echarts_instance_="1621151534573" style="-webkit-tap-highlight-color: transparent; user-select: none; background-color: rgba(0, 0, 0, 0);">
-                                            <div style="position: relative; overflow: hidden; width: 698px; height: 332px;">
-                                                <div data-zr-dom-id="bg" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none;"></div>
-                                                <canvas width="698" height="332" data-zr-dom-id="0" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                                <canvas width="698" height="332" data-zr-dom-id="1" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                                <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                            </div>
-                                        </div>-->
-                                        <!--<div class="layui-this" _echarts_instance_="1621151534574" style="-webkit-tap-highlight-color: transparent; user-select: none; cursor: default; background-color: rgba(0, 0, 0, 0);">
-                                            <div style="position: relative; overflow: hidden; width: 698px; height: 332px;">
-                                                <div data-zr-dom-id="bg" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none;"></div>
-                                                <canvas width="698" height="332" data-zr-dom-id="0" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                                <canvas width="698" height="332" data-zr-dom-id="1" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                                <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                            </div>
-                                        </div>
-                                        <div class="" _echarts_instance_="1621151534575" style="-webkit-tap-highlight-color: transparent; user-select: none; background-color: rgba(0, 0, 0, 0);">
-                                            <div style="position: relative; overflow: hidden; width: 698px; height: 332px;">
-                                                <div data-zr-dom-id="bg" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none;"></div>
-                                                <canvas width="698" height="332" data-zr-dom-id="0" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                                <canvas width="698" height="332" data-zr-dom-id="1" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                                <canvas width="698" height="332" data-zr-dom-id="_zrender_hover_" class="zr-element" style="position: absolute; left: 0px; top: 0px; width: 698px; height: 332px; user-select: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"></canvas>
-                                            </div>
-                                        </div>-->
-                                    <!--</div>
-                                    <div class="layui-carousel-ind"><ul><li class=""></li>--><!--<li class="layui-this"></li><li class=""></li>--><!--</ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
+                                <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
+                                    <div carousel-item="">
+                                        <ul class="layui-row layui-col-space10 layui-this">
+                                            <li class="layui-col-xs3">
+                                                <a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
+                                                    <i class="layui-icon layui-icon-add-circle"></i>
+                                                    <cite>鐗╂枡鍒楄〃</cite>
+                                                </a>
+                                            </li>
+                                            <li class="layui-col-xs3">
+                                                <a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">
+                                                    <i class="layui-icon layui-icon-mike"></i>
+                                                    <cite>鐢熶骇璁㈠崟</cite>
+                                                </a>
+                                            </li>
+                                            <li class="layui-col-xs3">
+                                                <a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
+                                                    <i class="layui-icon layui-icon-android"></i>
+                                                    <cite>鐢熶骇璁㈠崟缁存姢</cite>
+                                                </a>
+                                            </li>
+                                            <li class="layui-col-xs3">
+                                                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
+                                                    <i class="layui-icon layui-icon-chart"></i>
+                                                    <cite>宸ュ簭娴佽浆鍗�</cite>
+                                                </a>
+                                            </li>
+                                            <li class="layui-col-xs3">
+                                                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
+                                                    <i class="layui-icon layui-icon-app"></i>
+                                                    <cite>宸ュ簭娴佽浆鍗$淮鎶�</cite>
+                                                </a>
+                                            </li>
+                                            <li class="layui-col-xs3">
+                                                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">
+                                                    <i class="layui-icon layui-icon-theme"></i>
+                                                    <cite>宸ュ簭杩斿伐璁板綍鍗�</cite>
+                                                </a>
+                                            </li>
+                                            <li class="layui-col-xs3">
+                                                <a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">
+                                                    <i class="layui-icon layui-icon-addition"></i>
+                                                    <cite>宸ュ簭杩斿伐鐢宠鍗�</cite>
+                                                </a>
+                                            </li>
+                                            <li class="layui-col-xs3">
+                                                <a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
+                                                    <i class="layui-icon layui-icon-addition"></i>
+                                                    <cite>宸ヨ壓璺嚎鍒楄〃</cite>
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <div class="layui-carousel-ind"></div>
+                                    <button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button>
+                                    <button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
                                 </div>
                             </div>
-                        </div>-->
-                        <!--鏂伴椈鐗堝潡-->
-                        <!--<div class="layui-card">
-                          <div class="layui-tab layui-tab-brief layadmin-latestData">
-                            <ul class="layui-tab-title">
-                              <li class="layui-this">浠婃棩鐑悳</li>
-                              <li>浠婃棩鐑笘</li>
-                            </ul>
-                            <div class="layui-tab-content">
-                              <div class="layui-tab-item layui-show">
-                                <table id="LAY-index-topSearch"></table>
-                              </div>
-                              <div class="layui-tab-item">
-                                <table id="LAY-index-topCard"></table>
-                              </div>
-                            </div>
-                          </div>
-                        </div>-->
+                        </div>
                     </div>
+                  
                 </div>
             </div>
             <div class="layui-col-md4">
@@ -189,62 +200,6 @@
                         </div>
                     </div>
                 </div>
-                <!--<div class="layui-card">
-                    <div class="layui-card-header">鏁堢巼鎶ュ憡</div>
-                    <div class="layui-card-body layadmin-takerates">
-                        <div class="layui-progress" lay-showPercent="yes">
-                            <h3>瀹屽伐鐜囷紙鏃ュ悓姣� 0% <span class="layui-edge layui-edge-top" lay-tips="澧為暱" lay-offset="-15"></span>锛�</h3>
-                            <div class="layui-progress-bar" lay-percent="0%"></div>
-                        </div>
-                        <div class="layui-progress" lay-showPercent="yes">
-                            <h3>涓嶈壇鐜囷紙鏃ュ悓姣� 0% <span class="layui-edge layui-edge-bottom" lay-tips="涓嬮檷" lay-offset="-15"></span>锛�</h3>
-                            <div class="layui-progress-bar" lay-percent="0%"></div>
-                        </div>
-                    </div>
-                </div>-->
-                <!--<div class="layui-card">
-                    <div class="layui-card-header">瀹炴椂鐩戞帶</div>
-                    <div class="layui-card-body layadmin-takerates">
-                        <div class="layui-progress" lay-showPercent="yes">
-                            <h3>璁惧绋煎姩鐜�</h3>
-                            <div class="layui-progress-bar" lay-percent="0%"></div>
-                        </div>
-                        <div class="layui-progress" lay-showPercent="yes">
-                            <h3>璁惧鏁呴殰鐜�</h3>
-                            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
-                        </div>
-                    </div>
-                </div>-->
-                <!--浜у搧鍔ㄦ��-->
-                <!--<div class="layui-card">
-                  <div class="layui-card-header">浜у搧鍔ㄦ��</div>
-                  <div class="layui-card-body">
-                    <div class="layui-carousel layadmin-carousel layadmin-news" data-autoplay="true" data-anim="fade" lay-filter="news">
-                      <div carousel-item>
-                        <div><a href="http://www.baidu.com" target="_blank" class="layui-bg-red">蹇�熶笂鎵嬫枃妗�</a></div>
-                        <div><a href="http://www.baidu.com" target="_blank" class="layui-bg-green">浼氬憳璁ㄨ涓撳尯</a></div>
-                        <div><a href="http://www.baidu.com" target="_blank" class="layui-bg-blue">鑾峰緱瀹樻柟鍚庡彴妯℃澘绯荤粺</a></div>
-                      </div>
-                    </div>
-                  </div>
-                </div>-->
-                <!--浣滆�呭績璇�-->
-                <!--<div class="layui-card">
-                  <div class="layui-card-header"
-                    浣滆�呭績璇�
-                    <i class="layui-icon layui-icon-tips" lay-tips="瑕佹敮鎸佺殑鍣�" lay-offset="5"></i>
-                  </div>
-                  <div class="layui-card-body layui-text layadmin-text">
-                      <span>
-                          &nbsp;&nbsp;&nbsp;&nbsp;涔︿腑鎻忓啓浜嗕竴涓偅鏍风殑绀句細锛屽拰鍦ㄩ偅涓ぞ浼氱敓娲讳腑鐨勭绉嶄汉鐗╃殑鐘舵�侊紝楹绘湪鐨勫閭d釜寮楁瘮鏂紝鏈�搴曞眰鐨勫鑰侀紶娲為噷鐨勯偅
-                          鍑犱釜闅愪慨濂筹紝鐤媯鐨勫壇涓绘暀锛岃繕鏈夊敖鍏ㄥ姏鍙嶆姉鐨勬渶涓戦檵鐨勫崱榻愯帿澶氾紝鍓富鏁欏拰鍗¢綈鑾褰㈡垚浜嗕汉鎬т笂鐨勯矞鏄庡姣旓紝鍚屾牱鐖变笂浜�
-                          缇庝附鐨勫濞橈紝鍚屾牱鐨勯伃鍒颁簡鎷掔粷锛屼粬浠殑鐖遍兘鏄偅涔堢殑鐑儓锛岄偅涔堢殑璇氭寶锛屽彲鏄紝涓�涓槸鍗犳湁锛屼竴涓槸濂夌尞锛屽凡鍗犳湁涓虹洰鐨勭殑锛�
-                          褰撶洰鐨勬棤娉曡揪鍒扮殑鏃跺�欙紝浠栨兂鍒扮殑鏄瘉鐏紝姣佺伃鍒汉;浠ュ鐚负鐩殑鐨勶紝褰撴棤娉曞鐚殑鏃跺�欙紝鎯冲埌鐨勪篃鏄瘉鐏紝姣佺伃鑷繁
-                      </span>
-                    <p>--<a href="http://www.baidu.com" target="_blank">鐧惧害</a>锛�</p>
-                    <p>鈥斺�� 浣氬悕锛�<a href="http://www.baidu.com/" target="_blank">baidu.com</a>锛�</p>
-                  </div>
-                </div>-->
             </div>
         </div>
     </div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 64a7286..d0626fe 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -1168,7 +1168,7 @@
                 //鍊掕鏃跺叧闂�
                 timer = setTimeout(function () {
                     $("#LAY_app_flexible").click();
-                }, 3000);
+                }, 10);
             }
         }
 
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 482f213..5697055 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -107,7 +107,7 @@
                               宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
                           </a>
                       </dd>-->
-                      <dd>
+                      <!--<dd>
                           <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               宸ュ簭濮斿鍙戝嚭鍗�
@@ -142,7 +142,7 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               浜х嚎鍏抽敭浠剁粦瀹�
                           </a>
-                      </dd>
+                      </dd>-->
                       <!--<dd>
                           <a lay-href="" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
diff --git a/WebTM/views/index_Mobile_QiaoYi.html b/WebTM/views/index_Mobile_QiaoYi.html
index de5a972..d8a7b35 100644
--- a/WebTM/views/index_Mobile_QiaoYi.html
+++ b/WebTM/views/index_Mobile_QiaoYi.html
@@ -107,7 +107,7 @@
                               宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�
                           </a>
                       </dd>-->
-                      <dd>
+                      <!--<dd>
                           <a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               宸ュ簭濮斿鍙戝嚭鍗�
@@ -142,7 +142,7 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               浜х嚎鍏抽敭浠剁粦瀹�
                           </a>
-                      </dd>
+                      </dd>-->
                       <!--<dd>
                           <a lay-href="" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -305,7 +305,7 @@
                       <cite>浠撳偍鏉$爜绠$悊</cite>
                   </a>
                   <dl class="layui-nav-child">
-                      <dd>
+                      <!--<dd>
                           <a href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閲囪喘鍏ュ簱
@@ -322,7 +322,7 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鐢熶骇鍏ュ簱
                           </a>
-                      </dd>
+                      </dd>-->
                       <dd>
                           <a href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -335,7 +335,7 @@
                               鍏朵粬鍏ュ簱锛堢孩瀛楋級
                           </a>
                       </dd>-->
-                      <dd>
+                      <!--<dd>
                           <a href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鐢熶骇棰嗘枡
@@ -362,18 +362,18 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閿�鍞嚭搴撴牎楠�
                           </a>
-                      </dd>
+                      </dd>-->
                       <dd>
                           <a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鍏朵粬鍑哄簱
                           </a>
-                          <a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html" target="main_self_frame" style="color: aqua;">
+                          <!--<a href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鍏朵粬鍑哄簱鏍¢獙
-                          </a>
+                          </a>-->
                       </dd>
-                      <dd>
+                      <!--<dd>
                           <a href="棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鐢熶骇琛ユ枡鏍¢獙
@@ -384,7 +384,7 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               濮斿琛ユ枡鏍¢獙
                           </a>
-                      </dd>
+                      </dd>-->
                       <dd>
                           <a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -397,7 +397,7 @@
                               鍒嗘寮忚皟鍏
                           </a>
                       </dd>-->
-                      <dd>
+                      <!--<dd>
                           <a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鍒嗘寮忚皟鍑�
@@ -420,8 +420,8 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鐢熶骇閫�鏂�
                           </a>
-                      </dd>
-                      <dd>
+                      </dd>-->
+                      <!--<dd>
                           <a href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閿�鍞��璐�
@@ -450,23 +450,23 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鐢熶骇姹囨姤鍗�
                           </a>
-                      </dd>
+                      </dd>-->
                       <!--<dd>
                           <a href="" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               鏉$爜鏌ヨn
                           </a>
                       </dd>-->
-                      <dd>
+                      <!--<dd>
                           <a href="浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               搴撳瓨鏌ヨ
                           </a>
-                      </dd>
+                      </dd>-->
                   </dl>
               </li>
               <!-- 璁惧绠$悊 -->
-              <li data-name="set" class="layui-nav-item">
+              <!--<li data-name="set" class="layui-nav-item">
                   <a style="padding-left:20px;">
                       <img src="../layuiadmin/myicon/杞﹂棿绠$悊.svg" alt="杞﹂棿绠$悊" style="width:25px;height:25px;margin-right: 5px;" />
                       <cite>璁惧绠$悊</cite>
@@ -497,7 +497,7 @@
                           </a>
                       </dd>
                   </dl>
-              </li>
+              </li>-->
               <!-- 缂撳瓨鍒楄〃 -->
               <li data-name="set" class="layui-nav-item">
                   <a style="padding-left:20px;">
@@ -505,7 +505,7 @@
                       <cite>缂撳瓨鍒楄〃</cite>
                   </a>
                   <dl class="layui-nav-child">
-                      <dd>
+                      <!--<dd>
                           <a lay-href="楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閲囪喘鍏ュ簱缂撳瓨鍒楄〃
@@ -534,7 +534,7 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               閿�鍞嚭搴撴牎楠岀紦瀛樺垪琛�
                           </a>
-                      </dd>
+                      </dd>-->
                       <dd>
                           <a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
@@ -547,7 +547,7 @@
                               鍏朵粬鍑哄簱缂撳瓨鍒楄〃
                           </a>
                       </dd>
-                      <dd>
+                      <!--<dd>
                           <a lay-href="楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               濮斿鍏ュ簱缂撳瓨鍒楄〃
@@ -576,7 +576,7 @@
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
                               濮斿琛ユ枡鏍¢獙缂撳瓨鍒楄〃
                           </a>
-                      </dd>
+                      </dd>-->
                       <dd>
                           <a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index ecc4774..3080969 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -245,10 +245,10 @@
                                         <dd><a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">鍏朵粬鍏ュ簱鍗曠紦瀛樺垪琛�</a></dd>
                                         <dd><a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html">鍏朵粬鍑哄簱鍗曠紦瀛樺垪琛�</a></dd>
                                         <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">璋冩嫧鍗曠紦瀛樺垪琛�</a></dd>
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">閿�鍞嚭搴撶紦瀛樺垪琛�</a></dd>
+                                        <!-- <dd><a lay-href="棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">閿�鍞嚭搴撶紦瀛樺垪琛�</a></dd> -->
                                     </dl>
                                 </dd>
-                                <dd>
+                                <!-- <dd>
                                     <a>浠撳簱鎶ヨ〃</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="浠撳瓨绠$悊/鎵爜寮傚父璁板綍琛�/KF_PonderationBillList.html">鎵爜寮傚父璁板綍鏌ヨ</a></dd>
@@ -257,7 +257,7 @@
                                         <dd><a lay-href="浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_PonderationBillMain_Temp.html">鏉$爜鍑哄叆搴撶紦瀛樺垪琛�</a></dd>
                                         <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鍑哄叆搴撹褰曡〃/KF_PonderationBillList_Query.html">鎵爜璁板綍缂撳瓨鎶ヨ〃</a></dd>
                                     </dl>
-                                </dd>
+                                </dd> -->
                             </dl>
                         </li>
                         <!-- 璁″垝绠$悊 -->
@@ -288,22 +288,22 @@
                                         <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍缁存姢</a></dd>
                                     </dl>
                                 </dd>
-                                <dd>
+                                <!-- <dd>
                                     <a>鐢熶骇鐗╂枡娓呭崟</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鐗╂枡娓呭崟/sc_Gy_ICBomBillMainList.html">鐗╂枡娓呭崟缁存姢</a></dd>
                                     </dl>
-                                </dd>
+                                </dd> -->
                                 <dd>
                                     <a>宸ヨ壓璺嚎</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
                                         <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillListQuery.html">宸ヨ壓璺嚎鏌ヨ</a></dd>
                                         <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
-                                        <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillimport.html">宸ヨ壓璺嚎鏁版嵁瀵煎叆</a></dd>
+                                        <!-- <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillimport.html">宸ヨ壓璺嚎鏁版嵁瀵煎叆</a></dd> -->
                                     </dl>
                                 <dd>
-                                <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>
+                                    <!-- <dd><a lay-href="璁″垝绠$悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd> -->
                             </dl>
                         </li>
                         <!-- 鐢熶骇绠$悊 -->
@@ -318,14 +318,14 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">鐢熶骇璁㈠崟</a></dd>
                                     </dl>
                                 </dd>
-                                <dd>
-                                    <a>鐢熶骇鐢ㄦ枡娓呭崟</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">鐢熶骇鐢ㄦ枡娓呭崟缁存姢</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
+                                <!-- <dd>
+                                     <a>鐢熶骇鐢ㄦ枡娓呭崟</a>
+                                     <dl class="layui-nav-child">
+                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">鐢熶骇鐢ㄦ枡娓呭崟缁存姢</a></dd>
+                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPickingBillList.html">鐢熶骇棰嗘枡鎷嗙爜鍒楄〃</a></dd>
+                                     </dl>
+                                 </dd> -->
+                                <!-- <dd>
                                     <a>姹囨姤绠$悊(宸ュ簭)</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
@@ -338,8 +338,8 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBillList.html">璐ㄩ噺姹囨姤鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
                                     </dl>
-                                </dd>
-                                <dd>
+                                </dd> -->
+                                <!-- <dd>
                                     <a>寮�缁撶彮绠$悊(宸ュ簭)</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html">寮�鐝崟</a></dd>
@@ -348,8 +348,8 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_MESEndStepWorkBillList.html">缁撶彮鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/杩斿伐/Sc_MESReturnStepWorkBillList.html">杩斿伐鍗曠淮鎶�</a></dd>
                                     </dl>
-                                </dd>
-                                <dd>
+                                </dd> -->
+                                <!-- <dd>
                                     <a>鎶ュ伐绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a href="IpadStepIndex.html" target="main_self_frame">鎶ュ伐骞冲彴(宸ュ簭)</a></dd>
@@ -384,41 +384,41 @@
                                             <a>鐢熶骇璁″垝骞冲彴</a>
                                             <dl class="layui-nav-child">
                                                 <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
-                                                <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
-                                                <dd><a lay-href="鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
-                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
-                                            </dl>
-                                        </dd>
-                                        <dd>
-                                            <a>鏃ヨ鍒掑伐鍗�</a>
-                                            <dl class="layui-nav-child">
-                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
-                                                <!--<dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
-                                            </dl>
-                                        </dd>
-                                        <dd>
-                                            <a>瑕佹枡璁″垝</a>
-                                            <dl class="layui-nav-child">
-                                                <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
-                                                <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
-                                            </dl>
-                                        </dd>
-                                        <dd>
-                                            <a>鎻愭枡璁″垝</a>
-                                            <dl class="layui-nav-child">
-                                                <dd><a lay-href="鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
-                                                <dd><a lay-href="鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
-                                            </dl>
-                                        </dd>
-                                        <dd>
-                                            <a>鍩虹璧勬枡</a>
-                                            <dl class="layui-nav-child">
-                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
-                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
-                                                <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
-                                            </dl>
-                                        </dd>
-                                        <dd>
+                                                <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>-->
+                                <!-- <dd><a lay-href="鐢熶骇绠$悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鏃ヨ鍒掑伐鍗�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
+                                <!-- </dl>
+                                </dd> -->
+                                <!-- <dd>
+                                    <a>瑕佹枡璁″垝</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鎻愭枡璁″垝</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
+                                    <a>鍩虹璧勬枡</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+                                    </dl>
+                                </dd> -->
+                                <!-- <dd>
                                             <a>鍗虫椂搴撳瓨</a>
                                             <dl class="layui-nav-child">
                                                 <dd><a lay-href="鐢熶骇绠$悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
@@ -434,9 +434,9 @@
                                             </dl>
                                         </dd>
                                     </dl>
-                                </dd>
-                            </dl>
-                        </li>-->
+                                </dd> -->
+
+                        </li>
                         <!-- 杞﹂棿绠$悊 -->
                         <li data-name="set" class="layui-nav-item">
                             <a><i class="layui-icon layui-icon-set"></i><cite>杞﹂棿绠$悊</cite></a>
@@ -447,84 +447,84 @@
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/WindowPrint.html">娴嬭瘯鎵撳嵃</a></dd>-->
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">宸ュ簭娴佽浆鍗�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">宸ュ簭娴佽浆鍗$淮鎶�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd>
+                                        <!-- <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeIssueBillList.html">宸ュ簭娴佽浆鍗★紙涓嬭揪锛�</a></dd> -->
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillList.html">宸ュ簭杩斿伐鐢宠鍒楄〃</a></dd>
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠</a></dd>-->
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍒楄〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html">宸ュ簭娲惧伐</a></dd>
+                                        <!--  <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍒楄〃</a></dd>
+                                          <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessSendWorkEdit.html">宸ュ簭娲惧伐</a></dd> -->
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchWorkBackBillEdit.html">宸ュ簭杩斿伐鐢宠鍗曠紪杈�</a></dd>-->
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillList.html">宸ュ簭杩斿伐璁板綍鍗�</a></dd>
                                         <!--<dd><a lay-href="杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcExchRecordBackBillEdit.html">宸ュ簭杩斿伐璁板綍鍗曠紪杈�</a></dd>-->
-                                        <dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
-                                        <dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�</a></dd>
+                                        <!-- <dd><a lay-href="">宸ュ簭濮斿宸ュ崟n</a></dd>
+                                        <dd><a lay-href="">宸ュ簭濮斿宸ュ崟缁存姢n</a></dd> -->
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill_QiaoYi.html">宸ュ簭杩涚珯鎺ユ敹鍗�</a></dd>
+                                        <!-- <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">宸ュ簭杩涚珯鎺ユ敹鍗曟壒閲�</a></dd> -->
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">宸ュ簭杩涚珯鎺ユ敹鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_RYQ.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲忥紙鐟炰笌绁猴級</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_QiaoYi.html">宸ュ簭鍑虹珯姹囨姤鍗�</a></dd>
+                                        <!-- <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲�</a></dd> -->
+                                        <!-- <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul_RYQ.html">宸ュ簭鍑虹珯姹囨姤鍗曟壒閲忥紙鐟炰笌绁猴級</a></dd> -->
                                         <dd><a lay-href="杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">宸ュ簭鍑虹珯姹囨姤鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">宸ュ簭濮斿鍙戝嚭鍗�</a></dd>
+                                        <!-- <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">宸ュ簭濮斿鍙戝嚭鍗�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_Mul.html">宸ュ簭濮斿鍙戝嚭鍗曟壒閲�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">宸ュ簭濮斿鍙戝嚭鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill.html">宸ュ簭濮斿鎺ユ敹鍗�</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_Mul.html">宸ュ簭濮斿鎺ユ敹鍗曟壒閲�</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">宸ュ簭濮斿鎺ユ敹鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">宸ュ簭濮斿鎺ユ敹鍗曠淮鎶�</a></dd> -->
                                     </dl>
-                                </dd>
-                                <dd>
-                                    <a>绂绘暎鍒堕��</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanEdit.html">宸ュ簭璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">宸ュ簭璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">宸ュ簭娲惧伐鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_AddEntrustProcSendWork.html">濮斿宸ュ簭娲惧伐鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_EntrustProcSendWorkBillList.html">濮斿宸ュ簭娲惧伐鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html">棣栭亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList_Last.html">鏈亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_Add_EntrustProcessSendOutBill.html">濮斿宸ュ簭璁″垝杞嚭鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBillList.html">濮斿宸ュ簭璁″垝杞嚭鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_Add_EntrustProcessReport.html">濮斿宸ュ簭璁″垝姹囨姤鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_EntrustProcessReportBillList.html">濮斿宸ュ簭璁″垝姹囨姤鍗曠淮鎶�</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>澧欏挃瑁呯</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/QK_PackingBill.html">澧欏挃瑁呯鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/QK_PackedBillList.html">宸茶绠卞崟鎹垪琛�</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>鎶ヨ〃鍒嗘瀽</a>
-                                    <dl class="layui-nav-child append" id="append">
-                                        <dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>
-                                        <dd><a lay-href="">娴佽浆鍗″叏绋嬭窡韪猲</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">鏍囧噯宸ユ椂鎶ヨ〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/ProductionPlanReportList.html">鎶曚骇璁″垝鎶ヨ〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�(绾靛悜)</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/DefectiveDetailedYieldReport.html">涓嶈壇鏄庣粏鑹巼鎶ヨ〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationOutSumReport.html">杞﹂棿鐢熶骇姹囨姤缁熻琛�</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>鍙枡绠$悊</a>
-                                    <dl class="layui-nav-child append" id="append">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain.html">鐢熶骇鍙枡骞冲彴(鎸夎鍗曞彨鏂�)</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain_ZXBZ.html">鐢熶骇鍙枡骞冲彴(鏈�灏忓寘瑁呭彨鏂�)</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/Jl_CallGoodsBillMain.html">鍙枡鍗曞垪琛�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鎷f枡閰嶉�佸崟/JIT_ComplementGoodsList.html">鎷f枡閰嶉�佸崟鍒楄〃</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">閫�鏂欑敵璇峰崟鍒楄〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鍙枡閫�鏂欏崟/Jl_CallGoodsBillBackMain.html">鍙枡閫�鏂欏崟鍒楄〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/杞﹂棿鏀舵枡/JIT_SendGoodsBillList.html">杞﹂棿鏀舵枡鍒楄〃</a></dd>
-                                        <!--<dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鎷f枡閰嶉�佸崟/Jl_ComplementGoodsBillMain.html">鎷f枡閰嶉�佸崟鍒楄〃(-)</a></dd>-->
-                                        <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鐢熶骇鏃ヨ鍒掑崟/Sc_WorkBillAutoSortBillMain.html">鐢熶骇鏃ヨ鍒掑崟鍒楄〃</a></dd>
-                                    </dl>
-                                </dd>
+                                    <!-- </dd> -->
+                                    <!-- <dd>
+                                         <a>绂绘暎鍒堕��</a>
+                                         <dl class="layui-nav-child">
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanEdit.html">宸ュ簭璁″垝鍗�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">宸ュ簭璁″垝鍗曠淮鎶�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">宸ュ簭娲惧伐鍗�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">宸ュ簭娲惧伐鍗曠淮鎶�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_AddEntrustProcSendWork.html">濮斿宸ュ簭娲惧伐鍗�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_EntrustProcSendWorkBillList.html">濮斿宸ュ簭娲惧伐鍗曠淮鎶�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">宸ュ簭姹囨姤鍗�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">宸ュ簭姹囨姤鍗曠淮鎶�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportOverList.html">棣栭亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList_Last.html">鏈亾宸ュ簭姹囨姤鍏ュ簱鍒楄〃</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_Add_EntrustProcessSendOutBill.html">濮斿宸ュ簭璁″垝杞嚭鍗�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBillList.html">濮斿宸ュ簭璁″垝杞嚭鍗曠淮鎶�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_Add_EntrustProcessReport.html">濮斿宸ュ簭璁″垝姹囨姤鍗�</a></dd>
+                                             <dd><a lay-href="鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_EntrustProcessReportBillList.html">濮斿宸ュ簭璁″垝姹囨姤鍗曠淮鎶�</a></dd>
+                                         </dl>
+                                     </dd> -->
+                                    <!-- <dd>
+                                        <a>澧欏挃瑁呯</a>
+                                        <dl class="layui-nav-child">
+                                            <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/QK_PackingBill.html">澧欏挃瑁呯鍗�</a></dd>
+                                            <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瑁呯鍗�/QK_PackedBillList.html">宸茶绠卞崟鎹垪琛�</a></dd>
+                                        </dl>
+                                    </dd> -->
+                                    <!-- <dd>
+                                        <a>鎶ヨ〃鍒嗘瀽</a>
+                                        <dl class="layui-nav-child append" id="append">
+                                            <dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>
+                                            <dd><a lay-href="">娴佽浆鍗″叏绋嬭窡韪猲</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationInBillList.html">鏍囧噯宸ユ椂鎶ヨ〃</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/ProductionPlanReportList.html">鎶曚骇璁″垝鎶ヨ〃</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">宸ュ簭鍦ㄥ埗鍝佹姤琛�(绾靛悜)</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/DefectiveDetailedYieldReport.html">涓嶈壇鏄庣粏鑹巼鎶ヨ〃</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_StationOutSumReport.html">杞﹂棿鐢熶骇姹囨姤缁熻琛�</a></dd>
+                                        </dl>
+                                    </dd> -->
+                                    <!-- <dd>
+                                        <a>鍙枡绠$悊</a>
+                                        <dl class="layui-nav-child append" id="append">
+                                            <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain.html">鐢熶骇鍙枡骞冲彴(鎸夎鍗曞彨鏂�)</a></dd>
+                                            <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍙枡骞冲彴/JIT_ComplementGoodBillMain_ZXBZ.html">鐢熶骇鍙枡骞冲彴(鏈�灏忓寘瑁呭彨鏂�)</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/Jl_CallGoodsBillMain.html">鍙枡鍗曞垪琛�</a></dd>
+                                            <dd><a lay-href="鐢熶骇绠$悊/鎷f枡閰嶉�佸崟/JIT_ComplementGoodsList.html">鎷f枡閰嶉�佸崟鍒楄〃</a></dd>
+                                            <dd><a lay-href="鐢熶骇绠$悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">閫�鏂欑敵璇峰崟鍒楄〃</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鍙枡閫�鏂欏崟/Jl_CallGoodsBillBackMain.html">鍙枡閫�鏂欏崟鍒楄〃</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/杞﹂棿鏀舵枡/JIT_SendGoodsBillList.html">杞﹂棿鏀舵枡鍒楄〃</a></dd>
+                                            <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鎷f枡閰嶉�佸崟/Jl_ComplementGoodsBillMain.html">鎷f枡閰嶉�佸崟鍒楄〃(-)</a></dd>-->
+                                    <!--   <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鐢熶骇鏃ヨ鍒掑崟/Sc_WorkBillAutoSortBillMain.html">鐢熶骇鏃ヨ鍒掑崟鍒楄〃</a></dd>
+                                        </dl>
+                                    </dd> -->
                             </dl>
                         </li>
                         <!-- 璐ㄩ噺绠$悊 -->
@@ -931,21 +931,21 @@
                                     <a>鍏敤璧勬枡</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">鐗╂枡鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">鐗╂枡鍒嗙被鍒楄〃</a></dd>
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">鐗╂枡鍒嗙被鍒楄〃</a></dd> -->
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">浠撳簱鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html">宸ヤ綅鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">浠撲綅鍒楄〃</a></dd>
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html">宸ヤ綅鍒楄〃</a></dd> -->
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">浠撲綅鍒楄〃</a></dd> -->
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">鑱屽憳鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">閮ㄩ棬鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">杈呭姪灞炴�у垪琛�</a></dd>
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">杈呭姪灞炴�у垪琛�</a></dd> -->
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">缁勭粐鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">璁¢噺鍗曚綅鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">璐у竵鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html">鏈堝害璁剧疆</a></dd>
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">璐у竵鍒楄〃</a></dd> -->
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html">鏈堝害璁剧疆</a></dd> -->
                                         <dd><a lay-href="鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">瀹㈡埛鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">渚涘簲鍟嗗垪琛�</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">璁㈠崟绛夌骇</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">璁㈠崟鍙嶉鐘舵��</a></dd>
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">渚涘簲鍟嗗垪琛�</a></dd> -->
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">璁㈠崟绛夌骇</a></dd> -->
+                                        <!-- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">璁㈠崟鍙嶉鐘舵��</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html">宸ヨ壓鍙傛暟鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnitList.html">宸ヨ壓鍙傛暟鍗曚綅鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechParamByProcList.html">宸ヨ壓鍙傛暟瀵瑰簲琛ㄥ垪琛�</a></dd>
@@ -966,71 +966,71 @@
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_Staff.html">鍛樺伐鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MouldStatus.html">鍣ㄥ叿鐘舵�佸垪琛�</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_EquipStatus.html">璁惧鐘舵�佸垪琛�</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_TaxMIX.html">绋庣粍鍚堝垪琛�</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_TaxMIX.html">绋庣粍鍚堝垪琛�</a></dd> -->
                                     </dl>
-                                </dd>
-                                <dd>
-                                    <a>璁惧鍩虹璧勬枡</a>
-                                    <dl class="layui-nav-child">
-                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">鐐规椤圭洰</a></dd>-->
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">鐐规椤圭洰缁存姢</a></dd>
-                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairEdit.html">缁翠慨椤圭洰</a></dd>-->
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">缁翠慨椤圭洰缁存姢</a></dd>
-                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckEdit.html">缁翠慨妫�楠岄」鐩�</a></dd>-->
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">缁翠慨妫�楠岄」鐩淮鎶�</a></dd>
-                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainEdit.html">淇濆吇椤圭洰</a></dd>-->
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">淇濆吇椤圭洰缁存姢</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMould.html">浜у搧涓庡櫒鍏锋竻鍗�</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMouldList.html">浜у搧涓庡櫒鍏锋竻鍗曠淮鎶�</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>鐢熶骇璧勬枡</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">宸ヤ綔涓績鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">宸ュ簭鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">鐢熶骇璧勬簮鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">涓嶈壇鍘熷洜鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">鏁呴殰鍘熷洜鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillList.html">浣滀笟鎸囧涔︾淮鎶�</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html">浣滀笟鎸囧涔︾紪杈�</a></dd>
-                                        <dd><a href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBill.html" target="main_self_frame">浣滀笟鎸囧涔�</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>妫�楠岃祫鏂�</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">妫�楠岄」鐩垪琛�</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">妫�楠岄」鐩垎绫诲垪琛�</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>宸ヨ祫鍩虹璧勬枡</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡缁存姢</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkDay.html">宸ヤ綔鏃ュ垪琛�</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>浜у搧璧勬枡</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQty.html">渚涘簲鍟嗙墿鏂欒祫鏂�</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQtyList.html">渚涘簲鍟嗙墿鏂欒祫鏂欑淮鎶�</a></dd>
-                                    </dl>
-                                </dd>
-                                <dd>
-                                    <a>鏁版嵁瀛楀吀</a>
-                                    <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_TableList.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)缁存姢</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_View.html"> 鏁版嵁瀛楀吀(瑙嗗浘)</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html"> 鏁版嵁瀛楀吀(瑙嗗浘)缁存姢</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)缁存姢</a></dd>
-                                    </dl>
-                                </dd>
+                                    <!-- </dd>
+                                     <dd>
+                                        <a>璁惧鍩虹璧勬枡</a>
+                                        <dl class="layui-nav-child">
+                                            <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">鐐规椤圭洰</a></dd>-->
+                                    <!-- <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">鐐规椤圭洰缁存姢</a></dd> -->
+                                    <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairEdit.html">缁翠慨椤圭洰</a></dd>-->
+                                    <!--  <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">缁翠慨椤圭洰缁存姢</a></dd> -->
+                                    <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckEdit.html">缁翠慨妫�楠岄」鐩�</a></dd>-->
+                                    <!-- <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">缁翠慨妫�楠岄」鐩淮鎶�</a></dd> -->
+                                    <!--<dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainEdit.html">淇濆吇椤圭洰</a></dd>-->
+                                    <!-- <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">淇濆吇椤圭洰缁存姢</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMould.html">浜у搧涓庡櫒鍏锋竻鍗�</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_MateMouldList.html">浜у搧涓庡櫒鍏锋竻鍗曠淮鎶�</a></dd>
+                                        </dl>
+                                    </dd> -->
+                                    <!-- <dd>
+                                         <a>鐢熶骇璧勬枡</a>
+                                         <dl class="layui-nav-child">
+                                             <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">宸ヤ綔涓績鍒楄〃</a></dd>
+                                             <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">宸ュ簭鍒楄〃</a></dd>
+                                             <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">鐢熶骇璧勬簮鍒楄〃</a></dd>
+                                             <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">鐢熶骇鐝粍鍒楄〃</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">涓嶈壇鍘熷洜鍒楄〃</a></dd>
+                                             <dd><a lay-href="鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">鏁呴殰鍘熷洜鍒楄〃</a></dd> -->
+                                    <!-- <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillList.html">浣滀笟鎸囧涔︾淮鎶�</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBillEdit.html">浣滀笟鎸囧涔︾紪杈�</a></dd>
+                                            <dd><a href="鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBill.html" target="main_self_frame">浣滀笟鎸囧涔�</a></dd>
+                                        </dl>
+                                    </dd> -->
+                                    <!-- <dd>
+                                         <a>妫�楠岃祫鏂�</a>
+                                         <dl class="layui-nav-child">
+                                             <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">妫�楠岄」鐩垪琛�</a></dd>
+                                             <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">妫�楠岄」鐩垎绫诲垪琛�</a></dd>
+                                         </dl>
+                                     </dd> -->
+                                    <!-- <dd>
+                                        <a>宸ヨ祫鍩虹璧勬枡</a>
+                                        <dl class="layui-nav-child">
+                                            <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡缁存姢</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkDay.html">宸ヤ綔鏃ュ垪琛�</a></dd>
+                                        </dl>
+                                    </dd> -->
+                                    <!-- <dd>
+                                         <a>浜у搧璧勬枡</a>
+                                         <dl class="layui-nav-child">
+                                             <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQty.html">渚涘簲鍟嗙墿鏂欒祫鏂�</a></dd>
+                                             <dd><a lay-href="鍩虹璧勬枡/浜у搧鍩虹璧勬枡/Gy_StdMinPickQtyList.html">渚涘簲鍟嗙墿鏂欒祫鏂欑淮鎶�</a></dd>
+                                         </dl>
+                                     </dd> -->
+                                    <!--<dd>
+                                        <a>鏁版嵁瀛楀吀</a>
+                                        <dl class="layui-nav-child">
+                                            <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_TableList.html"> 鏁版嵁瀛楀吀(琛ㄧ粨鏋�)缁存姢</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_View.html"> 鏁版嵁瀛楀吀(瑙嗗浘)</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html"> 鏁版嵁瀛楀吀(瑙嗗浘)缁存姢</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)</a></dd>
+                                            <dd><a lay-href="鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html"> 鏁版嵁瀛楀吀(瀛樺偍杩囩▼)缁存姢</a></dd>
+                                        </dl>
+                                    </dd>-->
                             </dl>
                         </li>
                         <!-- 绯荤粺绠$悊 -->
@@ -1042,12 +1042,12 @@
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="绯荤粺绠$悊/鏃ュ織绠$悊/Xt_SystemLogList.html">绯荤粺涓婃満鏃ュ織鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/绯荤粺鍙傛暟绠$悊/Xt_SystemParameterList.html">绯荤粺鍙傛暟鏌ヨ</a></dd>
-                                        <dd><a lay-href="绯荤粺绠$悊/妯″潡绠$悊/Xt_XtgnbList.html">绯荤粺妯″潡淇℃伅鏌ヨ</a></dd>
+                                        <!--<dd><a lay-href="绯荤粺绠$悊/妯″潡绠$悊/Xt_XtgnbList.html">绯荤粺妯″潡淇℃伅鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillTypeList.html">绯荤粺鍗曟嵁绫诲瀷鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">浼氳鏈熼棿鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillEdit.html">鍏憡淇℃伅</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鍏憡/GG_NoticeBillList.html">鍏憡淇℃伅缁存姢</a></dd>
-                                        <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillSubTypeList.html">绯荤粺鍗曟嵁瀛愮被鍨嬫煡璇�</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillSubTypeList.html">绯荤粺鍗曟嵁瀛愮被鍨嬫煡璇�</a></dd>-->
                                     </dl>
                                 </dd>
                                 <dd>
@@ -1055,7 +1055,7 @@
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserList.html">鐢ㄦ埛鍒楄〃</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserGroupList.html">瑙掕壊鍒楄〃</a></dd>
-                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserSuplies.html">鐢ㄦ埛鍏宠仈渚涘簲鍟�</a></dd>
+                                        <!--<dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserSuplies.html">鐢ㄦ埛鍏宠仈渚涘簲鍟�</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserByOrg.html">鐢ㄦ埛鍏宠仈缁勭粐</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserStock.html">鐢ㄦ埛鍏宠仈浠撳簱</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserByWorkStation.html">鐢ㄦ埛鍏宠仈宸ヤ綅</a></dd>
@@ -1064,13 +1064,13 @@
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserEmployee.html">鐢ㄦ埛鍏宠仈鑱屽憳</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserByUser.html">鐢ㄦ埛鍏宠仈鐢ㄦ埛</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserMater.html">鐢ㄦ埛鍏宠仈鐗╂枡</a></dd>
-                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserCustomer.html">鐢ㄦ埛鍏宠仈瀹㈡埛</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserCustomer.html">鐢ㄦ埛鍏宠仈瀹㈡埛</a></dd>-->
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Gy_UserProcess.html">鐢ㄦ埛鍏宠仈宸ュ簭</a></dd>
-                                        <dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>
+                                        <!--<dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>-->
                                         <dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
                                     </dl>
                                 </dd>
-                                <dd>
+                                <!--<dd>
                                     <a>澶氱骇瀹℃壒</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="绯荤粺绠$悊/澶氱骇瀹℃壒/瀹℃牳椤圭洰/Xt_CheckItemList.html">瀹℃牳椤圭洰鍒楄〃</a></dd>
@@ -1078,7 +1078,7 @@
                                         <dd><a lay-href="绯荤粺绠$悊/澶氱骇瀹℃壒/瀹℃牳娴佺▼鍗�/Xt_CheckUserRight.html">瀹℃壒鐢ㄦ埛鏉冮檺璁剧疆</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/缁勭粐鏋舵瀯璁剧疆/Gy_DutyList.html">缁勭粐鏋舵瀯鍒楄〃</a></dd>
                                     </dl>
-                                </dd>
+                                </dd>-->
                             </dl>
                         </li>
                     </ul>
@@ -1103,7 +1103,7 @@
                 </div>
                 <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
                     <ul class="layui-tab-title" id="LAY_app_tabsheader">
-                        <li lay-id="home/console.html" lay-attr="home/console.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
+                        <li lay-id="home/console_QiaoYi.html" lay-attr="home/console_QiaoYi.html" class="layui-this"><i class="layui-icon layui-icon-home"></i></li>
                     </ul>
                 </div>
             </div>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index ff448ae..5f08a3f 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -21,7 +21,7 @@
     <!--<audio id="cs" hidden controls>
         <source src="../video/jingbao.wav" type="audio/ogg">
     </audio>-->
-    <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;background-image:url(../userfiles/images/2.jpg);background-size: 100%;">
+    <div class="layadmin-user-login layadmin-user-display-show" id="LAY-user-login" style="display: none;">
         <div class="layadmin-user-login-main" style="margin: -5.8% auto;">
             <div class="layadmin-user-login-box layadmin-user-login-header">
                 <h2 style="color:white;">L-MES</h2>
@@ -136,6 +136,14 @@
             //鍒ゆ柇鐢ㄦ埛鏄Щ鍔ㄧ杩樻槸PC绔�
             var judgeMorPCflag = judgeMorPC();
 
+            if (!judgeMorPCflag) {//绉诲姩绔�
+                $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
+                $("#LAY-user-login").css("background-size", "100%");
+            } else {
+                $("#LAY-user-login").css("background", "url('../userfiles/images/2.jpg')");
+                $("#LAY-user-login").css("background-size", "100%");
+            }
+
             //鎻愪氦
             form.on("submit(LAY-user-login-submit)", function (obj) {
                 loging();
@@ -148,9 +156,9 @@
             //瀵嗙爜妗嗗洖杞︽墽琛岀櫥褰�
             $('#LAY-user-login-password').on('keydown', function (e) {
                 if (e.keyCode == 13) {
-                    //playSound();
+                    loging();
                 }
-            });
+            });          
             //鐢ㄦ埛鍚嶆鍥炶溅鍏夋爣绉诲埌瀵嗙爜妗�
             $('#LAY-user-login-username').on('keydown', function (e) {
                 if (e.keyCode == 13) {
@@ -263,7 +271,7 @@
                     $("body").append('<audio id="cs" hidden controls> <source src = "../video/jingbao.wav" type = "audio/ogg"> </audio >');
                 var audio = document.getElementById("cs");
                 audio.play();
-            }
+            }          
 
         });
     </script>
diff --git a/WebTM/views/userfiles/images/IMG_5566.jpg b/WebTM/views/userfiles/images/IMG_5566.jpg
deleted file mode 100644
index 6331af3..0000000
--- a/WebTM/views/userfiles/images/IMG_5566.jpg
+++ /dev/null
Binary files differ
diff --git a/WebTM/views/userfiles/images/pda.jpg b/WebTM/views/userfiles/images/pda.jpg
new file mode 100644
index 0000000..f201fb3
--- /dev/null
+++ b/WebTM/views/userfiles/images/pda.jpg
Binary files differ
diff --git a/WebTM/views/userfiles/images/wy.jpg b/WebTM/views/userfiles/images/wy.jpg
new file mode 100644
index 0000000..82ad58f
--- /dev/null
+++ b/WebTM/views/userfiles/images/wy.jpg
Binary files differ
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 2dafc0c..bdddf81 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -253,6 +253,10 @@
             //鍔犺浇鏉$爜绫诲瀷鏁版嵁
             set_HBarCodeType();                      
 
+            var rowdata = [{
+                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
+                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
+            }];
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             set_CountGrid();
@@ -272,12 +276,7 @@
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
-            //#endregion
-           
-            var rowdata = [{
-                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0,"HPackQty":0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
-                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0
-            }];
+            //#endregion                     
 
             //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
             //澶村伐鍏锋爮
@@ -506,12 +505,14 @@
                                     HMaterID = result.list[0].HMaterID;
                                     HBatchNo = result.list[0].HBatchNo;
                                     if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                        BatchNoArray = result.list;  //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
-
                                         for (let i = 0; i < result.list.length; i++) {
-                                            result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
+                                            result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,2})?/)[0]  //淇濈暀灏忔暟鐐瑰悗涓や綅灏忔暟     
                                         }
-
+                                                                             
+                                        BatchNoArray = result.list;  //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
+                                        //for (let i = 0; i < result.list.length; i++) {
+                                        //    result.list[i].HMinQty = '';//鐐瑰嚮鍗曞厓鏍肩殑鏃跺�欓粯璁ゅ��0涓嶄細娓呴櫎锛屽鎴风湅浜嗕細瑙夊緱寰堟�紝鎵�浠ュ厛鐢ㄧ┖瀛楃涓插彇浠�;
+                                        //}
                                         table.reload('mainTable', {
                                             data: result.list // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
                                         });
@@ -638,7 +639,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠g爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁¢噺鍗曚綅浠g爜, HUnitName: checkStatus.data[0].璁¢噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺, HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
+                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠g爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁¢噺鍗曚綅浠g爜, HUnitName: checkStatus.data[0].璁¢噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '' }]
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         table.reload('mainTable', {
                             data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -793,7 +794,7 @@
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
                     , { field: 'HMainID', title: '婧愬崟涓诲唴鐮�',  width: 100, hide: true }
                     , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�',  width: 100, hide: true }
                     , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
@@ -801,34 +802,32 @@
                     , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterNumber', width: 200 }
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О',  width: 200 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+                    , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
+                    , { field: 'HBQty', title: '绠辨暟', width: 100 }
+                    , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100 }
+                    , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
+                    , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
+                    , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
+                    , { field: 'HCusID', title: '瀹㈡埛ID',  width: 100, hide: true }
+                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
+                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+                    , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                    , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
+                    , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
+                    , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
                     , { field: 'HAuxPropID', title: '杈呭姪灞炴�D',  width: 100, hide: true }
                     , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
                     , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�',  width: 100 }
                     , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
                     , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitNumber', width: 100 }
                     , { field: 'HUnitName', title: '璁¢噺鍗曚綅',width: 100 }
-                    , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
-
-                    , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
-                    , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
-                    , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
                     , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100 }
-                    , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
-                    , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', event: 'HProduceDate', width: 100 }
-                    , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', event: 'HExpiryDate', width: 100 }
                     , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
-
                     , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
-                    , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
-                    , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', width: 100 }
-                    , { field: 'HBQty', title: '绠辨暟', width: 100 }
-                    , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100 }
                     , { field: 'HDate', title: '杩涙枡鏃ユ湡',  width: 100 }
-                    , { field: 'HCusID', title: '瀹㈡埛ID',  width: 100, hide: true }
-                    , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
-                    , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
-                    , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
-                    , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
                 option = {
@@ -836,7 +835,7 @@
                     , elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , page: false
-                    , cellMinWidth: 120
+                    , cellMinWidth: 75
                     , height: 'full-325'
                     , cols: [columns]
                     , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
index fcdcdc2..7a0468a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
@@ -69,15 +69,6 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label" style="width: 118px;">缁勭粐*</label>
-                                            <div class="layui-input-block" style="margin-left: 152px; width: 185px;">
-                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </div>
-                                        </div>
-
-                                        <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">绂佺敤鏍囪</label>
                                             <div class="layui-input-inline">
                                                 <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
@@ -93,29 +84,39 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 118px;">缁勭粐*</label>
+                                            <div class="layui-input-block" style="margin-left: 162px; width: 717px;">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
 
                                 </div>
-                                <div class="layui-tab-item">
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">璐熻矗浜�</label>
-                                        <div class="layui-input-inline">
-                                            <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
-                                            <input type="hidden" name="HEmpID" id="HEmpID" value="0">
-                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
-                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                            </button>
+                                    <div class="layui-tab-item">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璐熻矗浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">鏉″舰鐮侊細</label>
-                                        <div class="layui-input-inline">
-                                            <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏉″舰鐮侊細</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+                                            </div>
                                         </div>
+                                        <input id="HItemID" name="HItemID" type="hidden" />
+                                        <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
                                     </div>
-                                    <input id="HItemID" name="HItemID" type="hidden" />
-                                    <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
                                 </div>
-                            </div>
                         </div>
                     </div>
                 </form>
@@ -170,6 +171,8 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
             }
             else if (OperationType == 3) {//缂栬緫
                 //绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 330a4a9..fe78ae2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -106,7 +106,17 @@
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">鍏嬮噸</label>
                                                     <div class="layui-input-inline" style="">
-                                                        <input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" autocomplete="off" value="0">
+                                                        <input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" placeholder="璇疯緭鍏ユ暟瀛�"  autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">榛樿浠撳簱</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float: left; width: 100px;">
+                                                        <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
                                                     </div>
                                                 </div>
 
@@ -121,13 +131,17 @@
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">骞呭</label>
                                                     <div class="layui-input-inline" style="">
-                                                        <input class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" autocomplete="off" value="0">
+                                                        <input class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" placeholder="璇疯緭鍏ユ暟瀛�" autocomplete="off" value="0">
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label"> 鐗╂枡鍒嗙被锛�</label>
                                                     <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HMaterClsID" lay-verify="HMaterClsID" id="HMaterClsID" autocomplete="off" value="0">
+                                                        <input type="text" readonly name="HMaterClsName" id="HMaterClsName" class="layui-input" value="" style="float: left; width: 100px;">
+                                                        <input type="hidden" name="HMaterClsID" id="HMaterClsID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMaterClsID" id="btnHMaterClsID" style="width:40px;">
+                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                        </button>
                                                     </div>
                                                 </div>
 
@@ -146,132 +160,10 @@
                                                     </div>
                                                 </div>
 
-                                                <div class="layui-inline">
-                                                    <!--<label class="layui-form-label"> 榛樿浠撳簱锛�</label>
-        <div class="layui-input-inline">
-            <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
-        </div>-->
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">榛樿浠撳簱</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float: left; width: 100px;">
-                                                            <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
-                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                            </button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="layui-row">
-                                                
-                                                <div class="layui-inline">
-                                                    <!--<label class="layui-form-label"> 杈呭姪璁¢噺鍗曚綅锛�</label>
-            <div class="layui-input-inline">
-                <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
-            </div>-->
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">杈呭姪璁¢噺鍗曚綅</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float: left; width: 100px;">
-                                                            <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecUnitList" id="HSecUnitList" style="width:40px;">
-                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                            </button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label"> 淇濊川鏈燂細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" value="0">
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="layui-row">
-                                                
-                                                
-                                            </div>
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">閿�鍞閲忓崟浣�</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HSALEUNITName" id="HSALEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
-                                                            <input type="hidden" name="HSALEUNITID" id="HSALEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEUNITList" id="HSALEUNITList" style="width:40px;">
-                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                            </button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">閿�鍞浠�<br />璁¢噺鍗曚綅</label>
-                                                        <div class="layui-input-inline" style="margin-top:10px">
-                                                            <input type="text" readonly name="HSALEPRICEUNITName" id="HSALEPRICEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
-                                                            <input type="hidden" name="HSALEPRICEUNITID" id="HSALEPRICEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList" style="width:40px;">
-                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                            </button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">鍩烘湰璁¢噺鍗曚綅</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HBASEUNITName" id="HBASEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
-                                                            <input type="hidden" name="HBASEUNITID" id="HBASEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HBASEUNITList" id="HBASEUNITList" style="width:40px;">
-                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                            </button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <div class="layui-inline">
-                                                        <label class="layui-form-label">搴撳瓨璁¢噺鍗曚綅</label>
-                                                        <div class="layui-input-inline">
-                                                            <input type="text" readonly name="HSTOREUNITName" id="HSTOREUNITName" class="layui-input" value="" style="float: left; width: 100px;">
-                                                            <input type="hidden" name="HSTOREUNITID" id="HSTOREUNITID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSTOREUNITList" id="HSTOREUNITList" style="width:40px;">
-                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                            </button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label"> 鏍囧噯宸ユ椂锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HPERUNITSTANDHOUR" lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR" autocomplete="off" value="0">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label"> 鏍囧噯浜哄憳<br />鍑嗗宸ユ椂</label>
-                                                    <div class="layui-input-inline" style="margin-top:10px">
-                                                        <input class="layui-input" name="HSTDLABORPREPARETIME" lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME" autocomplete="off" value="0">
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label"> 鏍囧噯鏈哄櫒<br />鍑嗗宸ユ椂</label>
-                                                    <div class="layui-input-inline" style="margin-top:10px">
-                                                        <input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
-                                                    </div>
-                                                </div>
-                                                
 
                                             </div>
+
+                                           
                                             <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label"> 澶囨敞锛�</label>
@@ -286,7 +178,7 @@
                                                         <input type="hidden" name="UnitType" id="UnitType">
                                                     </div>
                                                 </div>
-                                                
+
 
                                             </div>
                                         </div>
@@ -454,6 +346,115 @@
                                                 </div>
                                             </div>
 
+                                            <div class="layui-row">
+
+                                                <div class="layui-inline">
+                                                    <!--<label class="layui-form-label"> 杈呭姪璁¢噺鍗曚綅锛�</label>
+            <div class="layui-input-inline">
+                <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+            </div>-->
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">杈呭姪璁¢噺鍗曚綅</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float: left; width: 100px;">
+                                                            <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecUnitList" id="HSecUnitList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 淇濊川鏈燂細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+
+
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">閿�鍞閲忓崟浣�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HSALEUNITName" id="HSALEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
+                                                            <input type="hidden" name="HSALEUNITID" id="HSALEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEUNITList" id="HSALEUNITList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">閿�鍞浠�<br />璁¢噺鍗曚綅</label>
+                                                        <div class="layui-input-inline" style="margin-top:10px">
+                                                            <input type="text" readonly name="HSALEPRICEUNITName" id="HSALEPRICEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
+                                                            <input type="hidden" name="HSALEPRICEUNITID" id="HSALEPRICEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSALEPRICEUNITList" id="HSALEPRICEUNITList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">鍩烘湰璁¢噺鍗曚綅</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HBASEUNITName" id="HBASEUNITName" class="layui-input" value="" style="float: left; width: 100px;">
+                                                            <input type="hidden" name="HBASEUNITID" id="HBASEUNITID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HBASEUNITList" id="HBASEUNITList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">搴撳瓨璁¢噺鍗曚綅</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HSTOREUNITName" id="HSTOREUNITName" class="layui-input" value="" style="float: left; width: 100px;">
+                                                            <input type="hidden" name="HSTOREUNITID" id="HSTOREUNITID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSTOREUNITList" id="HSTOREUNITList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 鏍囧噯宸ユ椂锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HPERUNITSTANDHOUR" lay-verify="HPERUNITSTANDHOUR" id="HPERUNITSTANDHOUR" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 鏍囧噯浜哄憳<br />鍑嗗宸ユ椂</label>
+                                                    <div class="layui-input-inline" style="margin-top:10px">
+                                                        <input class="layui-input" name="HSTDLABORPREPARETIME" lay-verify="HSTDLABORPREPARETIME" id="HSTDLABORPREPARETIME" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label"> 鏍囧噯鏈哄櫒<br />鍑嗗宸ユ椂</label>
+                                                    <div class="layui-input-inline" style="margin-top:10px">
+                                                        <input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -513,6 +514,7 @@
             if (hID == null || hID == 0) {
                 //id new
                 $("#HItemID").val(0);
+                get_ReadConfigFile();
             }
             else {//濡傛灉缂栬緫淇敼鍒欒蛋涓嬮潰
                 $("#HItemID").val(hID);
@@ -601,6 +603,32 @@
             });
 
 
+            //璇诲彇閰嶇疆鏂囦欢
+            function get_ReadConfigFile() {
+                //鑾峰彇鏈湴瀛樺偍鐨勬暟鎹�
+                var data = localStorage.getItem("Add_Edit_Gy_Material");
+                if (data != null) {
+                    var data2 = JSON.parse(data);
+                    $("#HWhID").val(data2["HWhID"]);
+                    $("#HWhName").val(data2["HWhName"]);
+                    $("#HMaterTypeID").val(data2["HMaterTypeID"]);
+                    form.render('select');
+                }
+            }
+
+            //瀛樺偍閰嶇疆鏂囦欢
+            function get_WriteConfigFile() {
+                //娓呯┖鏈湴瀛樺偍鐨勬暟鎹�
+                localStorage.removeItem("Add_Edit_Gy_Material");
+                var data = {
+                    HWhID: $("#HWhID").val()
+                    , HWhName: $("#HWhName").val()
+                    , HMaterTypeID: $("#HMaterTypeID").val()
+                }
+                //鏈湴瀛樺偍
+                localStorage.setItem("Add_Edit_Gy_Material", JSON.stringify(data));
+            }
+
 
             //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
             function RoadBillMain(hID)//鍔犺浇琛ㄥご
@@ -636,7 +664,8 @@
                                 , "HSubjoin": data.闄勫姞灞炴��1
                                 , "HSubjoin2": data.闄勫姞灞炴��2
                                 , "HColor": data.棰滆壊
-                                , "HMaterClsID": data.鐗╂枡鍒嗙被
+                                , "HMaterClsID": data.HMaterClsID
+                                , "HMaterClsName": data.鐗╂枡鍒嗙被
                                 , "HMaterTypeID": data.鐗╂枡灞炴�� == "0" ? 1 : data.鐗╂枡灞炴��
                                 , "HWhID": data.榛樿浠撳簱
                                 , "HWhName": data.浠撳簱鍚嶇О
@@ -704,20 +733,43 @@
                 //var sSubStr = JSON.stringify(table.cache['mainTable']);
                 //var sMainSub = sMainStr + ';' + sSubStr;
                 if ($("#HNumber").val() == 0) {
-                    layer.msg("璇烽�夋嫨鐗╂枡浠g爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("璇疯緭鍏ョ墿鏂欎唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
                 if ($("#HName").val() == 0) {
-                    layer.msg("璇烽�夋嫨鐗╂枡鍚嶇О锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("璇疯緭鍏ョ墿鏂欏悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
                 if ($("#HModel").val() == 0) {
-                    layer.msg("璇烽�夋嫨瑙勬牸鍨嬪彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("璇疯緭鍏ヨ鏍煎瀷鍙凤紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
                 if ($("#HUnitName").val() == 0) {
                     layer.msg("璇烽�夋嫨涓昏閲忓崟浣嶏紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
+                }
+                var HWeight = $('#HWeight').val();
+                if (HWeight.substring(HWeight.length - 1, HWeight.length) == ".") {
+                    layer.msg("鍏嬮噸鐨勭粨灏句笉鑳芥槸.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+\.?[0-9]*$/;
+                    if (!ref.test(HWeight)) {
+                        layer.msg("鍏嬮噸璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                        return;
+                    }
+                }
+
+                var HWidth = $('#HWidth').val();
+                if (HWidth.substring(HWidth.length - 1, HWidth.length) == ".") {
+                    layer.msg("骞呭鐨勭粨灏句笉鑳芥槸.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+\.?[0-9]*$/;
+                    if (!ref.test(HWidth)) {
+                        layer.msg("骞呭璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                        return;
+                    }
                 }
                 //if ($("#HUnitGroupName").val() == 0) {
                 //    layer.msg("璇烽�夋嫨璁¢噺鍗曚綅缁勶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -751,6 +803,7 @@
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 layer.msg(data.Message, { icon: 1 });
                                 $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                get_WriteConfigFile();
                             }
                             else {
 
@@ -815,6 +868,37 @@
                     , btn2: function (index, layero) { }
                 })
             });
+
+            //閫夋嫨鐗╂枡鍒嗙被
+            form.on('submit(btnHMaterClsID)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐗╂枡鍒嗙被鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                    , 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 != 1) {
+                            return layer.msg('璇烽�夋嫨涓�鏉℃暟鎹�');
+                        }
+                        $("#HMaterClsName").val(checkStatus.data[0].鍚嶇О);
+                        $("#HMaterClsID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+
+
             //閫夋嫨杈呭姪璁¢噺鍗曚綅
             form.on('submit(HSecUnitList)', function () {//閫夋嫨瀹胯垗
                 $("#UnitType").val(2);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
index b4e497a..2b5a125 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
@@ -389,12 +389,14 @@
                     return;
                 }
                 var HRate = $("#HRate").val();
+
+                sMainStr += ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + HRate;
                 $.ajax(
                     {
                         type: "POST",
-                        url: GetWEBURL() + "SaveGy_UnitList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/SaveGy_UnitList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         async: true,
-                        data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] + ';' + HRate },
+                        data: { "msg": sMainStr},
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
index 806e272..b2e754b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
@@ -67,14 +67,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label" style="width: 118px;">缁勭粐*</label>
-                                            <div class="layui-input-block" style="margin-left: 152px; width: 185px;">
-                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </div>
-                                        </div>
+
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">浠撳簱鍦板潃</label>
                                             <div class="layui-input-inline">
@@ -89,7 +82,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        
+
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">绂佺敤鏍囪</label>
                                             <div class="layui-input-inline">
@@ -102,6 +95,16 @@
                                             <div class="layui-input-inline">
                                                 <input type="checkbox" name="checkboxHSPFlag" id="checkboxHSPFlag" lay-skin="primary" lay-filter="checkboxHSPFlag" value="true" title="鏄惁鍚敤">
                                                 <input type="hidden" value="0" name="HSPFlag" id="HSPFlag">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+                                            <div class="layui-input-block" style="margin-left: 164px; width: 717px;">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
                                             </div>
                                         </div>
                                     </div>
@@ -187,6 +190,8 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
             }
             else if (OperationType == 3) {//缂栬緫
                 //绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
index 51f8b80..472e81e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
@@ -75,17 +75,7 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鑱屽姟</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HDutyName" id="HDutyName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HDutyID" id="HDutyID" value="0">
-                                                <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
+                                        
 
                                     </div>
                                     <div class="layui-row">
@@ -449,7 +439,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        
+
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">宀椾綅</label>
                                             <div class="layui-input-inline">
@@ -461,8 +451,17 @@
                                                 </button>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鑱屽姟</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDutyName" id="HDutyName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDutyID" id="HDutyID" value="0">
+                                                <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鐝粍</label>
                                             <div class="layui-input-inline">
@@ -474,7 +473,10 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs4 layui-inline">
+                                    </div>
+                                    <div class="layui-row">
+                                        
+                                        <!--<div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">璐濆+杈鹃儴闂�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
@@ -484,7 +486,7 @@
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
-                                        </div>
+                                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs8 layui-inline">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
index f740ec1..8ef5ea3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
@@ -70,18 +70,7 @@
                                             <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">缁勭粐*</label>
-                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
-                                            <div class="layui-form">
-                                                <div class="layui-form-item">
-                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
-                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                    </select>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
+
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">绂佺敤鏍囧織</label>
@@ -99,6 +88,21 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+                                            <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                                <div class="layui-form">
+                                                    <div class="layui-form-item" style=" width: 375%;">
+                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID" > 
+                                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    
                                 </div>
 
                                     <div class="layui-tab-item">
@@ -189,6 +193,8 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
             }
             else if (OperationType == 3) {//缂栬緫
                 //绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
index 879c318..d124981 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_Sc_ProcessExchangeBillList.aspx"
@@ -14,7 +14,7 @@
             //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
 
             //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
-            SqlXMLReportData.GenEntireData(this, "select  distinct b.娴佹按鍙�,a.浠诲姟鍗曞彿,a.娴佽浆鍗℃暟閲�,a.浜у搧浠g爜,a.鐗堟湰,a.鎴愬搧缂栧彿,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,a.鏉愯川,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,a.鍖呰鏍囪瘑,a.鍖呰鏍囪瘑缂栫爜,a.閿�鍞鍗曞彿,a.瀛愪欢瑙勬牸,a.娴佽浆鍗℃暟閲� 鐢熶骇鏁伴噺,a.鍗曟嵁鍙� + '&' + ltrim(b.HEntryID) 鏉$爜缂栧彿  from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid where b.hmainid="+Request.Params["linterid"] ,"select 1");
+            SqlXMLReportData.GenEntireData(this, "select  b.娴佹按鍙�,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜у搧浠g爜,a.鍗曟嵁鍙�,a.浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,a.骞呭,a.鍏嬮噸,a.澶囨敞2,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid="+Request.Params["linterid"] +"order by cast(b.娴佹按鍙� as int)","select 1");
         }
     </script>
 </head>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index 30b4f6e..e870f2e 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -71,18 +71,7 @@
                                                 <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">缁勭粐</label>
-                                            <div class="layui-input-inline" style="margin-bottom: -15px;">
-                                                <div class="layui-form">
-                                                    <div class="layui-form-item">
-                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
-                                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
+                                        
                                         <div class="layui-row">
                                             <div class="layui-col-xs8 layui-inline">
                                                 <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
@@ -90,6 +79,20 @@
                                                     <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
                                                 </div>
 
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs4 layui-inline">
+                                                <label class="layui-form-label" >缁勭粐</label>
+                                                <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                                    <div class="layui-form">
+                                                        <div class="layui-form-item" style=" width: 375%;">
+                                                            <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -189,6 +192,8 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
             }
             else if (OperationType == 3) {//缂栬緫
                 //绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index cc4261a..352bc34 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -86,11 +86,11 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">缁勭粐*</label>
+                                    <div class="layui-col-xs8 layui-inline">
+                                        <label class="layui-form-label"style="width: 12.5%;">缁勭粐*</label>
                                         <div class="layui-input-inline" style="margin-bottom: -15px;">
                                             <div class="layui-form">
-                                                <div class="layui-form-item">
+                                                <div class="layui-form-item" style=" width: 375%;">
                                                     <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
                                                         <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                     </select>
@@ -343,6 +343,8 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
             }
             else if (OperationType == 3) {//缂栬緫
                 //绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 413d081..0ad3e54 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -79,18 +79,7 @@
                                             <input class="layui-input" name="HMacAddr" id="HMacAddr" autocomplete="off">
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs4 layui-inline">
-                                        <label class="layui-form-label">缁勭粐*</label>
-                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
-                                            <div class="layui-form">
-                                                <div class="layui-form-item">
-                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
-                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                    </select>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
+
                                     <div class="layui-row">
                                         <div class="layui-col-xs8 layui-inline">
                                             <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
@@ -103,6 +92,20 @@
                                             <div class="layui-input-inline">
                                                 <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
                                                 <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">缁勭粐*</label>
+                                            <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                                <div class="layui-form">
+                                                    <div class="layui-form-item" style="width: 375%;">
+                                                        <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                        </select>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -201,7 +204,7 @@
                                     </div>
                                     <div class="layui-row">
                                     </div>
-                                </div> 
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -251,6 +254,8 @@
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
             }
             else if (OperationType == 3) {//缂栬緫
                 //绂佺敤缁勭粐閫夐」
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 4b34c15..a0e856b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -77,29 +77,11 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div class="layui-form-item" style="margin-bottom:5px"> 
-                                                <div class="layui-col-xs4 layui-inline">
-                                                    <label class="layui-form-label">鍒涘缓缁勭粐*</label>
-                                                    <div class="layui-input-inline" style="margin-bottom: -15px;">
-                                                        <div class="layui-form">
-                                                            <div class="layui-form-item">
-                                                                <select name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID">
-                                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                                </select>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs4 layui-inline">
-                                                    <label class="layui-form-label">浣跨敤缁勭粐*</label>
-                                                    <div class="layui-input-inline" style="margin-bottom: -15px;">
-                                                        <div class="layui-form">
-                                                            <div class="layui-form-item">
-                                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
-                                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                                </select>
-                                                            </div>
-                                                        </div>
+                                            <div class="layui-form-item" style="margin-bottom:5px">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
                                                     </div>
                                                 </div>
                                                 <div class="layui-inline">
@@ -109,9 +91,31 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-row">
-                                                    <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+                                                    <div class="layui-col-xs8 layui-inline">
+                                                        <label class="layui-form-label" >鍒涘缓缁勭粐*</label>
+                                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                                            <div class="layui-form">
+                                                                <div class="layui-form-item" style="width: 265%;">
+                                                                    <select name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID">
+                                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                                    </select>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-row">
+                                                    <div class="layui-col-xs8 layui-inline">
+                                                        <label class="layui-form-label" >浣跨敤缁勭粐*</label>
+                                                        <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                                            <div class="layui-form">
+                                                                <div class="layui-form-item" style="width: 265%;">
+                                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                                    </select>
+                                                                </div>
+                                                            </div>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
@@ -385,13 +389,13 @@
                 set_AddFNew();
                 //绂佺敤缁勭粐閫夐」
                 $("#HUSEORGID").attr("disabled", true);
-                $("#HCreateID").attr("disabled", true);
+                $("#HCreateOrgID").attr("disabled", true);
             }
             else if (OperationType == 3) {//缂栬緫
                 set_EditFromGrid();
                 //绂佺敤缁勭粐閫夐」
                 $("#HUSEORGID").attr("disabled", true);
-                $("#HCreateID").attr("disabled", true);
+                $("#HCreateOrgID").attr("disabled", true);
             }
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -399,23 +403,7 @@
             //#endregion
 
             //#region 瑙﹀彂浜嬩欢锛�
-            //閫夋嫨鍒涘缓缁勭粐
-            form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
-                var sMainStr = JSON.stringify(data.field);
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '缁勭粐'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
+           
             //缁撶畻鏂瑰紡寮圭獥
             form.on('submit(btnSearchProc)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -591,8 +579,8 @@
                             }
                             $("#HUSEORGID").append(Organization);
                             $("#HUSEORGID").val(sessionStorage["OrganizationID"])
-                            $("#HCreateORGID").append(Organization);
-                            $("#HCreateORGID").val(sessionStorage["OrganizationID"])
+                            $("#HCreateOrgID").append(Organization);
+                            $("#HCreateOrgID").val(sessionStorage["OrganizationID"])
                             form.render('select');
                         }
                         layer.closeAll("loading");
@@ -600,23 +588,6 @@
                 })
             }
 
-            //閫夋嫨浣跨敤缁勭粐
-            form.on('submit(HUseOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
-                var sMainStr = JSON.stringify(data.field);
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '缁勭粐'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
             //閫夋嫨瀹㈡埛绫诲瀷
             dropdown.render({
                 elem: '#HCusStatus'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 163322d..ddcb0b8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -73,23 +73,16 @@
                                 <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;">鍗曟嵁鍙�</label>
+                                            <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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                                 <input type="hidden" name="HSTOCKINORGID" id="HSTOCKINORGID" lay-verify="HSTOCKINORGID">
                                             </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="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+                                            <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="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                             </div>
@@ -118,26 +111,6 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px;float: right;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: 75px;">
-                                                <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;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: 71px;">
                                                 <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -147,16 +120,27 @@
                                                 </button>
                                             </div>
                                         </div>
+
+                                        <div class="layui-inline" style="width: 51%;">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCus" id="btnHCus" style="padding: 0 10px; float: right; margin-right: 210px;">
+                                                    <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>
+                                            <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="HQty" lay-verify="HQty" id="HQty">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜*</label>
                                             <div class="layui-input-block" style="margin-left: 71px;">
                                                 <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
@@ -166,13 +150,13 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+                                            <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="background-color:#efefef4d;display: inline-block;" readonly>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                            <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="HModel" lay-verify="HModel" id="HModel" style="background-color:#efefef4d;display: inline-block;" readonly>
                                             </div>
@@ -190,7 +174,7 @@
                                             </div>
                                         </div>-->
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁¢噺鍗曚綅</label>
+                                            <label class="layui-form-label" style="width: 85px;">璁¢噺鍗曚綅*</label>
                                             <div class="layui-input-block" style="margin-left: 71px;">
                                                 <input type="text" class="layui-input" lay-verify="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
@@ -206,7 +190,7 @@
                                                     <option value="1">璁″垝</option>
                                                     <option value="2">璁″垝纭</option>
                                                     <option value="3">涓嬭揪</option>
-                                                    <option value="4">寮�宸�</option>
+                                                    <option value="4" selected>寮�宸�</option>
                                                     <option value="5">瀹屽伐</option>
                                                     <option value="6">缁撴</option>
                                                     <option value="7">缁撶畻</option>
@@ -214,13 +198,11 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 95px;">BOM</label>
-                                            <div class="layui-input-block" style="margin-left: 80px;">
-                                                <input type="text" class="layui-input" lay-verify="HBomName" name="HBomName" id="HBomName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" name="HBomID" id="HBomID" lay-verify="HBomID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnBom" id="btnBom" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
+                                            <label class="layui-form-label" style="width: 85px;">缁勭粐*</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 505px;">
+                                                <select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
                                             </div>
                                         </div>
                                     </div>
@@ -265,18 +247,6 @@
                                             <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="HPlanEndDate" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 80px;">
-                                            </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="padding-left: 80px;">
-                                            </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="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                             </div>
                                         </div>
                                     </div>
@@ -371,6 +341,40 @@
                                             <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="hdeletedate" id="hdeletedate" style="background-color:#efefef4d;" readonly>
+                                            </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: 75px;">
+                                                <input type="text" class="layui-input" lay-verify="HCenterName" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenter" id="btnHCenter" style="padding: 0 10px;float: right;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: 95px;">BOM</label>
+                                            <div class="layui-input-block" style="margin-left: 80px;">
+                                                <input type="text" class="layui-input" lay-verify="HBomName" name="HBomName" id="HBomName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" name="HBomID" id="HBomID" lay-verify="HBomID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnBom" id="btnBom" style="padding: 0 10px;float: right;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="padding-left: 80px;">
+                                            </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="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                             </div>
                                         </div>
                                     </div>
@@ -739,6 +743,7 @@
                         $("#HUnitName").val(checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О);//璁¢噺鍗曚綅鍚嶇О
                         $("#HWidth").val(checkStatus.data[0].HWidth);//骞呭
                         $("#HWeight").val(checkStatus.data[0].HWeight);//鍏嬮噸
+                        $("#HRemark").val(checkStatus.data[0].澶囨敞);//澶囨敞
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -1202,10 +1207,26 @@
             //闈炵┖楠岃瘉
             function AllowLoadData(data) {
 
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+
                 if ($("#HMaterNumber").val() == "") {
                     layer.msg("鐗╂枡缂栫爜娌℃湁閫夋嫨");
                     return false;
                 }
+
+                if ($("#HMaterName").val() == "") {
+                    layer.msg("鐗╂枡鍚嶇О涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                if ($("#HModel").val() == "") {
+                    layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
+                    return false;
+                }
+
                 //if ($("#HSourceName").val() == "") {
                 //    layer.msg("鐢熶骇璧勬簮娌℃湁閫夋嫨");
                 //    return false;
@@ -1215,15 +1236,40 @@
                     return false;
                 }
 
+
+                var HQty = $('#HQty').val();
+                if (HQty.substring(HQty.length - 1, HQty.length) == ".") {
+                    layer.msg("璁″垝鐢熶骇鏁伴噺鐨勭粨灏句笉鑳芥槸.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+\.?[0-9]*$/;
+                    if (!ref.test(HQty)) {
+                        layer.msg("璁″垝鐢熶骇鏁伴噺璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                        return;
+                    }
+                }
+
+                var HAuxQty = $('#HAuxQty').val();
+                if (HAuxQty.substring(HAuxQty.length - 1, HAuxQty.length) == ".") {
+                    layer.msg("杈呮暟閲忕殑缁撳熬涓嶈兘鏄�.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+\.?[0-9]*$/;
+                    if (!ref.test(HAuxQty)) {
+                        layer.msg("杈呮暟閲忚杈撴纭叆鏁板瓧锛�");
+                        return;
+                    }
+                }
+
                 //if ($("#HDeptName").val() == "") {
                 //    layer.msg("鐢熶骇杞﹂棿娌℃湁閫夋嫨");
                 //    return false;
                 //}
 
-                if ($("#HMainCenterIDName").val() == "") {
-                    layer.msg("宸ヤ綔涓績娌℃湁閫夋嫨");
-                    return false;
-                }
+                //if ($("#HMainCenterIDName").val() == "") {
+                //    layer.msg("宸ヤ綔涓績娌℃湁閫夋嫨");
+                //    return false;
+                //}
 
                 //if ($("#BomName").val() == "") {
                 //    layer.msg("BOM娌℃湁閫夋嫨");
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index d4096a7..1c153b2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -153,10 +153,10 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-lg" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
-                                <button type="button" class="layui-btn" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
-                                <button type="button" class="layui-btn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
@@ -415,14 +415,14 @@
                         { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
                         , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
                         , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
-                        , { field: '鐘舵��', title: '鐘舵��', sort: true, width: 170 }
-                        , { field: '鍞竴ID', title: '鍞竴ID', sort: true, width: 170 }
-                        , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true, width: 170 }
                         , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
                         , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 160 }
                         , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 160 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
+                        , { field: '鐘舵��', title: '鐘舵��', sort: true, width: 170 }
+                        , { field: '鍞竴ID', title: '鍞竴ID', sort: true, width: 170 }
+                        , { field: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', title: '鏄惁涓嬫帹鐢熸垚娴佽浆鍗�', sort: true, width: 170 }
                         , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
                         , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 115 }
                         , { field: '鐢熶骇浠诲姟鍗曟暟閲�', title: '鐢熶骇璁㈠崟鏁伴噺', width: 115, totalRow: true }
@@ -857,7 +857,7 @@
             //#region 鍒锋柊
             function get_Refresh() {
                 set_ClearQuery();
-                get_Display(sWhere);
+                get_FastQuery();
             }
             //#endregion
 
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
index a1539cd..e192455 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\344\274\232\350\256\241\346\234\237\351\227\264/Xt_AccountPeriodList.html"
@@ -68,7 +68,7 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>淇敼</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
@@ -77,7 +77,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
index 60fa129..772b139 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
@@ -115,11 +115,11 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
index 91421e3..24abdde 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\215\225\346\215\256\347\261\273\345\236\213/Xt_BillTypeList.html"
@@ -22,7 +22,7 @@
                                 <div style="padding: 10px;">
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
+                                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>-->
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
index 19bf91a..318af48 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\227\245\345\277\227\347\256\241\347\220\206/Xt_SystemLogList.html"
@@ -87,12 +87,12 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
index f90d97f..e6ed9e1 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\346\250\241\345\235\227\347\256\241\347\220\206/Xt_XtgnbList.html"
@@ -77,11 +77,11 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
index 501c8e4..8842dfb 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\263\273\347\273\237\345\217\202\346\225\260\347\256\241\347\220\206/Xt_SystemParameterList.html"
@@ -70,13 +70,13 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
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 a4db701..da9a894 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"
@@ -75,7 +75,7 @@
                                 <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;">鍗曟嵁鍙�</label>
+                                            <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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
@@ -83,7 +83,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+                                            <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="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
                                             </div>
@@ -94,16 +94,11 @@
                                                 <input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
                                             </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" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
-                                            </div>
-                                        </div>
+
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠g爜</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠g爜*</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -112,28 +107,23 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">浜у搧鍚嶇О</label>
+                                            <label class="layui-form-label" style="width: 75px;">浜у搧鍚嶇О*</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+                                            <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" id="HMaterModel" onmouseover="this.title=this.value"  style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="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="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
-                                            </div>
-                                        </div>
+
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁¢噺鍗曚綅</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">璁¢噺鍗曚綅*</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" name="HUnitName" lay-verify="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
@@ -143,108 +133,92 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓璺嚎澶х被</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" ></i>
-                                                </button>
+                                            <div class="layui-input-block" style="margin-left: 96px;">
+                                                <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
+                                                <input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
+                                                <!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="鏄惁鍚敤" lay-skin="primary" lay-filter="checkboxHUseFlag">
+        <input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
                                         <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: right;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;padding: 9px 18px;">宸ヤ綔涓績</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" style="padding: 0 10px;float: right;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;padding: 9px 18px;">鐢熶骇鐝粍</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;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: 115px;">
-                                                <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
-                                            </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="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
-                                            </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="HOrgID" id="HOrgID" lay-verify="HOrgID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </div>
-                                        </div>
+            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" lay-verify="HMainProcIDName" name="HMainProcIDName" id="HMainProcIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                <input type="hidden" class="layui-input" name="HMainProcID" id="HMainProcID" lay-verify="HMainProcID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: right;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;padding: 9px 18px;">宸ヤ綔涓績</label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" lay-verify="HMainCenterIDName" name="HMainCenterIDName" id="HMainCenterIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                <input type="hidden" class="layui-input" name="HMainCenterID" lay-verify="HMainCenterID" id="HMainCenterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnWorkCenter" id="btnWorkCenter" style="padding: 0 10px;float: right;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;padding: 9px 18px;">鐢熶骇鐝粍</label>
+            <div class="layui-input-block" style="margin-left: 77px;">
+                <input type="text" class="layui-input" name="HGroupIDName" lay-verify="HGroupIDName" id="HGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnGroup" id="" style="padding: 0 10px;float: right;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="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
-                                            </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="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
-                                                <!--<input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">-->
-                                            <!--</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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
-                                            </div>
-                                        </div>-->
+            <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="HMainWorkQty" lay-verify="HMainWorkQty" id="HMainWorkQty" value="0" onmouseover="this.title=this.value">
+            </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="HMainUnitTime" lay-verify="HMainUnitTime" id="HMainUnitTime" value="0">-->
+                                        <!--<input type="hidden" value="灏忔椂" name="HMainTimeUnit" id="HMainTimeUnit">-->
+                                        <!--</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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
+            </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="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">--> <!--style="background-color:#efefef4d;"-->
-                                            <!--</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="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">--> <!--style="background-color:#efefef4d;"-->
-                                            <!--</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" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">--> <!--style="background-color:#efefef4d;"-->
-                                            <!--</div>
-                                        </div>-->
+            <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="HStdSourceQty" id="HStdSourceQty" lay-verify="HStdSourceQty" value="0">-->
+                                        <!--style="background-color:#efefef4d;"-->
+                                        <!--</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="HAddSourceRate" id="HAddSourceRate" lay-verify="HAddSourceRate" value="0">-->
+                                        <!--style="background-color:#efefef4d;"-->
+                                        <!--</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" lay-verify="HDelSourceRate" name="HDelSourceRate" id="HDelSourceRate" value="0">-->
+                                        <!--style="background-color:#efefef4d;"-->
+                                        <!--</div>
+        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -254,21 +228,19 @@
                                                 <input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style=" width: 500px;">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <div class="layui-input-block" style="margin-left: 96px;">
-                                                <input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="鏄惁榛樿宸ヨ壓">
-                                                <input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
-                                                <!--<input type="checkbox" name="checkboxHUseFlag" id="checkboxHUseFlag" title="鏄惁鍚敤" lay-skin="primary" lay-filter="checkboxHUseFlag">
-            <input type="hidden" value="false" name="HUseFlag" id="HUseFlag">-->
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <div class="layui-input-block" style="margin-left: 185px;">
-                                                <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo"  title="杞伐搴�" >
-                                                <input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo" >
-                                            </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; width: 501px;">
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -372,6 +344,50 @@
                                                 <input type="text" class="layui-input" name="HMaterTexture" lay-verify="HMaterTexture" id="HMaterTexture" value="" onmouseover="this.title=this.value">
                                             </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" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
+                                            </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="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓璺嚎澶х被</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" style="padding: 0 10px;float: right;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: 115px;">
+                                                <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
+                                            </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="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block" style="margin-left: 185px;">
+                                                <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�">
+                                                <input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -473,7 +489,7 @@
                 , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                 , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                 , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
-                , "HWHID": 0, "HWHName": ""
+                , "HWHID": 0, "HWHName": "","HRemark":""
             }];
             var HModName = "Gy_RoutingBill";
             //#endregion
@@ -492,60 +508,62 @@
                     , { field: 'HProcNo', title: '娴佹按鍙�', edit: 'text' }
                       // , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
                     , { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
-                    , { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
                     , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', edit: 'text', event: "CheckHCenterID" }//涓嶅~
                     // , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
                     , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
+                    , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     // , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
                     , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
                     , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
-                    , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
                     , { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
-                    //, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
-                    , { field: 'HBadWHName', title: '涓嶈壇鍝佷粨', edit: 'text', event: "HBadWHID" }//f7
-                    // , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
-                    , { field: 'HWasterWHName', title: '鎶ュ簾鍝佷粨', edit: 'text', event: "HWasterWHID" }//f7
-                    // , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
-                    , { field: 'HWHName', title: '鑹搧浠�', edit: 'text', event: "HWHID" }//f7
-                    , { field: 'HMouldNo', title: '妯″叿缂栧彿', edit: 'text' }
-                    , { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
-                    , { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
-                    , { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
-                    , { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
-                    , { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
-                    , { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
-                    //, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
-                    , { field: 'HCenterID_SName', title: '浜х嚎涓績', edit: 'text', event: "CheckHCenterID_S" }//f7
-                    , { field: 'HWorkQty_S', title: '浜х嚎浜ц兘', edit: 'text' }
-                    , { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text' }
-                    , { field: 'HReadyTime', title: '鍑嗗鏃堕棿', edit: 'text' }
-                    , { field: 'HQueueTime', title: '鎺掗槦鏃堕棿', edit: 'text' }
-                    , { field: 'HMoveTime', title: '杞Щ鏃堕棿', edit: 'text' }
-                    , { field: 'HChangeMould', title: '鎹㈡ā鏃堕棿', edit: 'text' }
-                    , { field: 'HPackStd', title: '鍛ㄨ浆绠辨爣鍑�', edit: 'text' }
-                    , { field: 'HPack', title: '鍛ㄨ浆绠�', edit: 'text' }
-                    , { field: 'HPutArea', title: '鏆傛斁鍖�', edit: 'text' }
-                    , { field: 'HMyWorkDays', title: '鐢熶骇鍛ㄦ湡', edit: 'text' }
-                    , { field: 'HMyFixWorkDays', title: '鍥哄畾鐢熶骇澶╂暟', edit: 'text' }
-                    // , { field: 'HOverRate', title: '瓒呴姣斾緥', edit: 'text' }
-                    , { field: 'HNextProcFlag', title: '涓嬮亾娴佽浆宸ュ簭', templet: "#HNextProcFlag" }//chenbox
-                    , { field: 'HFlowProc', title: '娴佽浆宸ュ簭', templet: "#HFlowProc" }//chenbox
-                    , { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
-                    , { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
-                    , { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
-                    , { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
-                    , { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
-                    , { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
-                    , { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
-                    , { field: 'HBeginDayQty', title: '寮�宸ヤ綑閲忥紙澶╂暟锛�', edit: 'text' }
-                    , { field: 'HBeginFixQty', title: '寮�宸ヤ綑閲忥紙鍥烘暟锛�', edit: 'text' }
-                    , { field: 'HFixWorkDays', title: '涓婇亾鍥哄畾澶╂暟', edit: 'text' }
-                    , { field: 'HTrunWorkDays', title: '涓婇亾寰幆鍛ㄦ湡', edit: 'text' }
-                    , { field: 'HReadyTimes', title: '鏈亾鍑嗗鏃堕棿', edit: 'text' }
-                    , { field: 'HICMOReadyTimes', title: '鎹㈠崟鍑嗗鏃堕棿', edit: 'text' }
-                    , { field: 'HAutoTrunFlag', title: '鑷姩绉昏浆', templet: "#HAutoTrunFlag" }//chenbox
-                    , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
-                    , { field: 'HProcWorkNum', title: '绋嬪簭鍙�', edit: 'text' }
+
+                    //, { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
+                    ////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
+                    //, { field: 'HBadWHName', title: '涓嶈壇鍝佷粨', edit: 'text', event: "HBadWHID" }//f7
+                    //// , { field: 'HWasterWHID', title: 'HWasterWHID', hide: true }//, hide: true
+                    //, { field: 'HWasterWHName', title: '鎶ュ簾鍝佷粨', edit: 'text', event: "HWasterWHID" }//f7
+                    //// , { field: 'HWHID', title: 'HWHID', hide: true }//, hide: true
+                    //, { field: 'HWHName', title: '鑹搧浠�', edit: 'text', event: "HWHID" }//f7
+                    //, { field: 'HMouldNo', title: '妯″叿缂栧彿', edit: 'text' }
+                    //, { field: 'HPicNum', title: '鍥剧焊缂栧彿', edit: 'text' }
+                    //, { field: 'HTimeUnit', title: '鏃堕棿鍗曚綅', edit: 'text' }
+                    //, { field: 'HUnitTime', title: '杩愯鏃堕棿', edit: 'text' }
+                    //, { field: 'HWorkQty', title: '鍔犲伐鏁伴噺', edit: 'text' }//榛樿
+                    //, { field: 'HPassRate', title: '鑹巼', edit: 'text' }//榛樿
+                    //, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
+                    ////, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
+                    //, { field: 'HCenterID_SName', title: '浜х嚎涓績', edit: 'text', event: "CheckHCenterID_S" }//f7
+                    //, { field: 'HWorkQty_S', title: '浜х嚎浜ц兘', edit: 'text' }
+                    //, { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text' }
+                    //, { field: 'HReadyTime', title: '鍑嗗鏃堕棿', edit: 'text' }
+                    //, { field: 'HQueueTime', title: '鎺掗槦鏃堕棿', edit: 'text' }
+                    //, { field: 'HMoveTime', title: '杞Щ鏃堕棿', edit: 'text' }
+                    //, { field: 'HChangeMould', title: '鎹㈡ā鏃堕棿', edit: 'text' }
+                    //, { field: 'HPackStd', title: '鍛ㄨ浆绠辨爣鍑�', edit: 'text' }
+                    //, { field: 'HPack', title: '鍛ㄨ浆绠�', edit: 'text' }
+                    //, { field: 'HPutArea', title: '鏆傛斁鍖�', edit: 'text' }
+                    //, { field: 'HMyWorkDays', title: '鐢熶骇鍛ㄦ湡', edit: 'text' }
+                    //, { field: 'HMyFixWorkDays', title: '鍥哄畾鐢熶骇澶╂暟', edit: 'text' }
+                    //// , { field: 'HOverRate', title: '瓒呴姣斾緥', edit: 'text' }
+                    //, { field: 'HNextProcFlag', title: '涓嬮亾娴佽浆宸ュ簭', templet: "#HNextProcFlag" }//chenbox
+                    //, { field: 'HFlowProc', title: '娴佽浆宸ュ簭', templet: "#HFlowProc" }//chenbox
+                    //, { field: 'HSubStdEmpQty', title: '鏍囧噯浜烘暟', edit: 'text' }
+                    //, { field: 'HSubCanUseSourceQty', title: '鍙搷浣滆澶囨暟', edit: 'text' }
+                    //, { field: 'HFixPrice', title: '鐝骇瀹氶', edit: 'text' }//榛樿
+                    //, { field: 'HProcPrice', title: '宸ュ簭宸ヤ环', edit: 'text' }//榛樿
+                    //, { field: 'HBadPrice', title: '涓嶅悎鏍煎崟浠�', edit: 'text' }//榛樿
+                    //, { field: 'HWasterPrice', title: '鎶ュ簾鍗曚环', edit: 'text' }//榛樿
+                    //, { field: 'HStdFlag', title: '鏍囧噯瀹氶', templet: "#HStdFlag" }//chenbox
+                    //, { field: 'HBeginDayQty', title: '寮�宸ヤ綑閲忥紙澶╂暟锛�', edit: 'text' }
+                    //, { field: 'HBeginFixQty', title: '寮�宸ヤ綑閲忥紙鍥烘暟锛�', edit: 'text' }
+                    //, { field: 'HFixWorkDays', title: '涓婇亾鍥哄畾澶╂暟', edit: 'text' }
+                    //, { field: 'HTrunWorkDays', title: '涓婇亾寰幆鍛ㄦ湡', edit: 'text' }
+                    //, { field: 'HReadyTimes', title: '鏈亾鍑嗗鏃堕棿', edit: 'text' }
+                    //, { field: 'HICMOReadyTimes', title: '鎹㈠崟鍑嗗鏃堕棿', edit: 'text' }
+                    //, { field: 'HAutoTrunFlag', title: '鑷姩绉昏浆', templet: "#HAutoTrunFlag" }//chenbox
+                    //, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', edit: 'text' }
+                    //, { field: 'HProcWorkNum', title: '绋嬪簭鍙�', edit: 'text' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
                 //, done: function (res, curr, count) {
@@ -800,7 +818,7 @@
                     , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                     , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                     , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
-                    , "HWHID": 0, "HWHName": ""
+                    , "HWHID": 0, "HWHName": "", "HRemark": ""
                 };
                 switch (obj.event) {
                     case 'btn-AddLine':
@@ -1120,7 +1138,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐗╂枡琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList_LSQP.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1497,7 +1515,7 @@
                                  
                                     //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
                                     var WorkCente = [];
-                                    var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О  from Gy_Process p left join Gy_WorkCenter a on p.HNumber = a.HNumber and a.HUSEORGID=p.HUSEORGID where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+                                    var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
                                     $.ajax({
                                         type: "GET",
                                         url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -1546,7 +1564,7 @@
                                                 , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                                                 , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                                                 , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
-                                                , "HWHID": 0, "HWHName": ""
+                                                , "HWHID": 0, "HWHName": "", "HRemark": ""
                                             })
                                             j++;
                                         }
@@ -1824,7 +1842,7 @@
                                     , "HBeginDayQty": d.data[i].寮�宸ヤ綑閲忓ぉ鏁�, "HBeginFixQty": d.data[i].寮�宸ヤ綑閲忓浐鏁�, "HFixWorkDays": d.data[i].涓婇亾鍥哄畾澶╂暟, "HTrunWorkDays": d.data[i].涓婇亾寰幆鍛ㄦ湡, "HReadyTimes": d.data[i].鏈亾鍑嗗鏃堕棿
                                     , "HICMOReadyTimes": d.data[i].鎹㈠崟鍑嗗鏃堕棿, "HAutoTrunFlag": d.data[i].鑷姩绉昏浆, "HTechnologyParameter": d.data[i].宸ヨ壓鍙傛暟, "HPicNum": d.data[i].鍥剧焊缂栧彿, "HProcCheckNote": d.data[i].鏈伐搴忕‘璁よ褰�
                                     , "HProcWorkNum": d.data[i].绋嬪簭鍙�, "HBadWHID": d.data[i].HBadWHID, "HBadWHName": d.data[i].HBadWHName, "HWasterWHID": d.data[i].HWasterWHID, "HWasterWHName": d.data[i].HWasterWHName
-                                    , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName
+                                    , "HWHID": d.data[i].HWHID, "HWHName": d.data[i].HWHName, "HRemark": d.data[i].琛ㄤ綋澶囨敞
                                 }
                             )
                         }
@@ -1916,6 +1934,14 @@
                 }
                 if ($("#HMaterNumber").val() == "") {
                     layer.msg("浜у搧浠g爜娌℃湁閫夋嫨!");
+                    return false;
+                }
+                if ($("#HMaterName").val() == "") {
+                    layer.msg("浜у搧鍚嶇О涓嶈兘涓虹┖!");
+                    return false;
+                }
+                if ($("#HMaterModel").val() == "") {
+                    layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
                     return false;
                 }
                 if ($("#HUnitName").val() == "") {
@@ -2051,10 +2077,8 @@
                     async: false,
                     success: function (data1) {
                         if (data1.data.length != 0) {
-
-
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
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 ca4b5ea..fdb8bff 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"
@@ -257,54 +257,54 @@
                         { type: 'checkbox', fixed: 'left' }
                         /*    { field: 'hmainid', title: 'hmainid', width: 110 }*/
                         , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
                         , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
-                        //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
                         , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 160 }
                         , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
                         , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
                         , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 115 }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                        , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
                         , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
-                        , { field: '缁勭粐', title: '缁勭粐' }
-                        //, { field: 'hsubid', title: 'hsubid', width: 80 }
                         , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
-                        , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
-                        //, { field: 'hprocid', title: 'hprocid', width: 105 }
                         , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
                         , { field: '宸ュ簭', title: '宸ュ簭' }
-                        //, { field: 'HSupID', title: 'HSupID', width: 105 }
-                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                        //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
                         , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', width: 115 }
                         , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
-                        , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
-                        , { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
-                        , { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
-                        , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
-                        , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
-                        , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
-                        , { field: '鑹巼', title: '鑹巼' }
-                        , { field: '绱鑹巼', title: '绱鑹巼' }
-                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
                         , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
                         , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195 }
                         , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
                         , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180 }
                         , { field: '淇敼浜�', title: '淇敼浜�' }
                         , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 180 }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
-                        //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
-                        //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
-                        //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
-                        //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
-                        , { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
-                        //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
-                        , { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
-                        , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+                        , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
+                        //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                        ////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
+                        //, { field: '缁勭粐', title: '缁勭粐' }
+                        ////, { field: 'hsubid', title: 'hsubid', width: 80 }
+                        //, { field: '濮斿鏍囪', title: '濮斿鏍囪' }
+                        ////, { field: 'hprocid', title: 'hprocid', width: 105 }
+                        ////, { field: 'HSupID', title: 'HSupID', width: 105 }
+                        //, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+                        //, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                        ////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
+                        //, { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
+                        //, { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
+                        //, { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
+                        //, { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
+                        //, { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
+                        //, { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
+                        //, { field: '鑹巼', title: '鑹巼' }
+                        //, { field: '绱鑹巼', title: '绱鑹巼' }
+                        //, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                        //, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                        //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+                        ////, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
+                        ////, { field: 'HGroupID', title: 'HGroupID', width: 105 }
+                        ////, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
+                        ////, { field: 'HSourceID', title: 'HSourceID', width: 105 }
+                        //, { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
+                        ////, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
+                        //, { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭', width: 150 }
+                        //, { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
                     ]]
                 };
             }
@@ -447,6 +447,7 @@
                 if (HOrgID) {
                     sWhere += " and HOrgID = '" + HOrgID + "'";
                 }
+                sWhere += " and 宸ュ簭浠g爜 != '9999'"
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
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_RoutingBillListQuery.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_RoutingBillListQuery.html"
index e049e9c..234bb2b 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_RoutingBillListQuery.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_RoutingBillListQuery.html"
@@ -158,6 +158,8 @@
             var option = [];
             var option2 = [];
             var HModName = "Gy_RoutingBillListQuery";
+            var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "宸ヤ綔", "HMainProcID", "宸ュ簭鍚嶇О", "涓昏繍琛屾椂闂�", "杩愯鏃堕棿鍗曚綅", "涓诲姞宸ユ暟閲�", "鏉愯川", "鍥惧彿鐗堟湰", "HMainGroupID", "鐝粍", "宸ヤ环", "鏍囧噯璧勬簮鏁�", "鍔犺祫婧愬閲�", "鍑忚祫婧愬噺閲�", "HItemID", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData2 = ["hmainid", "hsubid", "绋嬪簭鍙�", "鏈伐搴忕‘璁よ褰�", "鑷姩绉昏浆", "鎹㈠崟鍑嗗鏃堕棿", "鏈亾鍑嗗鏃堕棿", "涓婇亾寰幆鍛ㄦ湡", "涓婇亾鍥哄畾澶╂暟", "寮�宸ヤ綑閲忥紙鍥烘暟锛�", "寮�宸ヤ綑閲忥紙澶╂暟锛�", "鏍囧噯瀹氶", "鎶ュ簾鍗曚环", "涓嶅悎鏍煎崟浠�", "宸ュ簭宸ヤ环", "鐝骇瀹氶", "鍙搷浣滆澶囨暟", "鏍囧噯浜烘暟", "娴佽浆宸ュ簭", "涓嬮亾娴佽浆宸ュ簭", "鍥哄畾鐢熶骇澶╂暟", "鐢熶骇鍛ㄦ湡", "鏆傛斁鍖�", "鍛ㄨ浆绠�", "鍛ㄨ浆绠辨爣鍑�", "鎹㈡ā鏃堕棿", "杞Щ鏃堕棿", "鎺掗槦鏃堕棿", "鍑嗗鏃堕棿", "浜х嚎浜烘暟", "浜х嚎浜ц兘", "浜х嚎涓績", "鑹巼", "鍔犲伐鏁伴噺", "杩愯鏃堕棿", "鏃堕棿鍗曚綅", "鍥剧焊缂栧彿", "妯″叿缂栧彿", "鑹搧浠�", "鎶ュ簾鍝佷粨", "涓嶈壇鍝佷粨", "宸ュ簭绫诲瀷", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "宸ユ", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "绱鑹巼", "瓒呴姣斾緥", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "鍔犲伐鍗曚环", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName", "渚涘簲鍟嗕唬鐮�","渚涘簲鍟�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
             //#endregion
 
@@ -400,7 +402,7 @@
                             col.push({ type: 'checkbox', fixed: 'left' });
                             for (var i = 0; i < data.length; i++) {
                                 // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
-                                if ($.inArray(data[i].name, "") > -1) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
                                 else {
@@ -458,7 +460,7 @@
                             col.push({ type: 'checkbox', fixed: 'left' });
                             for (var i = 0; i < data.length; i++) {
                                 // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
-                                if ($.inArray(data[i].name, "") > -1) {
+                                if ($.inArray(data[i].name, titleData2) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
                                 else {
@@ -498,7 +500,6 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                DisPlay_HideColumn_Sec();
             });
 
 
@@ -766,7 +767,6 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
@@ -849,7 +849,6 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            //var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 9435da1..7f8516d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -80,18 +80,17 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                             </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
-                                            </div>
-                                        </div>
+                                        </div>                                       
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
@@ -157,17 +156,18 @@
         </div>
     </div>-->
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鏈嚭绔欐暟閲�</label>
                                             <div class="layui-input-block">
                                                 <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;" id="NoOutboundHqty">
                                             </div>
                                         </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index eed01da..094c691 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -29,6 +29,18 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鎿嶄綔鍛樹唬鐮�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鎿嶄綔鍛樺悕绉�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HEmpName" id="HEmpName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
                                     <label class="layui-form-label">鐘舵��</label>
                                     <div class="layui-input-block">
                                         <select name="HStatus" lay-filter="HStatus" style="width:190px;">
@@ -39,22 +51,24 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
-                                    <div class="layui-input-block">
-                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                <div class="layui-row" style="margin-top:5px">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                        <div class="layui-input-block">
+                                            <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
-                                    <div class="layui-input-block">
-                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                        <div class="layui-input-block">
+                                            <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                        </div>
                                     </div>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    </button>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                 </div>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                </button>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                 <div class="layui-colla-content">
                                     <div class="layui-row">
                                         <div class="layui-inline">
@@ -176,7 +190,7 @@
             var option = [];
 
             var HModName = "JIT_LiftMaterPlaBillnList";
-            var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HMaterID", "HUnitID", "HSourceID","hmainid","HProcExchInterID","HProcID","HunitID","HEmpID","HGroupID","HProcExchEntryID","HSubID","HICMOInterID","閫夋嫨","鏌ヨ鏃ユ湡","鎴愭湰瀵硅薄","鎴愭湰瀵硅薄鍚嶇О","HBillStatus","HBillType","HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
 
@@ -601,6 +615,8 @@
                 $("#Comparator").val("0");
                 $("#HNumber").val("");
                 $("#HName").val("");
+                $("#HEmpNumber").val("");
+                $("#HEmpName").val("");
                 form.render('select');
                 sWhere = "";
             }
@@ -619,6 +635,8 @@
                 var ColContent = $("#ColContent").val();
                 var HNumber = $("#HNumber").val(); //浜у搧浠g爜 鍗崇墿鏂欑紪鐮�
                 var HName = $("#HName").val(); //褰撳墠宸ュ簭
+                var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮�
+                var HEmpName = $("#HEmpName").val(); //鎿嶄綔鍛樺悕绉�
 
                 if (ColName != 0 && Comparator != 0) {
                     var com = "";
@@ -669,6 +687,12 @@
                 if (HName) {
                     sWhere += " and 褰撳墠宸ュ簭 like '%" + HName + "%'";
                 }
+                if (HEmpNumber) {
+                    sWhere += " and 鎿嶄綔鍛樹唬鐮� like '%" + HEmpNumber + "%'";
+                }
+                if (HEmpName) {
+                    sWhere += " and 鎿嶄綔鍛� like '%" + HEmpName + "%'";
+                }
 
                 if (HStatus) {
                     switch (HStatus) {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_QiaoYi.html"
new file mode 100644
index 0000000..699a5db
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_QiaoYi.html"
@@ -0,0 +1,2134 @@
+锘�<!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/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <!--鑷畾涔夋牱寮�-->
+    <style>
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+    </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 class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">淇敼</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage"></i>姹囨姤</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-RK" lay-filter="btn-RK" id="btn-RK"></i>鍏ュ簱</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-BF" lay-filter="btn-BF" id="btn-BF"></i>鎶ュ簾</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_HideColumn" id="set_HideColumn">鍒楄缃�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <h2>宸ュ簭鍑虹珯姹囨姤鍗�</h2>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label"><span style="color:red;">*</span>鏉″舰鐮�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">闄勪欢淇℃伅</li>
+                            <li lay-id="4" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <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-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>涓婇亾宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpProcName" id="HUpProcName" placeholder="涓婇亾宸ュ簭" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">褰撳墠宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佹按鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HProcNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HProcID" id="HProcID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鍚堟牸鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="HQty" id="HQty">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HSourceID" id="HSourceID">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>浜у搧浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMateriaID-BT" id="HMateriaID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+
+
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鑱屽憳2</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpNumber2" id="HEmpNumber2">
+                                                <input type="text" class="layui-input" name="HEmpName2" id="HEmpName2" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT2" id="HEmployeeID-BT2" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HEmpID2" id="HEmpID2">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鑱屽憳3</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpNumber3" id="HEmpNumber3">
+                                                <input type="text" class="layui-input" name="HEmpName3" id="HEmpName3" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT3" id="HEmployeeID-BT3" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HEmpID3" id="HEmpID3">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鑱屽憳4</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpNumber4" id="HEmpNumber4">
+                                                <input type="text" class="layui-input" name="HEmpName4" id="HEmpName4" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT4" id="HEmployeeID-BT4" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HEmpID4" id="HEmpID4">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鑱屽憳5</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpNumber5" id="HEmpNumber5">
+                                                <input type="text" class="layui-input" name="HEmpName5" id="HEmpName5" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT5" id="HEmployeeID-BT5" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HEmpID5" id="HEmpID5">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍑虹珯鏃堕棿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HStationOutTime" id="HStationOutTime" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妯$┐鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMouldNum" id="HMouldNum" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮2</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName2" id="HSourceName2" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HSourceID2" id="HSourceID2">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮3</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName3" id="HSourceName3" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HSourceID3" id="HSourceID3">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮4</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName4" id="HSourceName4" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HSourceID4" id="HSourceID4">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮5</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName5" id="HSourceName5" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="" id="" style="width: 40px; background-color: gainsboro;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;color:black;"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HSourceID5" id="HSourceID5">
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏍哥畻宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ユ椂</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁惧娓呭崟</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="" id="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>-->
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">褰撳墠宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>-->
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏈嚭绔欐暟閲�</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;" id="NoOutboundHqty">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">妫�楠屽憳</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HQCCheckName" id="HQCCheckName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSecManagerID-BT" id="HSecManagerID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HQCCheckID" id="HQCCheckID">
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏍哥畻宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
+                                            </div>
+                                        </div>-->
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"></label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHLastSubProc" id="checkboxHLastSubProc" title="杞笅閬�" lay-skin="primary" lay-filter="checkboxHLastSubProc" checked disabled>
+                                                <input type="hidden" value="true" name="HLastSubProc" id="HLastSubProc">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鎿嶄綔鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HEmpID" id="HEmpID">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label" style="color:red;"><span style="color:red;">*</span>鎶ュ簾鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇鐝粍</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" value="0" name="HGroupID" id="HGroupID">
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ヤ綔涓績</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ユ椂</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁惧娓呭崟</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row">
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓嶈壇鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" value="0" name="" id="">
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row">
+                                        <!--<div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>-->
+                                    </div>
+
+                                </div>
+                            </div>
+                            <!--闄勪欢淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-upload">
+                                        <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+                                        <div class="layui-upload-list">
+                                            <table class="layui-table">
+                                                <thead>
+                                                    <tr>
+                                                        <th>鏂囦欢鍚�</th>
+                                                        <th>澶у皬</th>
+                                                        <th>鐘舵��</th>
+                                                        <th>鎿嶄綔</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="ProImgByList">
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
+                    <div class="layui-tab layui-tab-card">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">娴佽浆鍗�</li>
+                            <li>宸ヨ壓鍙傛暟娓呭崟</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <!--宸ヨ壓娴佺▼-->
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--宸ヨ壓鍙傛暟娓呭崟-->
+                                <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                            </div>
+                        </div>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
+                    <input type="hidden" name="eventType" id="eventType" value="Add">
+                    <input type="hidden" name="HPlanPieceQty" id="HPlanPieceQty" value="0"><!--杩涚珯PNL鏁�-->
+                    <input type="hidden" name="HPieceQty" id="HPieceQty" value="0"><!--杩涚珯PCS鏁�-->
+                    <input type="hidden" name="HBadPNL" id="HBadPNL" value="0"><!--鎶ュ簾PNL鏁�-->
+                    <input type="hidden" name="HDSQty" id="HDSQty" value="0"><!--鎶樺集鍒�鏁�-->
+                    <input type="hidden" name="HChongQty" id="HChongQty" value="0"><!--NCT鍐叉鏁�-->
+                    <input type="hidden" name="HPriceRate" id="HPriceRate" value="0"><!--绯绘暟-->
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , upload = layui.upload
+                , form = layui.form
+                , element = layui.element;
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+            $("#HBarCode").focus();
+            var option;
+            var HModName = "Cj_StationOutBill";
+            var FirstEndHProcNo = 0; // 榛樿0  棣栭亾宸ュ簭1 鏈亾宸ュ簭2
+
+
+            //杩涘叆椤甸潰鍏ュ簱鎸夐挳缃伆
+            //$('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true);
+
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+            /* 1.鏃犳簮鍗曟柊澧�
+             * 2.鏈夋簮鍗曟柊澧�
+             * 3.缂栬緫
+             * 4.娴忚
+             * 5.鍙樻洿
+             */
+            //鑾峰彇鍙傛暟
+            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;
+            }
+            var params = getUrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+                var closeType = 2;  //鍏抽棴绫诲瀷
+            } else if (params[params[0]] == 2) { //宸ュ簭鍑虹珯姹囨姤鍗�
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var HBillNo = params[params[1]];//婧愬崟鍗曞彿
+                var HProcNo = params[params[2]];//娴佹按鍙�
+
+                var HBarCode = HBillNo;//鏉″舰鐮�
+                var sProcNo = HProcNo;//娴佹按鍙�
+
+                if (HBarCode != "undefined" && sProcNo != "undefined") {
+                    $("#HBarCode").val(HBarCode);
+                    $('#HProcNo').val(sProcNo);
+                    txtHBarCode_KeyDown(HBarCode);
+                    txtHProcNo_KeyDown(HBarCode, sProcNo);
+                    get_DisplayTech(HBillNo);
+                }
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var HBillNo = params[params[3]];  //鑾峰彇鍗曟嵁鍙�
+                var closeType = params[params[4]];  //鍏抽棴绫诲瀷
+            }
+            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+
+            var titleData2 = ["HItemID"]  //闅愯棌鍒楋紙宸ヨ壓鍙傛暟娓呭崟锛�
+
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [ //琛ㄥご
+                    { type: 'numbers', title: '搴忓彿', totalRow: true }
+                    , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
+                    , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+                    , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
+                    , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                    , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                    , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+                    , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
+                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                    , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                    , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
+                    , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 400
+                    , cols: [columns]
+                    , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                    ,loading:false
+                    , done: function (res, curr, count) {
+                        option.data = res.data;
+                        //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                        $('.layui-form-select').find('input').unbind("blur");
+                        //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                        $('tr').each(function (e) {
+                            var $cr = $(this);
+                            var dataIndex = $cr.attr("data-index");
+                            $.each(option.data, function (index, value) {
+                                if (value.LAY_TNDEX == dataIndex) {
+                                    $cr.find('input').val(value.isEntrust);
+                                }
+                            });
+                        });
+                    }
+                };
+
+            }
+
+            //鍒ゆ柇鏄惁鏂板
+            if (OperationType == 1 || OperationType == 2) {
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                //鑾峰彇鏈�澶у崟鎹彿
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3791' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
+                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
+                $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
+                GetDefValByUser();
+            }
+            else if (OperationType == 3) {
+                $("#eventType").val("Modify");
+                RoadBillMain(linterid);
+                $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
+                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
+                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
+            }
+            else if (OperationType == 4) {
+                RoadBillMain(linterid);
+                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
+                $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+                $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+                //RoadBillSub(linterid);
+            }
+
+
+            //鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationOutBill/GetStationOutBill",
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (result) {
+                        if (result.code == 1) {
+                            var data = result.data[0];
+                            txtHBarCode_KeyDown(data.HBarCode);
+                            txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
+                            get_DisplayTech(data.HInterID);
+                            form.val("formData", { //HGroupName
+                                "HInterID": data.HInterID,
+                                "HBillNo": data.HBillNo,
+                                "HBarCode": data.HBarCode,
+                                "HProcNo": data.HProcNo,
+                                "HQty": data.HQty,
+                                "HWasterQty": data.HWasterQty,
+                                "HWorkTimes": data.HWorkTimes,
+                                "HGroupID": data.HGroupID,
+                                "HGroupName": data.HGroupName,
+                                "HSourceID": data.HSourceID,
+                                "HSourceName": data.HSourceName,
+                                "HQCCheckID": data.HQCCheckID,
+                                "HQCCheckName": data.HQCCheckName,
+                                "HEmpID": data.HEmpID,
+                                "HEmpName": data.HEmpName,
+                                "HEmpID2": data.HEmpID2,
+                                "HEmpName2": data.HEmpName2,
+                                "HEmpID3": data.HEmpID3,
+                                "HEmpName3": data.HEmpName3,
+                                "HEmpID4": data.HEmpID4,
+                                "HEmpName4": data.HEmpName4,
+                                "HEmpID5": data.HEmpID5,
+                                "HEmpName5": data.HEmpName5,
+                                "HRemark": data.HRemark,
+                                "HMaker": data.HMaker,
+                                "HMakeDate": Pub_Format(data.HMakeDate, "yyyy-MM-dd hh:mm:ss"),
+                                "HUpDater": data.HUpDater,
+                                "HUpDateDate": data.HUpDater == "" ? "" : Pub_Format(data.HUpDateDate, "yyyy-MM-dd hh:mm:ss"),
+                                "HChecker": data.HChecker,
+                                "HCheckDate": data.HChecker == "" ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss")
+                            });
+                            if (data.鏄惁瀹℃牳 == "true") {
+                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+                                $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+                            } else {
+                                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+                                $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+                            }
+                            if (OperationType == 3) {
+                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+                                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+                            }
+                            PicUpload();
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                        }
+                    }
+                    , error: function () {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触");
+                    }
+                })
+            }
+
+            //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+            function GetDefValByUser() {
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+                    type: "GET",
+                    data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var data = result.data[0];
+
+                        form.val("formData", {
+                            "HSourceID": data.HSourceID,
+                            "HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+                            "HGroupID": data.HGroupID,
+                            "HGroupName": data.鐢熶骇鐝粍鍚嶇О,
+                            "HCenterID": data.HWorkCenterID,
+                            "HCenterName": data.宸ヤ綔涓績鍚嶇О,
+                            "HEmpID": data.HEmpID,
+                            "HEmpNumber": data.鎿嶄綔鍛樹唬鐮�,
+                            "HEmpName": data.鎿嶄綔鍛樺悕绉�
+                        });
+                        layer.close(index);
+                    }
+                    , error: function () {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触");
+                    }
+                })
+            }
+            //#endregion
+
+            //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+            var HProcExchBillNoFlag = false;
+            //鍒濆鍩烘湰淇℃伅璧嬪��
+            $("#HStationOutTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+            //$("#HEmpID").val(sessionStorage["Czybm"]);
+            //$("#HEmpName").val(sessionStorage["HUserName"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+            $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                var HBarCode = $('#HBarCode').val();
+                if (event.keyCode == 13) {
+                    if (!HBarCode) {
+                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                        return;
+                    }
+                    txtHBarCode_KeyDown(HBarCode);
+                }
+            });
+
+            function txtHBarCode_KeyDown(HBarCode) {
+                var barNo = HBarCode.substr(0, 3);
+                if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
+                    layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
+                    layer.close(index);
+                    return;
+                }
+
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "Out" },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+
+                            switch (barNo) {
+                                case "HCX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                    });
+                                    break;
+                                case "SBM":
+                                    layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
+                                    break;
+                                case "JYM"://妫�楠屽憳
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HQCCheckID": data.HItemID,
+                                        "HQCCheckName": data.鑱屽憳鍚嶇О
+                                        //"HGroupID": data.鐝粍ID,
+                                        //"HGroupName": data.鐝粍鍚嶇О
+                                    });
+                                    break;
+                                case "GRM"://鎿嶄綔鍛橈紝鎺ユ敹浜�
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鑱屽憳浠g爜,
+                                        "HEmpName": data.鑱屽憳鍚嶇О,
+                                        "HGroupID": data.鐝粍ID,
+                                        "HGroupName": data.鐝粍鍚嶇О
+                                    });
+                                    break;
+                                //case "CGM":
+                                //    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                //        "HEmpID": data.HItemID,
+                                //        "HEmpNumber": data.鑱屽憳浠g爜,
+                                //        "HEmpName": data.鑱屽憳鍚嶇О
+                                //    });
+                                //    break;
+                                case "HWH":
+                                    var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
+                                    layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
+                                    break;
+                                case "HSP":
+                                    layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" + "浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
+                                    break;
+                                case "PRO":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HProcID": data.HItemID,
+                                        "HProcName": data.宸ュ簭鍚嶇О,
+                                        "HProcNo": data.娴佹按鍙�,
+                                        "lngBillSubKey": data.hsubid,
+                                        "HCenterName": data.宸ヤ綔涓績,
+                                        "HCenterID": data.HCenterID
+                                    });
+                                    break;
+                                case "WLM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HMaterID": data.HItemID,
+                                        "HMaterName": data.鐗╂枡鍚嶇О,
+                                        "HMaterNumber": data.鐗╂枡浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    });
+                                    break;
+                                case "GXL":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HICMOInterID": data.hicmointerid,
+                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                        "HMaterID": data.HMaterID,
+                                        "HMaterName": data.浜у搧,
+                                        "HMaterNumber": data.浜у搧浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                        "lngBillKey": data.hmainid,
+                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                        "HProcExchHinteID": data.hmainid,
+                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                        "HPRDOrgID": data.缁勭粐
+                                    });
+                                    //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                    //$("#HBarCode").css("background-color", "#efefef4d");
+                                    HProcExchBillNoFlag = true;
+
+                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
+                                    var HInterID = data.hmainid;
+                                    //鑷姩鍖归厤娴佹按鍙�
+                                    $.ajax({
+                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+                                        type: "GET",
+                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = data1.data[0];
+                                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                                    "lngBillSubKey": data.hsubid,
+                                                    "HProcName": data.宸ュ簭,
+                                                    "HProcID": data.宸ュ簭ID,
+                                                    "HProcNo": data.娴佹按鍙�,
+                                                    "HCenterName": data.宸ヤ綔涓績,
+                                                    "HCenterID": data.HCenterID,
+                                                    "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                                                });
+
+                                                if (data.棣栭亾宸ュ簭 == "鏄�") {
+                                                    FirstEndHProcNo = 1;
+                                                } else if (data.鏈亾宸ュ簭 == "鏄�") {
+                                                    FirstEndHProcNo = 2;
+                                                }
+                                                $("#HProcNo").attr("readonly", "readonly");
+                                                $("#HProcNo").css("background-color", "#efefef4d");
+                                            }
+                                        }
+                                    })
+
+                                    option = {
+                                        elem: '#mainTable',
+                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                        //, cellMinWidth: 80
+                                        toolbar: '#toolbarDemo'
+                                        , where: { HProcExchHinteID: HProcExchHinteID }
+                                        , cols: [[
+                                            { type: 'numbers', title: '搴忓彿', totalRow: true }
+                                            , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
+                                            , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
+                                            , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
+                                            , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                                            , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
+                                            , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                                            , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+                                            , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                                            , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+                                            , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
+                                            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                                            , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                                            , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
+                                            , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+                                        ]]
+                                        , height: 500
+                                    }
+                                    table.render(option)
+                                    break;
+                            }
+                            //layer.close(index);
+                            //set_InitGrid();
+                            //table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#region 鏌ヨ 宸ヨ壓鍙傛暟
+            function get_DisplayTech(HBillNo) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_ProcessExchangeBill/GetProcessExchangeBillSubTech',
+                    type: "GET",
+                    data: { "HInterID": HBillNo },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            var col = [];
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData2) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            table.render({
+                                elem: '#mainTable2'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            });
+
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+            $('#HProcNo').on('keydown', function (event) {
+                var sProcNo = $('#HProcNo').val();
+                var sBillNo = $('#HBarCode').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    txtHProcNo_KeyDown(sBillNo, sProcNo);
+                }
+            });
+
+            function txtHProcNo_KeyDown(sBillNo, sProcNo) {
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+                    type: "GET",
+                    data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "lngBillSubKey": data.hsubid,
+                                "HProcName": data.宸ュ簭,
+                                "HProcID": data.HProcID
+                                , "HCenterName": data.宸ヤ綔涓績
+                                , "HCenterID": data.HCenterID
+                                , "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
+                            });
+                            if (data.棣栭亾宸ュ簭 == "鏄�") {
+                                FirstEndHProcNo = 1;
+                            } else if (data.鏈亾宸ュ簭 == "鏄�") {
+                                FirstEndHProcNo = 2;
+                            }
+                            $("#HProcNo").attr("readonly", "readonly");
+                            $("#HProcNo").css("background-color", "#efefef4d");
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#region 椤甸潰蹇嵎閿脊绐椻�斿伐搴忔祦杞崱鍏宠仈鏁伴噺
+            $('body').on('keydown', function (e) {
+                var HinteID = $("#HProcExchHinteID").val();
+                if (e.key == "F7") {
+                    if (HinteID == "" || HinteID == null || HinteID == undefined) {
+                        layer.alert("璇峰厛杈撳叆鏉″舰鐮佹垨鎵弿鏉″舰鐮�", { icon: 5 });
+                    }
+                    else {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '宸ュ簭娴佽浆鍗″叧鑱旀暟閲�',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
+                            end: function () {
+                            }
+                        });
+                    }
+                }
+            })
+            //#endregion
+
+            //鏄惁琚浆涓嬪伐搴�
+            form.on('checkbox(checkboxHLastSubProc)', function (data) {
+                $("#HLastSubProc").val(data.elem.checked);
+            });
+
+            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
+            $('#Cancel').on('click', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 1) {
+                        Pub_Close(closeType);
+                    } else if (OperationType == 3) {
+                        Pub_Close(1);
+                    } else if (OperationType == 4) {
+                        Pub_Close(1);
+                    }
+                    else if (OperationType == 2) {
+                        Pub_Close(1);
+                    }
+                });
+            })
+
+            $('#HEmpNumber').on('keydown', function (event) {
+                var HEmpNumber = $("#HEmpNumber").val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Cj_StationInBill/GetMessageByEmpNumber',
+                        type: "GET",
+                        data: { "HEmpNumber": HEmpNumber },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                $("#HEmpNumber").val(data1.data[0].HNumber);
+                                $("#HEmpName").val(data1.data[0].HName);
+                                $("#HEmpID").val(data1.data[0].HItemID);
+                                //layer.alert($("#HEmpID").val());
+                            }
+                            else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+
+            $('#HEmpNumber2').on('keydown', function (event) {
+                var HEmpNumber2 = $("#HEmpNumber2").val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Cj_StationInBill/GetMessageByEmpNumber',
+                        type: "GET",
+                        data: { "HEmpNumber": HEmpNumber2 },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                $("#HEmpNumber2").val(data1.data[0].HNumber);
+                                $("#HEmpName2").val(data1.data[0].HName);
+                                $("#HEmpID2").val(data1.data[0].HItemID);
+                                //layer.alert($("#HEmpID2").val());
+                            }
+                            else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+            $('#HEmpNumber3').on('keydown', function (event) {
+                var HEmpNumber3 = $("#HEmpNumber3").val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Cj_StationInBill/GetMessageByEmpNumber',
+                        type: "GET",
+                        data: { "HEmpNumber": HEmpNumber3 },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                $("#HEmpNumber3").val(data1.data[0].HNumber);
+                                $("#HEmpName3").val(data1.data[0].HName);
+                                $("#HEmpID3").val(data1.data[0].HItemID);
+                                //layer.alert($("#HEmpID3").val());
+                            }
+                            else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+            $('#HEmpNumber4').on('keydown', function (event) {
+                var HEmpNumber4 = $("#HEmpNumber4").val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Cj_StationInBill/GetMessageByEmpNumber',
+                        type: "GET",
+                        data: { "HEmpNumber": HEmpNumber4 },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                $("#HEmpNumber4").val(data1.data[0].HNumber);
+                                $("#HEmpName4").val(data1.data[0].HName);
+                                $("#HEmpID4").val(data1.data[0].HItemID);
+                                //layer.alert($("#HEmpID4").val());
+                            }
+                            else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+            $('#HEmpNumber5').on('keydown', function (event) {
+                var HEmpNumber5 = $("#HEmpNumber5").val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Cj_StationInBill/GetMessageByEmpNumber',
+                        type: "GET",
+                        data: { "HEmpNumber": HEmpNumber5 },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                $("#HEmpNumber5").val(data1.data[0].HNumber);
+                                $("#HEmpName5").val(data1.data[0].HName);
+                                $("#HEmpID5").val(data1.data[0].HItemID);
+                                //layer.alert($("#HEmpID5").val());
+                            }
+                            else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                if ($("#lngBillSubKey").val() == 0) {
+                    layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var tableData = data.field;
+                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Cj_StationOutBill/AddBill",
+                    async: false,
+                    data: { "oMain": oMain },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                            if (sessionStorage["OrganizationID"] == 1) {
+                                if (FirstEndHProcNo == 1) {
+                                    //姹囨姤
+                                    GetInStorage();
+                                } else if (FirstEndHProcNo == 2) {
+                                    //鍏ュ簱
+                                    BtnRK();
+                                    //鎶ュ簾
+                                    BtnBF();
+                                    if ($("#eventType").val() == "Add") {
+                                        //鍒ゆ柇鍒犻櫎
+                                        BtnDel();
+                                    }
+                                }
+                            }
+                            if (data.Verify == "Y") {
+                                location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                            }
+                            else {
+                                //淇濆瓨鍚庢祻瑙�
+                                ReRoadBillMain();
+                            }
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            });
+
+            //姹囨姤
+            form.on('submit(btn-InStorage)', function (data) {
+                GetInStorage();
+            });
+
+            //鍏ュ簱
+            form.on('submit(btn-RK)', function (data) {
+                BtnRK();
+            });
+
+            //鎶ュ簾
+            form.on('submit(btn-BF)', function (data) {
+                BtnBF();
+            });
+
+            //鍒楄缃�
+            form.on('submit(set_HideColumn)', function () {
+                //璋冪敤闅愯棌鍒楄缃柟娉�
+                get_HideColumn()
+            });
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Cj_StationOutBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HBillNo=' + $("#HBillNo").val() + '&HSouceBillType=');
+            }
+            //#endregion
+
+            //閫夋嫨娴佹按鍙峰脊绐�
+            form.on('submit(SerialNum-BT)', function () {//鐢熶骇璧勬簮
+                var value = $("#HProcExchHinteID").val();
+                // 鍒ゆ柇鏄惁宸茬粡杈撳叆娴佹按鍙凤紝鏄垯寮瑰嚭妯℃�佹锛屽惁鍒欑粰鍑烘彁绀�
+                if (value) {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '娴佹按鍙�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: [`../../Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
+                        , resize: false
+                        , cancel: function (index, layero) {
+                        }
+                        //, 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('璇烽�夋嫨鏁版嵁');
+                        //    }
+                        //    $("#HProcNo").val(checkStatus.data[0].娴佹按鍙�);
+                        //    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        //}
+                    })
+                } else {
+                    layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^',{ icon: 7 });
+                    //alert('璇峰厛杈撳叆娴佽浆鍗″彿!')
+                }
+            });
+
+            //閫夋嫨鐢熶骇鐝粍寮圭獥
+            form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鏈珯宸ュ簭'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+
+            //閫夋嫨妫�楠屽憳
+            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨妫�楠屽憳
+                var sMainStr = JSON.stringify(data.field);
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '妫�楠屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+
+            //閫夋嫨鐢熶骇璧勬簮寮圭獥
+            form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鐢熶骇璧勬簮'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+            //閫夋嫨宸ヤ綔涓績寮圭獥
+            form.on('submit(HWorkingProcedure-BT)', function () {//閫夋嫨宸ヤ綔涓績
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '宸ヤ綔涓績'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+                //layer.msg('绂佹閫夋嫨');
+            });
+            //閫夋嫨鎿嶄綔鍛�
+            form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐d换浜�
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            //閫夋嫨鎿嶄綔鍛�2
+            form.on('submit(HEmployeeID-BT2)', function () {//閫夋嫨璐d换浜�
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker2', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+            //閫夋嫨鎿嶄綔鍛�3
+            form.on('submit(HEmployeeID-BT3)', function () {//閫夋嫨璐d换浜�
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker3', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+            //閫夋嫨鎿嶄綔鍛�4
+            form.on('submit(HEmployeeID-BT4)', function () {//閫夋嫨璐d换浜�
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker4', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+            //閫夋嫨鎿嶄綔鍛�5
+            form.on('submit(HEmployeeID-BT5)', function () {//閫夋嫨璐d换浜�
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker5', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+
+            //鏂囦欢涓婁紶
+            function PicUpload() {
+                //澶氬浘鐗囦笂浼�
+                //澶氭枃浠跺垪琛ㄧず渚�
+                var ProImgByList = $('#ProImgByList')
+                    , uploadListIns = upload.render({
+                        elem: '#testList'
+                        , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+                        , accept: 'file'
+                        , multiple: true
+                        , auto: false
+                        //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+                        , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+                        , choose: function (obj) {
+                            var files = this.files = obj.pushFile(); //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+                            //璇诲彇鏈湴鏂囦欢
+                            obj.preview(function (index, file, result) {
+                                var tr = $(['<tr id="upload-' + index + '">'
+                                    , '<td>' + file.name + '</td>'
+                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td>绛夊緟涓婁紶</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+                                //鍗曚釜閲嶄紶
+                                tr.find('.demo-reload').on('click', function () {
+                                    obj.upload(index, file);
+                                    return false;
+                                });
+
+                                //鍒犻櫎
+                                tr.find('.demo-delete').on('click', function () {
+                                    delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+                                    tr.remove();
+                                    uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+                                });
+
+                                ProImgByList.append(tr);
+                            });
+                        }
+                        , done: function (res, index, upload) {
+                            if (res.code == 1) { //涓婁紶鎴愬姛
+                                var tr = ProImgByList.find('tr#upload-' + index)
+                                    , tds = tr.children();
+                                tds.eq(2).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+                                tds.eq(3).html(''); //娓呯┖鎿嶄綔
+                                //tds.eq(3).find('.demo-reload').addClass('layui-hide'); //闅愯棌涓婁紶
+                                return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+                            }
+                            this.error(index, upload);
+                        }
+                        , error: function (index, upload) {
+                            var tr = ProImgByList.find('tr#upload-' + index)
+                                , tds = tr.children();
+                            tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+                        }
+                    });
+            }
+
+            //鑾峰彇缂栬緫鏃�,宸蹭笂浼犵殑鏂囦欢鍒楄〃
+            if (HBillNo != null || HBillNo != undefined) {
+                var ProImgByList = $('#ProImgByList')
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+                    type: "GET",
+                    data: { "HBillNo": HBillNo },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var index = 0;
+                            for (var i = 0; i < data1.data.length; i++) {
+                                var tr = $(['<tr id="upload-' + i + '">'
+                                    , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+                                    , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+                                    , '<td>' + data1.data[i].HFileName + '</td>'
+                                    , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+                                    , '<td style="display:none">' + data1.data[i].url + '</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs  demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+                                $('#ProImgByList').append(tr);
+                            }
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+
+            //#region 淇敼鎸夐挳
+            form.on('submit(set_Modify)', function () {//鎻愪氦
+                //缂栬緫鍓嶅垽鏂�
+                set_ShowBillJudge();
+            })
+            //#endregion
+
+            //#region 缂栬緫鍓嶅垽鏂�
+            function set_ShowBillJudge() {
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationOutBill/set_ShowBillJudge", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HBillNo": HBillNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            location.replace('Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillNo=' + HBillNo);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏂板鎸夐挳
+            form.on('submit(set_AddNew)', function () {//鎻愪氦
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                });
+            })
+            //#endregion
+
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function () {
+                //瀹℃牳鏂规硶
+                set_CheckBill();
+            })
+            //#endregion
+
+            //#region 瀹℃牳鏂规硶
+            function set_CheckBill() {
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill",
+                    data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.alert(result.Message, { icon: 6 });
+                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍告寜閽�
+            form.on('submit(set_AbandonCheck)', function () {
+                //鍙嶅鏍告柟娉�
+                set_AbandonCheck();
+            })
+            //#endregion
+
+            // 鍙嶅鏍告柟娉�
+            function set_AbandonCheck() {
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck",
+                    data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.alert(result.Message, { icon: 6 });
+                            $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+                            $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //姹囨姤
+            function GetInStorage() {
+                var InterID = $("#HInterID").val();
+                var BillNo = $("#HBillNo").val();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+            }
+
+            //鍏ュ簱
+            function BtnRK() {
+                var BillNo = $("#HBillNo").val();
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveProcdutInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "BillNo": BillNo },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            });
+                        } else if (data.count == 2) {
+
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+            }
+
+            //鎶ュ簾
+            function BtnBF() {
+                var BillNo = $("#HProcExchBillNo").val();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveBFBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "BillNo": BillNo },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            });
+                        } else if (data.count == 2) {
+
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+            }
+
+            //鍒犻櫎鏈悓姝ュ埌閲戣澏鐨勫崟鎹�
+            function BtnDel() {
+                var HInterID = $("#HInterID").val();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationOutBill/DelStationOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "HInterID": HInterID },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                            //    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                            //    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                            //});
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err.Message, { icon: 5 });
+                    }
+                });
+
+            }
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                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.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);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            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) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["娴佽浆鍗″彿"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                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 (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                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;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            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
+
+
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        //鍒犻櫎鏂囦欢
+        function toManager(r) {
+            //寰楀埌褰撳墠鎵�鍦ㄨ
+            var rows = r.parentNode.parentNode.rowIndex;
+            //寰楀埌鎵�鍦ㄨ鐨勭涓�鍒楃殑鍐呭:涓婚敭ID
+            var HItemID = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(0)").html();
+            //寰楀埌鎵�鍦ㄨ鐨勭浜屽垪鐨勫唴瀹�:鍗曟嵁鍙�
+            var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
+            //寰楀埌鎵�鍦ㄨ鐨勭涓夊垪鐨勫唴瀹�:鏂囦欢鍚嶇О
+            var HFileName = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(2)").html();
+            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+
+                //鍒犻櫎宸蹭笂浼犳枃浠�
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationOutBill/DeleteFilelist',
+                    type: "GET",
+                    data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.alert(data1.Message, { icon: 1 });
+                            $("#ProImgByList tr").eq((rows - 1)).remove();
+                        }
+                        else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            })
+        }
+
+        //涓嬭浇鏂囦欢
+        function dowload(r) {
+            //寰楀埌褰撳墠鎵�鍦ㄨ
+            var rows = r.parentNode.parentNode.rowIndex;
+            //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+            var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
+            /*window.location.href = url;*/
+            window.open(url)
+        }
+
+        //杩斿洖娴佹按鍙�
+        function GetProcNoValue(obj) {
+            $("#HProcNo").val(obj[0].娴佹按鍙�);
+        }
+        //杩斿洖鐢熶骇鐝粍
+        function GetProductionTeamValue(obj) {
+            $("#HGroupName").val(obj[0].鐝粍);
+            $("#HGroupID").val(obj[0].HItemID);
+        }
+        //杩斿洖妫�楠屽憳
+        function GetHSecManagerValue(obj) {
+            $("#HQCCheckName").val(obj[0].HName);
+            $("#HQCCheckID").val(obj[0].HItemID);
+        }
+        //杩斿洖鐢熶骇璧勬簮
+        function GetProductionResourcesValue(obj) {
+            $("#HSourceName").val(obj[0].鐢熶骇璧勬簮);
+            $("#HSourceID").val(obj[0].HItemID);
+        }
+        //杩斿洖宸ヤ綔涓績
+        function GetWorkCenterValue(obj) {  //杩斿洖宸ヤ綔涓績
+            $("#HCenterName").val(obj[0].宸ヤ綔涓績);
+            $("#HCenterID").val(obj[0].HItemID);
+        }
+        //杩斿洖鎿嶄綔鍛�
+        function GetHWorkerValue(obj) {
+            $("#HEmpName").val(obj[0].HName);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
+        //杩斿洖鎿嶄綔鍛�2
+        function GetHWorkerValue2(obj) {
+            $("#HEmpName2").val(obj[0].HName);
+            $("#HEmpID2").val(obj[0].HItemID);
+        }
+        //杩斿洖鎿嶄綔鍛�3
+        function GetHWorkerValue3(obj) {
+            $("#HEmpName3").val(obj[0].HName);
+            $("#HEmpID3").val(obj[0].HItemID);
+        }
+        //杩斿洖鎿嶄綔鍛�4
+        function GetHWorkerValue4(obj) {
+            $("#HEmpName4").val(obj[0].HName);
+            $("#HEmpID4").val(obj[0].HItemID);
+        }
+        //杩斿洖鎿嶄綔鍛�5
+        function GetHWorkerValue5(obj) {
+            $("#HEmpName5").val(obj[0].HName);
+            $("#HEmpID5").val(obj[0].HItemID);
+        }
+        //杩斿洖宸ュ簭
+        function GetHProcValue(obj) {
+            $("#HProcName").val(obj[0].宸ュ簭);
+            $("#HProcID").val(obj[0].HItemID);
+        }
+        //杩斿洖浜у搧
+        function GetHMaterNameValue(obj) {
+            $("#HMaterName").val(obj[0].HName);
+            $("#HMaterNumber").val(obj[0].HNumber);
+            $("#HMaterID").val(obj[0].HItemID);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
index 861cc77..d5614cd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationInBill_PDA_QiaoYi.html"
@@ -364,6 +364,7 @@
             <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
         </script>
     </div>-->
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                             </div>
                             <ul class="layui-tab-title">
                                 <li class="layui-this">鍗曟嵁淇℃伅</li>
@@ -619,7 +620,7 @@
 
             //#region 淇濆瓨鍚庢祻瑙堟柟娉�
             function ReRoadBillMain() {
-                location.replace('MES_StationInBill_PDA.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
+                location.replace('MES_StationInBill_PDA_QiaoYi.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
             }
             //#endregion
 
@@ -1084,42 +1085,24 @@
                                         data: { "HProcExchHinteID": HProcExchHinteID },
                                         success: function (data1) {
                                             if (data1.count == 1) {
-                                                var data = [];
-                                                var col = [];
-                                                //缁欑┖鐨勬暟缁勮祴鍊�
-                                                for (var key in data1.list) {
-                                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+
+                                                option = {
+                                                    elem: '#mainTable',
+                                                    type: "GET",
+                                                    data: data1.data,
+                                                    //, cellMinWidth: 80
+                                                    //toolbar: '#toolbarDemo'
+                                                    limit: 50,
+                                                    cols: [[
+                                                        { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+                                                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                                                        , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺' }
+                                                        , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟' }
+                                                    ]]
+                                                    , height: 500
                                                 }
-                                                //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                                                col.push({ type: 'checkbox', fixed: 'left' });
-                                                for (var i = 0; i < data.length; i++) {
-                                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
-                                                    if ($.inArray(data[i].name, titleData) > -1) {
-                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                                    }
-                                                    else {
-                                                        switch (data[i].Type) {
-                                                            //int
-                                                            case 'DateTime':
-                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
-                                                                break;
-                                                            default:
-                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
-                                                        }
-                                                    }
-                                                }
+                                                table.render(option)
                                             }
-                                            option = {
-                                                elem: '#mainTable',
-                                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
-                                                type: "GET",
-                                                //, cellMinWidth: 80
-                                                toolbar: '#toolbarDemo'
-                                                , where: { HProcExchHinteID: HProcExchHinteID }
-                                                , cols: [col]
-                                                , height: 500
-                                            }
-                                            table.render(option)
                                         }
                                     })
                                     break;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
index 2a71268..23f5f8a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA_QiaoYi.html"
@@ -149,7 +149,7 @@
                                             <tr>
                                                 <th>褰撳墠宸ュ簭</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+                                                    <input type="text" name="HProcName" class="layui-input" id="HProcName" placeholder="褰撳墠宸ュ簭" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HProcID" id="HProcID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
@@ -164,7 +164,7 @@
                                             <tr>
                                                 <th>鍚堟牸鏁伴噺</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;height:55px">
+                                                    <input type="text" name="HQty" class="layui-input" id="HQty" value="0" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" style="border-radius: 50px;">
                                                 </td>
                                             </tr>
                                             <tr>
@@ -184,14 +184,14 @@
                                             <tr>
                                                 <th>浜у搧鍚嶇О</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+                                                    <input type="text" name="HMaterName" class="layui-input" id="HMaterName" placeholder="浜у搧鍚嶇О" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                     <input type="hidden" name="HMaterID" id="HMaterID" value="0" autocomplete="off" class="layui-input">
                                                 </td>
                                             </tr>
                                             <tr>
                                                 <th>瑙勬牸鍨嬪彿</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;height:55px" readonly>
+                                                    <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                 </td>
                                             </tr>
 
@@ -270,14 +270,14 @@
                                             <tr>
                                                 <th>鎿嶄綔鍛�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;height:55px" readonly>
+                                                    <input type="text" name="HEmpName_second" class="layui-input" id="HEmpName_second" placeholder="鎿嶄綔鍛樺鍚�" style="background-color:#efefef4d;border-radius: 50px;" readonly>
                                                 </td>
                                             </tr>
-                                            
+
                                             <tr>
                                                 <th>鎶ュ簾鏁伴噺</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;height:55px">
+                                                    <input type="text" name="HWasterQty" class="layui-input" id="HWasterQty" value="0" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" style="border-radius: 50px;">
                                                 </td>
                                             </tr>
                                             <tr>
@@ -384,6 +384,7 @@
                                         </tbody>
                                     </table>
                                 </div>
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                             </div>
                             <ul class="layui-tab-title">
                                 <li class="layui-this">鍗曟嵁淇℃伅</li>
@@ -805,24 +806,14 @@
                                         elem: '#mainTable',
                                         url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                         //, cellMinWidth: 80
-                                        toolbar: '#toolbarDemo'
-                                        , where: { HProcExchHinteID: HProcExchHinteID }
+                                        //toolbar: '#toolbarDemo'
+                                        where: { HProcExchHinteID: HProcExchHinteID }
+                                        ,limit: 50
                                         , cols: [[
-                                            { type: 'numbers', title: '搴忓彿', totalRow: true }
-                                            , { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
-                                            , { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
-                                            , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
-                                            , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                                            , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
-                                            , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                                            , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
+                                            { field: '娴佹按鍙�', title: '娴佹按鍙�' }
                                             , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                                            , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
-                                            , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
-                                            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                                            , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
-                                            , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
                                             , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
+                                            , { field: '宸ヨ壓鍙傛暟', title: '宸ヨ壓鍙傛暟' }
                                         ]]
                                         , height: 500
                                     }
@@ -1422,13 +1413,13 @@
                                 }
                             });
 
-                            //if (data.Verify == "Y") {
-                            //    location.replace('MES_StationOutBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
-                            //}
-                            //else {
-                            //    //淇濆瓨鍚庢祻瑙�
-                            //    ReRoadBillMain();
-                            //}
+                            if (data.Verify == "Y") {
+                                location.replace('MES_StationOutBill_PDA_QiaoYi.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                            }
+                            else {
+                                //淇濆瓨鍚庢祻瑙�
+                                ReRoadBillMain();
+                            }
                         }
                         else {
                             layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
index 6df0da2..440e4a7 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillEdit.html"
@@ -80,30 +80,11 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">璐熻矗浜�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">娴佽浆鍗�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" value="0">
                                                 <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇杞﹂棿</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs3 layui-inline">
@@ -113,6 +94,8 @@
                                                 <input type="hidden" name="HMaterID" id="HMaterID" value="0">
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鐗╂枡鍚嶇О</label>
                                             <div class="layui-input-inline">
@@ -125,8 +108,6 @@
                                                 <input type="text" class="layui-input" name="HModel" id="HModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">璁¢噺鍗曚綅</label>
                                             <div class="layui-input-inline">
@@ -137,17 +118,17 @@
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">璁㈠崟鏁伴噺</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">杩斿伐鏁伴噺</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" value="0" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">杩斿伐鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HQty" id="HQty" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">寮�濮嬪伐搴�</label>
                                             <div class="layui-input-inline">
@@ -168,21 +149,15 @@
                                                 <input type="text" class="layui-input" name="HProcExchBegNO" id="HProcExchBegNO" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">缁撴潫娴佹按鍙�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HProcExchEndNO" id="HProcExchEndNO" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
-                                            </div>
-                                        </div>
+
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鐢熶骇璁㈠崟</label>
                                             <div class="layui-input-inline">
@@ -191,24 +166,21 @@
                                                 <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
-                                            </div>
-                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" style="background-color: #efefef4d; width: 610px; " readonly>
+                                                <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
                                             </div>
                                         </div>
                                     </div>
@@ -270,8 +242,6 @@
                                                 <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                             </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;">
@@ -282,6 +252,37 @@
                                             <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璐熻矗浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 83px;">鐢熶骇杞﹂棿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 78px;">璁㈠崟璺熻釜鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 78px;">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
                                             </div>
                                         </div>
                                     </div>
@@ -465,20 +466,100 @@
                             shift: 2,
                             area: ['90%', '90%'],
                             maxmin: true,
-                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                            content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
                             btn: ['纭畾', '鍙栨秷']
                             , btn1: function (index, layero) {
                                 //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                                 var iframeWindow = window['layui-layer-iframe' + index];
                                 var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
-                                if (checkStatus.data.length === 0) {
-                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                if (checkStatus.data.length == 0) {
+                                    return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
                                 }
-                                obj.update({
-                                    HProcName: checkStatus.data[0].宸ュ簭
-                                    , HProcID: checkStatus.data[0].HItemID
-                                    , HProcNumber: checkStatus.data[0].宸ュ簭浠g爜
+
+                                //鑾峰彇宸ュ簭浠g爜
+                                var ProcessNumber = [];
+                                for (var i = 0; i < checkStatus.data.length; i++) {
+                                    ProcessNumber.push("'" + checkStatus.data[i]["宸ュ簭浠g爜"] + "'");
+                                }
+
+                                //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+                                var NowNum = 0;
+                                for (var i = 0; i < option.data.length; i++) {
+                                    if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
+                                        NowNum = i + 1;
+                                    }
+                                }
+
+                                //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
+                                var WorkCente = [];
+                                var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О,p.HNumber 宸ュ簭浠g爜  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    async: false,
+                                    data: { "sWhere": sWhere },
+                                    success: function (data) {
+                                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            WorkCente = data.data;
+                                        }
+                                        else {
+                                            layer.msg(data.Message, { icon: 5 });
+                                        }
+                                        layer.closeAll("loading");
+                                    },
+                                    error: function (err) {
+                                        layer.msg("閿欒:" + err, { icon: 5 });
+                                    }
                                 });
+
+
+                                //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+                                if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
+                                    //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+                                    var num = ProcessNumber.length - option.data.length + (NowNum - 1);
+                                    //寰幆璧嬪��  鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+                                    var j = 0;
+                                    for (var i = (NowNum - 1); i < option.data.length; i++) {
+                                        option.data[i]["HProcName"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+                                        option.data[i]["HProcNumber"] = WorkCente[j]["宸ュ簭浠g爜"];
+                                        option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+                                        option.data[i]["HCenterName"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+                                        option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+                                        option.data[i]["HCenterNumber"] = WorkCente[j]["宸ヤ綔涓績浠g爜"];
+                                        j++;
+                                    }
+
+                                    //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+                                    for (var i = 0; i < num; i++) {
+                                        option.data.push({
+                                            "HProcNo": parseInt($("#HProcExchBegNO").val()) + table.cache["mainTable"].length + 1 + i, "HProcID": WorkCente[j]["HProcID"], "HProcNumber": WorkCente[j]["宸ュ簭浠g爜"], "HProcName": WorkCente[j]["宸ュ簭鍚嶇О"], "HWorkRemark": "",
+                                            "HCenterID": WorkCente[j]["HCenterID"], "HCenterNumber": WorkCente[j]["宸ヤ綔涓績浠g爜"], "HCenterName": WorkCente[j]["宸ヤ綔涓績鍚嶇О"],
+                                            "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+                                            "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
+                                            "HQty": $("#HQty").val(), "HRemark": ""
+                                        })
+                                        j++;
+                                    }
+                                } else {
+                                    //寰幆璧嬪��  鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+                                    var j = 0;
+                                    for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
+                                        option.data[i]["HProcName"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+                                        option.data[i]["HProcNumber"] = WorkCente[j]["宸ュ簭浠g爜"];
+                                        option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+                                        option.data[i]["HCenterName"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+                                        option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+                                        option.data[i]["HCenterNumber"] = WorkCente[j]["宸ヤ綔涓績浠g爜"];
+                                        j++;
+                                    }
+                                }
+
+                                table.render(option);
+                                //obj.update({
+                                //    HProcName: checkStatus.data[0].宸ュ簭
+                                //    , HProcID: checkStatus.data[0].HItemID
+                                //    , HProcNumber: checkStatus.data[0].宸ュ簭浠g爜
+                                //});
 
                                 layer.close(layer.index);
                             }
@@ -493,7 +574,7 @@
                         layer.open({
                             type: 2,
                             skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鍔犲伐涓績鍒楄〃',
+                            title: '宸ヤ腑蹇冨垪琛�',
                             closeBtn: 1,
                             shift: 2,
                             area: ['90%', '90%'],
@@ -632,19 +713,20 @@
                 , { field: 'HProcID', title: '宸ュ簭ID', hide: true }
                 , { field: 'HProcNumber', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcCheck" }
                 , { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
-                , { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
                 , { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
                 , { field: 'HCenterNumber', title: '宸ヤ綔涓績浠g爜', edit: 'text', event: "HWorkCenterCheck" }
                 , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
                 , { field: 'HQty', title: '杩斿伐鏁伴噺', edit: 'text' }
-                , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
-                , { field: 'HDeptNumber', title: '閮ㄩ棬浠g爜', edit: 'text', event: "HDeptCheck" }
-                , { field: 'HDeptName', title: '閮ㄩ棬' }
+                , { field: 'HWorkRemark', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+                , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: "300" }
                 , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
                 , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
                 , { field: 'HSupName', title: '渚涘簲鍟�' }
                 , { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
-                , { field: 'HRemark', title: '澶囨敞', edit: 'text',width:"300" }
+
+                 //, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+                //, { field: 'HDeptNumber', title: '閮ㄩ棬浠g爜', edit: 'text', event: "HDeptCheck" }
+                //, { field: 'HDeptName', title: '閮ㄩ棬' }
                 , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
             ];
             option = {
@@ -761,6 +843,76 @@
         //闈炵┖楠岃瘉
         function AllowLoadData(data) {
 
+            if ($("#HBillNo").val() == "") {
+                layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                return false;
+            }
+
+            if ($("#HProcExchBillNo").val() == "") {
+                layer.msg("娴佽浆鍗′笉鑳戒负绌�!");
+                return false;
+            }
+
+            if ($("#HMaterNumber").val() == "") {
+                layer.msg("鐗╂枡浠g爜涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HMaterName").val() == "") {
+                layer.msg("鐗╂枡鍚嶇О涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HModel").val() == "") {
+                layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HUnitName").val() == "") {
+                layer.msg("璁¢噺鍗曚綅涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HPlanQty").val() == "0") {
+                layer.msg("璁㈠崟鏁伴噺涓嶈兘涓�0!");
+                return false;
+            }
+
+            if ($("#HQty").val() == "0") {
+                layer.msg("杩斿伐鏁伴噺涓嶈兘涓�0!");
+                return false;
+            }
+
+            if ($("#HProcBegName").val() == "") {
+                layer.msg("寮�濮嬪伐搴忎笉鑳戒负绌�!");
+                return false;
+            }
+
+            if ($("#HProcEndName").val() == "") {
+                layer.msg("缁撴潫宸ュ簭涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HProcExchBegNO").val() == "") {
+                layer.msg("寮�濮嬫祦姘村彿涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HProcExchEndNO").val() == "") {
+                layer.msg("缁撴潫娴佹按鍙蜂笉鑳戒负绌�!");
+                return false;
+            }
+
+            if ($("#HPRDORGName").val() == "") {
+                layer.msg("鐢熶骇缁勭粐涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HICMOBillNo").val() == "") {
+                layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖!");
+                return false;
+            }
+
             //if ($("#HEmpID").val()=="0") {
             //    layer.msg("璇烽�夋嫨璐熻矗浜�!");
             //    return false;
@@ -792,12 +944,13 @@
                             layer.msg("绗�" + (i + 1) + "琛�:渚涘簲鍟嗕笉鑳戒负绌�!");
                             return false;
                         }
-                    } else {
-                        if (option.data[i]["HCenterID"] == "0") {
-                            layer.msg("绗�" + (i + 1) + "琛�:宸ヤ綔涓績涓嶈兘涓虹┖!");
-                            return false;
-                        }
                     }
+                    //else {
+                    //    if (option.data[i]["HCenterID"] == "0") {
+                    //        layer.msg("绗�" + (i + 1) + "琛�:宸ヤ綔涓績涓嶈兘涓虹┖!");
+                    //        return false;
+                    //    }
+                    //}
 
                     if (parseInt(option.data[i].HQty) > parseInt($("#HQty").val())) {
                         var indexRow = i + 1;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
index 1c36789..83c150f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchRecordBackBillList.html"
@@ -138,7 +138,7 @@
             , laypage = layui.laypage
             , laydate = layui.laydate
         var sWhere = "";
-        var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
+        var titleData = ["hmainid", "HICMOInterID", "鐢熶骇璁㈠崟鍙�", "HWorkShopID", "鐢熶骇杞﹂棿浠g爜", "鐢熶骇杞﹂棿", "HUnitID", "鍗曚綅浠g爜", "鍗曚綅", "鎽樿", "琛ㄥご澶囨敞", "HPRDORGID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "HBillType", "璁㈠崟璺熻釜鍙�", "鍏抽棴浜�", "鍏抽棴鏃ユ湡", "HICMOEntryID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鎵瑰彿", "娴佽浆鍗′富鍐呯爜", "娴佽浆鍗″瓙鍐呯爜", "HProcBegID", "HProcEndID", "HEmpID", "璐熻矗浜�", "HEntryID", "娴佹按鍙�", "HProcID", "宸ュ簭浠g爜", "宸ュ簭", "澶囦唤鍗曟嵁鍙�", "鍔犲伐璇存槑", "妯″叿缂栧彿", "绋嬪簭鍙�", "HCenterID", "宸ヤ綔涓績浠g爜", "宸ヤ綔涓績", "HSupID", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟�", "濮斿鏍囪", "HDeptID", "鍔犲伐杞﹂棿浠g爜", "鍔犲伐杞﹂棿", "瀛愯繑宸ユ暟閲�", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鏍囧噯宸ユ椂", "宸ュ簭绫诲瀷", "鐢熶骇璁㈠崟涓诲唴鐮�", "瀛愮敓浜ц鍗曞彿", "鐢熶骇璁㈠崟瀛愬唴鐮�", "HSeOrderInterID", "HSeOrderEntryID", "閿�鍞鍗曞彿", "HWWOrderInterID", "HWWOrderEntryID", "濮斿璁㈠崟鍙�", "鎵撳嵃娆℃暟", "琛ㄤ綋澶囨敞"];
         var option = [];
         var HModName = "Sc_ProcExchRecordBackBillList";
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
index f084003..47df405 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillEdit.html"
@@ -80,30 +80,11 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">璐熻矗浜�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">娴佽浆鍗�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
                                                 <input type="hidden" name="HProcExchInterID" id="HProcExchInterID" value="0">
                                                 <input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇杞﹂棿</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs3 layui-inline">
@@ -113,6 +94,8 @@
                                                 <input type="hidden" name="HMaterID" id="HMaterID" value="0">
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鐗╂枡鍚嶇О</label>
                                             <div class="layui-input-inline">
@@ -125,8 +108,6 @@
                                                 <input type="text" class="layui-input" name="HModel" id="HModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">璁¢噺鍗曚綅</label>
                                             <div class="layui-input-inline">
@@ -137,17 +118,17 @@
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">璁㈠崟鏁伴噺</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">杩斿伐鏁伴噺</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HQty" id="HQty" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" value="0" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">杩斿伐鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HQty" id="HQty" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">寮�濮嬪伐搴�</label>
                                             <div class="layui-input-inline">
@@ -168,21 +149,15 @@
                                                 <input type="text" class="layui-input" name="HProcExchBegNO" id="HProcExchBegNO" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">缁撴潫娴佹按鍙�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HProcExchEndNO" id="HProcExchEndNO" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" style="background-color:#efefef4d;" readonly>
-                                                <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
-                                            </div>
-                                        </div>
+
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鐢熶骇璁㈠崟</label>
                                             <div class="layui-input-inline">
@@ -191,24 +166,21 @@
                                                 <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" lay-verify="HICMOEntryID">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
-                                            </div>
-                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs6 layui-inline">
                                             <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPRDORGName" id="HPRDORGName" style="background-color: #efefef4d; width: 610px; " readonly>
+                                                <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID"><!--HSTOCKORGID-->
                                             </div>
                                         </div>
                                     </div>
@@ -270,8 +242,6 @@
                                                 <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                             </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;">
@@ -282,6 +252,37 @@
                                             <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="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">璐熻矗浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 83px;">鐢熶骇杞﹂棿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 78px;">璁㈠崟璺熻釜鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 78px;">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
                                             </div>
                                         </div>
                                     </div>
@@ -464,20 +465,100 @@
                             shift: 2,
                             area: ['90%', '90%'],
                             maxmin: true,
-                            content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                            content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
                             btn: ['纭畾', '鍙栨秷']
                             , btn1: function (index, layero) {
                                 //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                                 var iframeWindow = window['layui-layer-iframe' + index];
                                 var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
-                                if (checkStatus.data.length === 0) {
-                                    return layer.msg('璇烽�夋嫨鏁版嵁');
+                                if (checkStatus.data.length == 0) {
+                                    return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
                                 }
-                                obj.update({
-                                    HProcName: checkStatus.data[0].宸ュ簭
-                                    , HProcID: checkStatus.data[0].HItemID
-                                    , HProcNumber: checkStatus.data[0].宸ュ簭浠g爜
+
+                                //鑾峰彇宸ュ簭浠g爜
+                                var ProcessNumber = [];
+                                for (var i = 0; i < checkStatus.data.length; i++) {
+                                    ProcessNumber.push("'" + checkStatus.data[i]["宸ュ簭浠g爜"] + "'");
+                                }
+
+                                //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+                                var NowNum = 0;
+                                for (var i = 0; i < option.data.length; i++) {
+                                    if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
+                                        NowNum = i + 1;
+                                    }
+                                }
+
+                                //鏌ヨ宸ヤ綔涓績鐨勬暟鎹�
+                                var WorkCente = [];
+                                var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') 宸ヤ綔涓績浠g爜, isnull(a.HName,'') 宸ヤ綔涓績鍚嶇О ,p.HItemID HProcID,p.HName 宸ュ簭鍚嶇О,p.HNumber 宸ュ簭浠g爜  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    async: false,
+                                    data: { "sWhere": sWhere },
+                                    success: function (data) {
+                                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            WorkCente = data.data;
+                                        }
+                                        else {
+                                            layer.msg(data.Message, { icon: 5 });
+                                        }
+                                        layer.closeAll("loading");
+                                    },
+                                    error: function (err) {
+                                        layer.msg("閿欒:" + err, { icon: 5 });
+                                    }
                                 });
+
+
+                                //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+                                if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
+                                    //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+                                    var num = ProcessNumber.length - option.data.length + (NowNum - 1);
+                                    //寰幆璧嬪��  鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+                                    var j = 0;
+                                    for (var i = (NowNum - 1); i < option.data.length; i++) {
+                                        option.data[i]["HProcName"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+                                        option.data[i]["HProcNumber"] = WorkCente[j]["宸ュ簭浠g爜"];
+                                        option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+                                        option.data[i]["HCenterName"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+                                        option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+                                        option.data[i]["HCenterNumber"] = WorkCente[j]["宸ヤ綔涓績浠g爜"];
+                                        j++;
+                                    }
+
+                                    //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+                                    for (var i = 0; i < num; i++) {
+                                        option.data.push({
+                                            "HProcNo": parseInt($("#HProcExchBegNO").val()) + table.cache["mainTable"].length + 1 + i, "HProcID": WorkCente[j]["HProcID"], "HProcNumber": WorkCente[j]["宸ュ簭浠g爜"], "HProcName": WorkCente[j]["宸ュ簭鍚嶇О"], "HWorkRemark": "",
+                                            "HCenterID": WorkCente[j]["HCenterID"], "HCenterNumber": WorkCente[j]["宸ヤ綔涓績浠g爜"], "HCenterName": WorkCente[j]["宸ヤ綔涓績鍚嶇О"],
+                                            "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+                                            "HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
+                                            "HQty": $("#HQty").val(), "HRemark": ""
+                                        })
+                                        j++;
+                                    }
+                                } else {
+                                    //寰幆璧嬪��  鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+                                    var j = 0;
+                                    for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
+                                        option.data[i]["HProcName"] = WorkCente[j]["宸ュ簭鍚嶇О"];
+                                        option.data[i]["HProcNumber"] = WorkCente[j]["宸ュ簭浠g爜"];
+                                        option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
+                                        option.data[i]["HCenterName"] = WorkCente[j]["宸ヤ綔涓績鍚嶇О"];
+                                        option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
+                                        option.data[i]["HCenterNumber"] = WorkCente[j]["宸ヤ綔涓績浠g爜"];
+                                        j++;
+                                    }
+                                }
+
+                                table.render(option);
+                                //obj.update({
+                                //    HProcName: checkStatus.data[0].宸ュ簭
+                                //    , HProcID: checkStatus.data[0].HItemID
+                                //    , HProcNumber: checkStatus.data[0].宸ュ簭浠g爜
+                                //});
 
                                 layer.close(layer.index);
                             }
@@ -492,7 +573,7 @@
                         layer.open({
                             type: 2,
                             skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鍔犲伐涓績鍒楄〃',
+                            title: '宸ヤ腑蹇冨垪琛�',
                             closeBtn: 1,
                             shift: 2,
                             area: ['90%', '90%'],
@@ -626,19 +707,20 @@
                 , { field: 'HProcID', title: '宸ュ簭ID', hide: true }
                 , { field: 'HProcNumber', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcCheck" }
                 , { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
-                , { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
                 , { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
                 , { field: 'HCenterNumber', title: '宸ヤ綔涓績浠g爜', edit: 'text', event: "HWorkCenterCheck" }
                 , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
                 , { field: 'HQty', title: '杩斿伐鏁伴噺', edit: 'text' }
-                , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
-                , { field: 'HDeptNumber', title: '閮ㄩ棬浠g爜', edit: 'text', event: "HDeptCheck" }
-                , { field: 'HDeptName', title: '閮ㄩ棬' }
+                , { field: 'HWorkRemark', title: '宸ヨ壓鍙傛暟', edit: 'text' }
+                , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: "300" }
                 , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
                 , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
                 , { field: 'HSupName', title: '渚涘簲鍟�' }
                 , { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
-                , { field: 'HRemark', title: '澶囨敞', edit: 'text',width:"300" }
+                
+                //, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+                //, { field: 'HDeptNumber', title: '閮ㄩ棬浠g爜', edit: 'text', event: "HDeptCheck" }
+                //, { field: 'HDeptName', title: '閮ㄩ棬' }
                 , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
             ];
             option = {
@@ -755,6 +837,76 @@
         //闈炵┖楠岃瘉
         function AllowLoadData(data) {
 
+            if ($("#HBillNo").val()=="") {
+                layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                return false;
+            }
+
+            if ($("#HProcExchBillNo").val() == "") {
+                layer.msg("娴佽浆鍗′笉鑳戒负绌�!");
+                return false;
+            }
+
+            if ($("#HMaterNumber").val() == "") {
+                layer.msg("鐗╂枡浠g爜涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HMaterName").val() == "") {
+                layer.msg("鐗╂枡鍚嶇О涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HModel").val() == "") {
+                layer.msg("瑙勬牸鍨嬪彿涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HUnitName").val() == "") {
+                layer.msg("璁¢噺鍗曚綅涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HPlanQty").val() == "0") {
+                layer.msg("璁㈠崟鏁伴噺涓嶈兘涓�0!");
+                return false;
+            }
+
+            if ($("#HQty").val() == "0") {
+                layer.msg("杩斿伐鏁伴噺涓嶈兘涓�0!");
+                return false;
+            }
+
+            if ($("#HProcBegName").val() == "") {
+                layer.msg("寮�濮嬪伐搴忎笉鑳戒负绌�!");
+                return false;
+            }
+
+            if ($("#HProcEndName").val() == "") {
+                layer.msg("缁撴潫宸ュ簭涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HProcExchBegNO").val() == "") {
+                layer.msg("寮�濮嬫祦姘村彿涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HProcExchEndNO").val() == "") {
+                layer.msg("缁撴潫娴佹按鍙蜂笉鑳戒负绌�!");
+                return false;
+            }
+
+            if ($("#HPRDORGName").val() == "") {
+                layer.msg("鐢熶骇缁勭粐涓嶈兘涓虹┖!");
+                return false;
+            }
+
+            if ($("#HICMOBillNo").val() == "") {
+                layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖!");
+                return false;
+            }
+
             //if ($("#HEmpID").val()=="0") {
             //    layer.msg("璇烽�夋嫨璐熻矗浜�!");
             //    return false;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
index f0ec689..43e5413 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcExchWorkBackBillList.html"
@@ -136,7 +136,7 @@
             , laypage = layui.laypage
             , laydate = layui.laydate
         var sWhere = "";
-        var titleData = ["hmainid", "HICMOInterID", "HWorkShopID", "HUnitID", "HPRDORGID", "HCenterID", "HProcID", "HDeptID","HEmpID"];
+        var titleData = ["hmainid", "HICMOInterID", "鐢熶骇璁㈠崟鍙�", "HWorkShopID", "鐢熶骇杞﹂棿浠g爜", "鐢熶骇杞﹂棿", "HUnitID", "鍗曚綅浠g爜", "鍗曚綅", "鎽樿", "琛ㄥご澶囨敞", "HPRDORGID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "HBillType", "璁㈠崟璺熻釜鍙�", "鍏抽棴浜�", "鍏抽棴鏃ユ湡", "HICMOEntryID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鎵瑰彿", "娴佽浆鍗′富鍐呯爜", "娴佽浆鍗″瓙鍐呯爜", "HProcBegID", "HProcEndID", "HEmpID", "璐熻矗浜�", "HEntryID", "娴佹按鍙�", "HProcID", "宸ュ簭浠g爜", "宸ュ簭", "澶囦唤鍗曟嵁鍙�", "鍔犲伐璇存槑", "妯″叿缂栧彿", "绋嬪簭鍙�", "HCenterID", "宸ヤ綔涓績浠g爜", "宸ヤ綔涓績", "HSupID", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟�", "濮斿鏍囪", "HDeptID", "鍔犲伐杞﹂棿浠g爜", "鍔犲伐杞﹂棿", "瀛愯繑宸ユ暟閲�", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鏍囧噯宸ユ椂", "宸ュ簭绫诲瀷", "鐢熶骇璁㈠崟涓诲唴鐮�", "瀛愮敓浜ц鍗曞彿", "鐢熶骇璁㈠崟瀛愬唴鐮�", "HSeOrderInterID", "HSeOrderEntryID", "閿�鍞鍗曞彿", "HWWOrderInterID", "HWWOrderEntryID", "濮斿璁㈠崟鍙�", "鎵撳嵃娆℃暟", "琛ㄤ綋澶囨敞"];
         var option = [];
         var HModName = "Sc_ProcExchWorkBackBillList";
 
@@ -260,6 +260,7 @@
                                 }
                             }
                         }
+
                         option = {
                             elem: '#mainTable'
                             , toolbar: '#toolbarDemo'
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 96ea639..c50da7c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -63,10 +63,10 @@
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
                             <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="5" style="padding:1px;">缇婃瘺淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
                             <li lay-id="3" style="padding:1px;">妫�绉荤エ淇℃伅</li>
                             <li lay-id="4" style="padding:1px;">鍒跺崟淇℃伅</li>
-                            <li lay-id="5" style="padding:1px;">缇婃瘺淇℃伅</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--鍩烘湰淇℃伅-->
@@ -88,17 +88,17 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                    </div>
-                </div>-->
+            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+            </div>
+        </div>-->
                                         <!--<div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">鍥惧彿鐗堟湰</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
-                    </div>
-                </div>-->
+            <label class="layui-form-label">鍥惧彿鐗堟湰</label>
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
+            </div>
+        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
@@ -107,8 +107,8 @@
                                                 <input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                 <input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
                                                 <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                        </button>-->
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                </button>-->
                                             </div>
                                         </div>
                                         <div class="layui-col-xs3 layui-inline">
@@ -124,11 +124,11 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">鎬昏鍥惧彿</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
-                    </div>
-                </div>-->
+            <label class="layui-form-label">鎬昏鍥惧彿</label>
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+            </div>
+        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
@@ -152,42 +152,33 @@
                                             </div>
                                         </div>
                                         <!--<div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">鏉愯川</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
-                    </div>
-                </div>-->
+            <label class="layui-form-label">鏉愯川</label>
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
+            </div>
+        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <!--<div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
-                    <div class="layui-input-inline">
-                        <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
-                    </div>
-                </div>
-                <div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
-                    <div class="layui-input-inline">
-                        <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
-                    </div>
-                </div>-->
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">妯″叿璁惧</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HEquipMentName" id="HEquipMentName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <input type="hidden" name="HEquipMentID" id="HEquipMentID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipMent" id="btnHEquipMent" style="width: 40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
+            <label class="layui-form-label">璁″垝寮�宸ユ棩鏈�</label>
+            <div class="layui-input-inline">
+                <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
+            </div>
+        </div>
+        <div class="layui-col-xs3 layui-inline">
+            <label class="layui-form-label">璁″垝瀹屽伐鏃ユ湡</label>
+            <div class="layui-input-inline">
+                <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
+            </div>
+        </div>-->
+
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">閫夊崟鍙�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                 <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                        </button>-->
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                </button>-->
                                             </div>
                                         </div>
                                         <div class="layui-col-xs3 layui-inline">
@@ -200,62 +191,37 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <!--<div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">鎴愬搧缂栧彿</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
-                    </div>
-                </div>-->
-                                    </div>
-                                    <div class="layui-row">
-                                        <!--<div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">琛ユ枡鍘熷洜</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
-                    </div>
-                </div>-->
-                                        <!--<div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">琛ユ枡鏍囪</label>
-                    <div class="layui-input-block">
-                        <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
-                    </div>
-                </div>-->
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label"> 鏉愭枡瑙勬牸</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
-                                            </div>
-                                        </div>
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">骞呭</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鍏嬮噸</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
-                                            </div>
-                                        </div>
 
+                                        <!--<div class="layui-col-xs3 layui-inline">
+            <label class="layui-form-label">鎴愬搧缂栧彿</label>
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
+            </div>
+        </div>-->
                                     </div>
+
                                     <div class="layui-row">
                                         <!--<div class="layui-col-xs6 layui-inline">
-                    <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
-                    </div>
-                </div>
-                <div class="layui-col-xs3 layui-inline">
-                    <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                        </button>
-                    </div>
-                </div>-->
+            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+            </div>
+        </div>
+        <div class="layui-col-xs3 layui-inline">
+            <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
+            <div class="layui-input-inline">
+                <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                </button>
+            </div>
+        </div>-->
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">杈呮暟閲�</label>
                                             <div class="layui-input-inline">
@@ -279,7 +245,123 @@
                                             </div>
                                         </div>
                                     </div>
-
+                                    <div class="layui-row">
+                                        <!--<div class="layui-col-xs3 layui-inline">
+        <label class="layui-form-label">琛ユ枡鍘熷洜</label>
+        <div class="layui-input-inline">
+            <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value">
+        </div>
+    </div>-->
+                                        <!--<div class="layui-col-xs3 layui-inline">
+        <label class="layui-form-label">琛ユ枡鏍囪</label>
+        <div class="layui-input-block">
+            <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
+        </div>
+    </div>-->
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍏嬮噸</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HEmpID" id="HEmpID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">瀹㈡埛</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCusNames" id="HCusNames" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HCusID" id="HCusID">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">澶囨敞2</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HRemark2" id="HRemark2" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs6 layui-inline">
+                                            <label class="layui-form-label" style="width:12.5%">搴曢儴澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HRemark3" id="HRemark3" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--缇婃瘺淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <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="HHeight" id="HHeight">
+                                            </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="HInches" id="HInches">
+                                            </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="HAl1Long" id="HAl1Long">
+                                            </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="HDensity" id="HDensity">
+                                            </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="HTela" id="HTela">
+                                            </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="HUnderTela" id="HUnderTela">
+                                            </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="HSizing" id="HSizing">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浜よ揣鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HSellDate" id="HSellDate" style="padding-left: 32px;">
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <!--鍏朵粬淇℃伅-->
@@ -420,7 +502,7 @@
                                                 <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3 layui-inline">
+                                        <!--<div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鐗堟湰</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
@@ -431,7 +513,7 @@
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                             </div>
-                                        </div>
+                                        </div>-->
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鑺綋鐗╂枡浠g爜</label>
                                             <div class="layui-input-inline">
@@ -467,12 +549,23 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-col-xs6 layui-inline">
-                                            <label class="layui-form-label" style="width:12.5%">澶囨敞</label>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">妯″叿璁惧</label>
                                             <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width: 610px; background-color: #efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HEquipMentName" id="HEquipMentName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HEquipMentID" id="HEquipMentID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquipMent" id="btnHEquipMent" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
                                             </div>
                                         </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label"> 鏉愭枡瑙勬牸</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
+                                            </div>
+                                        </div>
+                                        
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
                                             <div class="layui-input-inline">
@@ -720,65 +813,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!--缇婃瘺淇℃伅-->
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item">
-                                    <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="HHeight" id="HHeight">
-                                            </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="HInches" id="HInches" >
-                                            </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="HAl1Long" id="HAl1Long" >
-                                            </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="HDensity" id="HDensity" >
-                                            </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="HTela" id="HTela" >
-                                            </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="HUnderTela" id="HUnderTela" >
-                                            </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="HSizing" id="HSizing" >
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浜よ揣鏃ユ湡</label>
-                                            <div class="layui-input-inline">
-                                                <input type="date" class="layui-input" name="HSellDate" id="HSellDate" style="padding-left: 32px;" >
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                     </div>
                     <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
@@ -981,31 +1015,32 @@
                     , { field: 'HProcID', title: '宸ュ簭ID', hide: true }
                     , { field: 'HProcNumber', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcCheck" }
                     , { field: 'HProcName', title: '宸ュ簭鍚嶇О' }
-                    , { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
                     , { field: 'HCenterID', title: '宸ヤ綔涓績ID', hide: true }
                     , { field: 'HCenterNumber', title: '宸ヤ綔涓績浠g爜', edit: 'text', event: "HWorkCenterCheck" }
                     , { field: 'HCenterName', title: '宸ヤ綔涓績鍚嶇О' }
-                    , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
-                    , { field: 'HDeptNumber', title: '閮ㄩ棬浠g爜', edit: 'text', event: "HDeptCheck" }
-                    , { field: 'HDeptName', title: '閮ㄩ棬' }
+                    , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 500, style: "background-color: #e6e6e6" }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
                     , { field: 'HSupNumber', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', event: "HSupCheck" }
                     , { field: 'HSupName', title: '渚涘簲鍟�' }
                     , { field: 'HSupFlag', title: '鏄惁濮斿', templet: '#HSupFlag' }
                     , { field: 'HQty', title: '娴佽浆鍗℃暟閲�', edit: 'text' }
-                    , { field: 'HOutPrice', title: '鍔犲伐鍗曚环', edit: 'text' }
-                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
-                    , { field: 'HRelationQty_In', title: '杩涚珯鏁伴噺', style:"background-color: #e6e6e6" }
-                    , { field: 'HRelationQty_Out', title: '鍑虹珯鏁伴噺', style: "background-color: #e6e6e6"}
-                    , { field: 'HRelationQty_WWOrder', title: '濮斿宸ュ崟鏁伴噺', style: "background-color: #e6e6e6" }
-                    , { field: 'HRelationQty_Bad', title: '涓嶅悎鏍兼暟閲�', style: "background-color: #e6e6e6" }
-                    , { field: 'HOverRate', title: '瓒呴姣斾緥', event: "HOverRate", style: "background-color: #e6e6e6"}
-                    , { field: 'HMaxQty', title: '鏈�楂樹笂闄�', style: "background-color: #e6e6e6" }
-                    , { field: 'HPassRate', title: '鑹巼', style: "background-color: #e6e6e6" }
-                    , { field: 'HSumPassRate', title: '绱鑹巼', style: "background-color: #e6e6e6" }
-                    , { field: 'HPicNum', title: '鍥剧焊缂栧彿', style: "background-color: #e6e6e6"}
-                    , { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', width: 500, style: "background-color: #e6e6e6"}
-                    , { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', width: 500, style: "background-color: #e6e6e6"}
+
+                    //, { field: 'HWorkRemark', title: '鍔犲伐璇存槑', edit: 'text' }
+                    //, { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true }
+                    //, { field: 'HDeptNumber', title: '閮ㄩ棬浠g爜', edit: 'text', event: "HDeptCheck" }
+                    //, { field: 'HDeptName', title: '閮ㄩ棬' }
+                    //, { field: 'HOutPrice', title: '鍔犲伐鍗曚环', edit: 'text' }
+                    //, { field: 'HRelationQty_In', title: '杩涚珯鏁伴噺', style:"background-color: #e6e6e6" }
+                    //, { field: 'HRelationQty_Out', title: '鍑虹珯鏁伴噺', style: "background-color: #e6e6e6"}
+                    //, { field: 'HRelationQty_WWOrder', title: '濮斿宸ュ崟鏁伴噺', style: "background-color: #e6e6e6" }
+                    //, { field: 'HRelationQty_Bad', title: '涓嶅悎鏍兼暟閲�', style: "background-color: #e6e6e6" }
+                    //, { field: 'HOverRate', title: '瓒呴姣斾緥', event: "HOverRate", style: "background-color: #e6e6e6"}
+                    //, { field: 'HMaxQty', title: '鏈�楂樹笂闄�', style: "background-color: #e6e6e6" }
+                    //, { field: 'HPassRate', title: '鑹巼', style: "background-color: #e6e6e6" }
+                    //, { field: 'HSumPassRate', title: '绱鑹巼', style: "background-color: #e6e6e6" }
+                    //, { field: 'HPicNum', title: '鍥剧焊缂栧彿', style: "background-color: #e6e6e6"}
+                    //, { field: 'HProcCheckNote', title: '鏈伐搴忕‘璁よ褰�', width: 500, style: "background-color: #e6e6e6"}
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
                 option = {
@@ -1122,11 +1157,17 @@
                                     var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }
+                                    }                                   
                                     obj.update({
                                         HProcName: checkStatus.data[0].宸ュ簭
                                         , HProcID: checkStatus.data[0].HItemID
                                         , HProcNumber: checkStatus.data[0].宸ュ簭浠g爜
+                                        , HCenterID: checkStatus.data[0].宸ヤ綔涓績ID
+                                        , HCenterNumber: checkStatus.data[0].宸ヤ綔涓績浠g爜
+                                        , HCenterName: checkStatus.data[0].宸ヤ綔涓績
+                                        , HDeptID: checkStatus.data[0].閮ㄩ棬ID
+                                        , HDeptNumber: checkStatus.data[0].閮ㄩ棬浠g爜
+                                        , HDeptName: checkStatus.data[0].閮ㄩ棬
                                     });
 
                                     layer.close(layer.index);
@@ -1645,7 +1686,7 @@
                     type: "get",
                     url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
                     async: true,
-                    data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'", "user": sessionStorage["HUserName"] },
+                    data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'" + " and 宸ュ簭浠g爜 !='" + 9999 + "'", "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         var data = result.data;
                             var Tablerow = [];
@@ -1698,6 +1739,33 @@
                     layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+
+                var HAuxQty = $('#HAuxQty').val();
+                if (HAuxQty.substring(HAuxQty.length - 1, HAuxQty.length) == ".") {
+                    layer.msg("杈呮暟閲忕殑缁撳熬涓嶈兘鏄�.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+\.?[0-9]*$/;
+                    if (!ref.test(HAuxQty)) {
+                        layer.msg("杈呮暟閲忚杈撴纭叆鏁板瓧锛�");
+                        return;
+                    }
+                }
+
+                var HSplitNo = $('#HSplitNo').val();
+                if (HSplitNo.substring(HSplitNo.length - 1, HSplitNo.length) == ".") {
+                    layer.msg("鎷嗗垎鍙风殑缁撳熬涓嶈兘鏄�.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+\.?[0-9]*$/;
+                    if (!ref.test(HSplitNo)) {
+                        layer.msg("鎷嗗垎鍙疯杈撴纭叆鏁板瓧锛�");
+                        return;
+                    }
+                }
+
+                
+
                 //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
                 var sSubTable = [];
                 for (var i = 0; i < table.cache["mainTable"].length; i++) {
@@ -1949,6 +2017,12 @@
                                 , "HAuxUnit": data.HAuxUnit
                                 , "HAuxUnitName": data.杈呭姪鍗曚綅
                                 , "HSplitNo": data.鎷嗗垎鍙�
+                                , "HRemark2": data.澶囨敞2
+                                , "HRemark3": data.搴曢儴澶囨敞
+                                , "HEmpID": data.HEmpID
+                                , "HEmpName": data.涓氬姟鍛�
+                                , "HCusID": data.HCusID
+                                , "HCusNames": data.瀹㈡埛
                                
                                 , "HProjectNum": data.椤圭洰缂栧彿
                                 , "HVerNum": data.鐗堟湰
@@ -2006,7 +2080,7 @@
                                 , "HHeight": data.姣涢珮
                                 , "HInches": data.瀵告暟缁勭粐
                                 , "HAl1Long": data.鍏ㄦ瘺闀�
-                                , "HDensity": data.鍧忓竷瀵嗗害
+                                , "HDensity": data.鍧竷瀵嗗害
                                 , "HTela": data.姣涚罕鍚嶇О鍙婅鏍�
                                 , "HUnderTela": data.搴曚笣
                                 , "HSizing": data.瀹氬瀷娴嗘枡
@@ -2278,6 +2352,11 @@
                             $("#HWeight").val(data.HWeight);
                             $("#HAuxUnitName").val(data.HAuxUnitName);
                             $("#HAuxUnit").val(data.HAuxUnit);
+                            $("#HRemark2").val(data.澶囨敞);
+                            $("#HEmpID").val(data.HEmpID);
+                            $("#HEmpName").val(data.涓氬姟鍛�);
+                            $("#HCusID").val(data.HCusID);
+                            $("#HCusNames").val(data.瀹㈡埛);
                             $("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
                             $("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:閫変腑 false:涓嶉�変腑
                             form.render("checkbox");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 7939ed5..b65a993 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -203,9 +203,9 @@
             //
             var HModName = "Sc_ProcessExchangeBillList";
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜富琛級
-            var titleData = ["HItemID", "HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID"];
+            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit"];
              //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹烘祦绋嬶級
-            var titleData2 = ["HEntryID", "HProcID", "HCenterID", "HDeptID", "hmainid", "hicmointerid", "HWorkShopID", "HMaterID", "HUnitID", "hsubid", "HSupID"];
+            var titleData2 = ["宸ュ簭鍙�", "鍑虹珯鎶ュ簾鍏宠仈鏁伴噺", "HProcID", "宸ュ簭浠g爜", "HBackProc", "鍔犲伐璇存槑", "妯″叿缂栧彿", "HCenterID", "宸ヤ綔涓績浠g爜", "HDeptID", "鍔犲伐杞﹂棿浠g爜", "鍔犲伐杞﹂棿", "HGroupID", "鐝粍浠g爜", "鐝粍", "HWorkerID", "鎿嶄綔宸ヤ唬鐮乫", "鎿嶄綔宸�", "HSourceID", "鐢熶骇璧勬簮浠g爜", "鐢熶骇璧勬簮", "璁″垝鏁伴噺", "hmainid", "鍗曟嵁鍙�", "hicmointerid", "浠诲姟鍗曞彿", "HICMOEntryID", "HWorkShopID", "鐢熶骇杞﹂棿浠g爜", "鐢熶骇杞﹂棿", "HMaterID", "浜у搧浠g爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "鎵瑰彿", "HUnitID", "鍗曚綅浠g爜", "鍗曚綅", "鐢熶骇鏁伴噺", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鎽樿", "鍐呴儴鍗曟嵁鍙�", "濮斿璁㈠崟鍐呯爜", "濮斿璁㈠崟瀛愬唴鐮�", "濮斿璁㈠崟鍙�", "HSupID", "渚涘簲鍟�", "渚涘簲鍟嗕唬鐮�", "琛ㄥご澶囨敞", "HBillType", "isEntrust", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "瀛愯鍒掑紑宸ユ棩鏈�", "瀛愯鍒掑畬宸ユ棩鏈�", "瀹為檯寮�宸ユ棩鏈�", "瀹為檯瀹屽伐鏃ユ湡", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "涓婇亾鍥哄畾澶╂暟", "鐢熶骇鍛ㄦ湡", "鍔犲伐鍗曚环", "鏈�鍚庢眹鎶ユ棩鏈�", "鍔犲伐璐圭敤閲戦", "鏈亾宸ュ簭", "棣栭亾宸ュ簭", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "娴佽浆鍗℃暟閲�", "濮斿宸ュ崟鏁伴噺", "涓嶅悎鏍兼暟閲�", "瓒呴姣斾緥", "鑹巼", "绱鑹巼", "鍥剧焊缂栧彿", "鏈伐搴忕‘璁よ褰�", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷", "姹囨姤鏁伴噺", "HEntryID", "hsubid", "HPRDORGID", "缁勭粐", "HOrderProcNO"];
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝櫒鍏锋竻鍗曪級
             var titleData3 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid","hicmointerid"];
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹哄弬鏁版竻鍗曪級
@@ -482,6 +482,17 @@
                                 }
                             }
 
+                            ////鑾峰彇涓嶉渶瑕佹樉绀虹殑瀛楁  缁欓殣钘�
+                            //var str = "";
+                            //for (var i = 0; i < data.length; i++) {
+                            //    if ($.inArray(data[i].name, ["娴佹按鍙�", "宸ュ簭鍚嶇О", "宸ヤ綔涓績", "宸ヨ壓鍙傛暟", "澶囨敞", "杩涚珯鍏宠仈鏁伴噺", "鍑虹珯鍏宠仈鏁伴噺", "鏃ユ湡", "渚涘簲鍟嗕唬鐮�", "渚涘簲鍟嗗悕绉�", "鏄惁濮斿"]) > -1) {
+
+                            //    } else {
+                            //        str += data[i].name + ",";
+                            //    }
+                            //}
+                            //console.log(str);
+
                             //鍔ㄦ�佹樉绀哄垪鍚�
                             option2 = {
                                 elem: '#mainTable2'
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
index 841bf1d..bb9425f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeIssueBillList.html"
@@ -30,28 +30,26 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鎵撳嵃鐘舵��</label>
-                                    <div class="layui-input-block" style="width:100px">
-                                        <select name="city" lay-verify="required" id="SHPrintQty">
-                                            <option value="鍏ㄩ儴">鍏ㄩ儴</option>
-                                            <option value="鏈墦鍗�">鏈墦鍗�</option>
-                                            <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇杞﹂棿</label>
+                                    <div class="layui-input-block">
+                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
+                                            <!--鍔ㄦ�佹覆鏌撹溅闂�-->
                                         </select>
                                     </div>
-                                </div>
-                                <input type="checkbox" id="wybj" name="wybj" title="鍙樉绀哄澶�" lay-filter="wybj" lay-skin="primary">
+                                </div>                               
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input" id="HDate">
+                                        <input type="text" class="layui-input" name="HModel" id="HModel">
                                     </div>
                                 </div>
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
-                                    <div class="layui-input-block">
-                                        <input type="date" class="layui-input" id="HDate1">
-                                    </div>
-                                </div>
+
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
@@ -76,12 +74,27 @@
                                                 <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <label class="layui-form-label">鎵撳嵃鐘舵��</label>
+                                            <div class="layui-input-block" style="width:100px">
+                                                <select name="city" lay-verify="required" id="SHPrintQty">
+                                                    <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+                                                    <option value="鏈墦鍗�">鏈墦鍗�</option>
+                                                    <option value="宸叉墦鍗�">宸叉墦鍗�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <input type="checkbox" id="wybj" name="wybj" title="鍙樉绀哄澶�" lay-filter="wybj" lay-skin="primary">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                                <input type="date" class="layui-input" id="HDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" id="HDate1">
                                             </div>
                                         </div>
                                     </div>
@@ -138,6 +151,7 @@
             var option2 = "";
             var HBillNo = "";
             var wybj = false;
+            var HDeptID = 0;
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -145,8 +159,8 @@
             //
             var HModName = "Sc_ProcessExchangeIssueBillList";
             //鍒濆鍖栫晫闈�
-            set_ClearBill();
-
+            set_ClearBill();            
+           
             //#endregion
 
             //#region 澶村伐鍏锋爮浜嬩欢
@@ -224,8 +238,29 @@
                 set_InitGrid();
                 //鏌ヨ
                 get_FastQuery();
+                //杞﹂棿鍒楄〃
+                getDept();
             }
 
+            //鑾峰彇杞﹂棿鍒楄〃
+            function getDept() {
+                var HDeptName = '<option value="0" style="color:red;" selected>鍏ㄩ儴杞﹂棿</option>';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+                            }
+                            $("#HDeptName").append(HDeptName);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
 
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
@@ -237,9 +272,12 @@
                 $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
                 $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
                 $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HModel").val("");//瑙勬牸鍨嬪彿
+                $("#HDeptName").val("0");//杞﹂棿
+                form.render('select');
                 //$("#btnSearch").click();
-                sWhere = "";
                 get_FastQuery() ;
+                sWhere = "";
             }
             //#endregion
 
@@ -252,6 +290,8 @@
                 var HWorkBillNo = $("#HWorkBillNo").val();
                 var SHname = $("#SHname").val();//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
+                var HDeptName = $("#HDeptName").val();//杞﹂棿
                 if (SHPrintQty) {//鍒ゆ柇鎵撳嵃鐘舵��
                     if (SHPrintQty == "鍏ㄩ儴") {
                         sWhere = " and 鎵撳嵃娆℃暟 >= 0 ";
@@ -284,6 +324,12 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"
                 }
+                if (HDeptName && HDeptName != "0") {
+                    sWhere += " and HWorkShopID = '" + HDeptName + "'";
+                }
+                if (HModel) {
+                    sWhere += " and 瀛愪欢瑙勬牸 like '%" + HModel + "%'";
+                }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
@@ -312,6 +358,29 @@
                         , { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
                         , { field: 'HEntryID', title: 'HEntryID', width: 90, hide: true }
                         , { field: '涓嬭揪鐘舵��', title: '涓嬭揪鐘舵��' }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
+                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+                        , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
+                        , { field: '瀛愪欢鍚嶇О', title: '浜у搧鍚嶇О' }
+                        , { field: '瀛愪欢瑙勬牸', title: '瑙勬牸鍨嬪彿' }
+                        , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
+                        , { field: '鍗曚綅', title: '鍗曚綅' }
+                        , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+                        , { field: 'HProcID', title: 'HProcID', hide: true }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
+                        , {
+                            field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 120, sort: true, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"
+                        }
+                       , {
+                            field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.璁″垝瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>"
+                        }
+                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
+
+
                         , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
                         , {
                             field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"
@@ -321,38 +390,16 @@
                         , { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
                         , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
                         , { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
-                        , { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
-                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
-                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
-                        , { field: '娴佹按鍙�', title: '娴佹按鍙�' }
-                        , { field: 'HProcID', title: 'HProcID', hide: true }
-                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                        , {
-                            field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�', width: 120, sort: true, templet: "<div>{{d.璁″垝寮�宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>"
-                        }
-                       , {
-                            field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120, sort: true, templet: "<div>{{d.璁″垝瀹屽伐鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝瀹屽伐鏃ユ湡, 'yyyy-MM-dd')}}</div>"
-                        }
-                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 100 }
                         , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
                         , { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
                         , { field: '瀛愪欢浠g爜', title: '瀛愪欢浠g爜' }
-                        , { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
-                        , { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
+                        , { field: '浜у搧鍚嶇О', title: '瀛愪欢鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瀛愪欢瑙勬牸' }
                         , { field: '鎵瑰彿', title: '鎵瑰彿' }
                         , { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
-                        , { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
-                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                        , { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
-                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
-                        , { field: '鍗曚綅', title: '鍗曚綅' }
                         , { field: '璁惧妯″叿浠g爜', title: '璁惧妯″叿浠g爜' }
                         , { field: '璁惧妯″叿', title: '璁惧妯″叿' }
                         , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
-                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
 
                         , { field: '鎽樿', title: '鎽樿' }
                         , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
@@ -379,7 +426,7 @@
             }
             //#region 鏌ヨ
             function get_Display(sWhere) {
-                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
+                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and 宸ュ簭鍚嶇О != '杞伐搴�'";
                 var ajaxLoad = layer.load();
                 $.ajax({
                     url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeIssueBillList_Json',
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill_QiaoYi.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill_QiaoYi.html"
new file mode 100644
index 0000000..3d502c7
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill_QiaoYi.html"
@@ -0,0 +1,1392 @@
+锘�<!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-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+    </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 class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">淇敼</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <h2>宸ュ簭杩涚珯鎺ユ敹鍗�</h2>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label"><span style="color:red;">*</span>鏉″舰鐮�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">闄勪欢淇℃伅</li>
+                            <li lay-id="4" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <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-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>涓婇亾宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpProcName" id="HUpProcName" placeholder="涓婇亾宸ュ簭" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>褰撳墠宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="CurrPro-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佹按鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcNo" id="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅">
+                                            </div>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                            <input type="hidden" value="0" name="HProcID" id="HProcID">
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HQty" id="HQty" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>浜у搧浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎺ユ敹浠舵暟</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮2</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮3</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮4</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮5</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">杩涚珯鏃堕棿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇缁勭粐</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPRDOrg" id="HPRDOrg" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇鐝粍</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpNumber" id="HEmpNumber">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>宸ヤ綔涓績</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>宸ヤ綔涓績</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--闄勪欢淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-upload">
+                                        <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+                                        <div class="layui-upload-list">
+                                            <table class="layui-table">
+                                                <thead>
+                                                    <tr>
+                                                        <th>鏂囦欢鍚�</th>
+                                                        <th>澶у皬</th>
+                                                        <th>鐘舵��</th>
+                                                        <th>鎿嶄綔</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="ProImgByList">
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
+                    <input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
+                    <!--<input type="hidden" name="HMaker" id="HMaker">--><!--鍒跺崟浜�-->
+                    <input type="hidden" name="eventType" id="eventType" value="Add">
+                    <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , upload = layui.upload
+                , element = layui.element;
+            var params = get_UrlVars();
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+                var closeType = 2;  //鍏抽棴绫诲瀷
+            } else if (params[params[0]] == 2) { //宸ュ簭杩涚珯鎺ユ敹鍗�
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var HBillNo = params[params[1]];//婧愬崟鍗曞彿
+                var HProcNo = params[params[2]];//娴佹按鍙�
+
+                var HBarCode = HBillNo;//鏉″舰鐮�
+                var sProcNo = HProcNo;//娴佹按鍙�
+
+                if (HBarCode != "undefined" && sProcNo != "undefined") {
+                    $("#HBarCode").val(HBarCode);
+                    $('#HProcNo').val(sProcNo);
+                    txtHBarCode_KeyDown(HBarCode);
+                    txtHProcNo_KeyDown(HBarCode, sProcNo);
+                }
+            }  else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var HBillNo = params[params[3]];//鍗曟嵁鍙�
+                var closeType = params[params[4]];  //鍏抽棴绫诲瀷
+            }
+
+            //鍒ゆ柇鏄惁鏂板
+            if (OperationType == 1 || OperationType == 2) {
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                //鑾峰彇鏈�澶у崟鎹彿
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3790' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        PicUpload();
+                        layer.close(ajaxLoad);
+                    }
+                    , error: function () {
+                        layer.close(ajaxLoad);
+                        layer.msg("鑾峰彇鍗曟嵁鍙峰け璐ワ紝璇峰埛鏂伴噸璇曪紒");
+                    }
+                });
+                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
+                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
+                $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
+                GetDefValByUser();
+            }
+            else if (OperationType == 3) {
+                $("#eventType").val("Modify");
+                RoadBillMain(linterid);
+                $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
+                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
+                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
+                //RoadBillSub(linterid);
+            }
+            else if (OperationType == 4) {
+                RoadBillMain(linterid);
+                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
+                $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+                $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+                //RoadBillSub(linterid);
+            }
+
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+            $("#HBarCode").focus();
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫夋嫨娴佹按鍙峰脊绐�
+            form.on('submit(SerialNum-BT)', function () {//鐢熶骇璧勬簮
+                var value = $("#HProcExchHinteID").val();
+                // 鍒ゆ柇鏄惁宸茬粡杈撳叆娴佹按鍙凤紝鏄垯寮瑰嚭妯℃�佹锛屽惁鍒欑粰鍑烘彁绀�
+                if (value) {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '娴佹按鍙�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: [`../../Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html?HInterID=${value}`, 'yes']
+                        , resize: false
+                        , cancel: function (index, layero) {
+                        }
+                    })
+                } else {
+                    layer.alert('璇锋偍纭杈撳叆娴佽浆鍗″彿鍚庨噸璇昢_^', { icon: 7 });
+                    //alert('璇峰厛杈撳叆娴佽浆鍗″彿!')
+                }
+            });
+
+            //#region 鏂板鎸夐挳
+            form.on('submit(set_AddNew)', function () {//鎻愪氦
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    location.replace('Cj_StationInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                });
+            })
+            //#endregion
+
+            //#region 淇敼鎸夐挳
+            form.on('submit(set_Modify)', function () {//鎻愪氦
+                //缂栬緫鍓嶅垽鏂�
+                set_ShowBillJudge();
+            })
+            //#endregion
+
+            //#region 鎻愪氦鎸夐挳
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //var tableData = data.field;
+                if ($("#lngBillSubKey").val() == 0) {
+                    layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                //console.log(data.field);
+                var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                //var oMain = data.field;
+                var HUserName = sessionStorage["HUserName"];
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Cj_StationInBill/AddBill",
+                    async: true,
+                    data: { "oMain": oMain},
+                    dataType: "json",
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+
+                            $("#HQty").attr("disabled", "true");
+                            if (result.Verify == "Y") {
+                                location.replace('Cj_StationInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+                            } else {
+                                //淇濆瓨鍚庢祻瑙�
+                                ReRoadBillMain();
+                            }
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            });
+            //#endregion
+
+            //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 1) {
+                        Pub_Close(closeType);
+                    } else if (OperationType == 3) {
+                        Pub_Close(1);
+                    } else if (OperationType == 4) {
+                        Pub_Close(1);
+                    } else if (OperationType == 2) {
+                        Pub_Close(1);
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function () {
+                //瀹℃牳鏂规硶
+                set_CheckBill();
+            })
+            //#endregion
+
+            //#region 鍙嶅鏍告寜閽�
+            form.on('submit(set_AbandonCheck)', function () {
+                //鍙嶅鏍告柟娉�
+                set_AbandonCheck();
+            })
+            //#endregion
+
+            //#endregion
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HBillNo=' + $("#HBillNo").val() + '&HSouceBillType=');
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationInBill/GetStationInBill",
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (result) {
+                        var data = result.data[0];
+                        txtHBarCode_KeyDown(data.HBarCode);
+                        txtHProcNo_KeyDown(data.HBarCode, data.HProcNo);
+                        form.val("formData", { //HGroupName
+                            "HInterID": data.HInterID,
+                            "HBillNo": data.HBillNo,
+                            "HBarCode": data.HBarCode,
+                            "HProcNo": data.HProcNo,
+                            "HQty": data.HQty,
+                            "HGroupID": data.HGroupID,
+                            "HGroupName": data.HGroupName,
+                            "HSourceID": data.HSourceID,
+                            "HSourceName": data.HSourceName,
+                            "HEmpID": data.HEmpID,
+                            "HEmpName": data.HEmpName,
+                            "HRemark": data.HRemark,
+                            "HMaker": data.HMaker,
+                            "HMakeDate": Pub_Format(data.HMakeDate, "yyyy-MM-dd hh:mm:ss"),
+                            "HUpDater": data.HUpDater,
+                            "HUpDateDate": data.HUpDater == "" ? "" : Pub_Format(data.HUpDateDate, "yyyy-MM-dd hh:mm:ss"),
+                            "HChecker": data.HChecker,
+                            "HCheckDate": data.HChecker == "" ? "" : Pub_Format(data.HCheckDate, "yyyy-MM-dd hh:mm:ss")
+                        });
+                        if (data.鏄惁瀹℃牳 == "true") {
+                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+                        } else {
+                            $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+                            $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+                        }
+                        if (OperationType == 3) {
+                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+                            $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+                        }
+                        PicUpload();
+                        layer.close(index);
+                    }
+                    , error: function () {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+            function GetDefValByUser()
+            {
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+                    type: "GET",
+                    data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var data = result.data[0];
+
+                        form.val("formData", {
+                            "HSourceID": data.HSourceID,
+                            "HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+                            "HGroupID": data.HGroupID,
+                            "HGroupName": data.鐢熶骇鐝粍鍚嶇О,
+                            "HCenterID": data.HWorkCenterID,
+                            "HCenterName": data.宸ヤ綔涓績鍚嶇О,
+                            "HEmpID": data.HEmpID,
+                            "HEmpNumber": data.鎿嶄綔鍛樹唬鐮�,
+                            "HEmpName": data.鎿嶄綔鍛樺悕绉�
+                        });
+                        layer.close(index);
+                    }
+                    , error: function () {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫鍓嶅垽鏂�
+            function set_ShowBillJudge() {
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationInBill/set_ShowBillJudge", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HBillNo": HBillNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            location.replace('Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillNo=' + HBillNo);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 瀹℃牳鏂规硶
+            function set_CheckBill() {
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill",
+                    data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.alert(result.Message, { icon: 6 });
+                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍告柟娉�
+            function set_AbandonCheck() {
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationInBill/set_AbandonCheck",
+                    data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.alert(result.Message, { icon: 6 });
+                            $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽鐢�
+                            $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+        //#endregion
+
+
+            //鏂囦欢涓婁紶
+            function PicUpload() {
+                //澶氬浘鐗囦笂浼�
+                //澶氭枃浠跺垪琛ㄧず渚�
+                var ProImgByList = $('#ProImgByList')
+                    , uploadListIns = upload.render({
+                        elem: '#testList'
+
+                        , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
+                        , accept: 'file'
+                        , multiple: true
+                        , auto: false
+                        //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+                        , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+                        , choose: function (obj) {
+                            var files = this.files = obj.pushFile(); //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+                            //璇诲彇鏈湴鏂囦欢
+                            obj.preview(function (index, file, result) {
+                                var tr = $(['<tr id="upload-' + index + '">'
+                                    , '<td>' + file.name + '</td>'
+                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td>绛夊緟涓婁紶</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+                                //鍗曚釜閲嶄紶
+                                tr.find('.demo-reload').on('click', function () {
+                                    obj.upload(index, file);
+                                    return false;
+                                });
+
+                                //鍒犻櫎
+                                tr.find('.demo-delete').on('click', function () {
+                                    delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+                                    tr.remove();
+                                    uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+                                });
+
+                                ProImgByList.append(tr);
+                            });
+                        }
+                        , done: function (res, index, upload) {
+                            if (res.code == 1) { //涓婁紶鎴愬姛
+                                var tr = ProImgByList.find('tr#upload-' + index)
+                                    , tds = tr.children();
+                                tds.eq(2).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+                                tds.eq(3).html(''); //娓呯┖鎿嶄綔
+                                //tds.eq(3).find('.demo-reload').addClass('layui-hide'); //闅愯棌涓婁紶
+                                return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+                            }
+                            this.error(index, upload);
+                        }
+                        , error: function (index, upload) {
+                            var tr = ProImgByList.find('tr#upload-' + index)
+                                , tds = tr.children();
+                            tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+                        }
+                    });
+            }
+
+            //鑾峰彇缂栬緫鏃�,宸蹭笂浼犵殑鏂囦欢鍒楄〃
+            if (HBillNo != null || HBillNo != undefined) {
+                var ProImgByList = $('#ProImgByList')
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
+                    type: "GET",
+                    data: { "HBillNo": HBillNo },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var index = 0;
+                            for (var i = 0; i < data1.data.length; i++) {
+                                var tr = $(['<tr id="upload-' + i + '">'
+                                    , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+                                    , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+                                    , '<td>' + data1.data[i].HFileName + '</td>'
+                                    , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+                                    , '<td style="display:none">' + data1.data[i].url + '</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs  demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+                                $('#ProImgByList').append(tr);
+                            }
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+
+            //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
+            var HProcExchBillNoFlag = false;
+            //鍒濆鍩烘湰淇℃伅璧嬪��
+            $("#HStationInTime").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+            $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+            //$("#HEmpID").val(sessionStorage["Czybm"]);
+            //$("#HEmp").val(sessionStorage["HUserName"]);
+
+
+
+
+            //鏉″舰鐮佸洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                var HBarCode = $('#HBarCode').val();
+                if (event.keyCode == 13) {
+                    if (!HBarCode) {
+                        layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
+                        return;
+                    }
+                    txtHBarCode_KeyDown(HBarCode);
+                }
+            });
+
+            function txtHBarCode_KeyDown(HBarCode) {
+                var barNo = HBarCode.substr(0, 3);
+                if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
+                    layer.msg("璇锋壂瀹屾祦杞崱鍚庡啀鎵伐搴忕爜")
+                    layer.close(index);
+                    return;
+                }
+
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationBill/txtHBarCode_KeyDown2",
+                    type: "GET",
+                    data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "In" },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+
+                            switch (barNo) {
+                                case "HCX":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HSourceID": data.HItemID,
+                                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О
+                                    });
+                                    break;
+                                case "SBM":
+                                    layer.msg("璁惧鍚嶇О : " + data.璁惧鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "璁惧鐮�" });
+                                    break;
+                                case "JYM"://妫�楠屽憳
+                                    layer.msg("妫�楠屽憳 : " + data.鑱屽憳鍚嶇О + "<br>" + "閮ㄩ棬 : " + data.閮ㄩ棬鍚嶇О + "<br>" + "鐝粍 : " + data.鐝粍鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "鍛樺伐鐮�" });
+                                    //form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    //    "HEmpID": data.HItemID,
+                                    //    "HEmpNumber": data.鑱屽憳浠g爜,
+                                    //    "HEmpName": data.鑱屽憳鍚嶇О
+                                    //});
+                                    break;
+                                case "GRM"://鎿嶄綔鍛橈紝鎺ユ敹浜�
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HEmpID": data.HItemID,
+                                        "HEmpNumber": data.鑱屽憳浠g爜,
+                                        "HEmpName": data.鑱屽憳鍚嶇О,
+                                        "HGroupID": data.鐝粍ID,
+                                        "HGroupName": data.鐝粍鍚嶇О
+                                    });
+                                    break;
+                                //case "CGM":
+                                //    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                //        "HEmpID": data.HItemID,
+                                //        "HEmpNumber": data.鑱屽憳浠g爜,
+                                //        "HEmpName": data.鑱屽憳鍚嶇О
+                                //    });
+                                //    break;
+                                case "HWH":
+                                    var HSpflag = data.鍚敤浠撲綅 == "Y" ? "鏄�" : "鍚�";
+                                    layer.msg("浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О + "<br>" + "鍚敤浠撲綅 : " + HSpflag, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撳簱鐮�" });
+                                    break;
+                                case "HSP":
+                                    layer.msg("浠撲綅鍚嶇О : " + data.浠撲綅鍚嶇О + "<br>" + "浠撳簱鍚嶇О : " + data.浠撳簱鍚嶇О, { icon: 6, btn: ['纭'], time: 6000, offset: 't', skin: 'layui-layer-lan', title: "浠撲綅鐮�" });
+                                    break;
+                                case "PRO":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HProcID": data.HItemID,
+                                        "HProcName": data.宸ュ簭鍚嶇О,
+                                        "HProcNo": data.娴佹按鍙�,
+                                        "lngBillSubKey": data.hsubid,
+                                        "HCenterName": data.宸ヤ綔涓績,
+                                        "HCenterID": data.HCenterID
+                                    });
+                                    break;
+                                case "WLM":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HMaterID": data.HItemID,
+                                        "HMaterName": data.鐗╂枡鍚嶇О,
+                                        "HMaterNumber": data.鐗╂枡浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿
+                                    });
+                                    break;
+                                case "GXL":
+                                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                        "HICMOInterID": data.hicmointerid,
+                                        "lngICMOEntryID": data.lngICMOEntryID,
+                                        "HICMOBillNo": data.浠诲姟鍗曞彿,
+                                        "HMaterID": data.HMaterID,
+                                        "HMaterName": data.浜у搧,
+                                        "HMaterNumber": data.浜у搧浠g爜,
+                                        "HMaterModel": data.瑙勬牸鍨嬪彿,
+                                        "HPieceQty": data.娴佽浆鍗℃暟閲�,
+                                        "HPlanQty": data.娴佽浆鍗℃暟閲�,
+                                        "HProcExchBillNo": data.鍗曟嵁鍙�,
+                                        "HProcExchHinteID": data.hmainid,
+                                        "HICMOQty": data.浠诲姟鍗曟暟閲�,
+                                        "lngBillKey": data.hmainid,
+                                        "HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
+                                        "HPRDOrg": data.缁勭粐,
+                                        "HPRDOrgID": data.缁勭粐
+                                    });
+                                    //$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
+                                    //$("#HBarCode").css("background-color", "#efefef4d");
+                                    HProcExchBillNoFlag = true;
+
+                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
+
+                                    var HInterID = data.hmainid;
+                                    //鑷姩鍖归厤娴佹按鍙�
+                                    $.ajax({
+                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
+                                        type: "GET",
+                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType":"In" },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = data1.data[0];
+                                                form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                                    "lngBillSubKey": data.hsubid,
+                                                    "HProcName": data.宸ュ簭,
+                                                    "HProcID": data.宸ュ簭ID,
+                                                    "HProcNo": data.娴佹按鍙�,
+                                                    "HCenterName": data.宸ヤ綔涓績,
+                                                    "HCenterID": data.HCenterID
+                                                });
+                                                $("#HProcNo").attr("readonly", "readonly");
+                                                $("#HProcNo").css("background-color", "#efefef4d");
+                                            }
+                                        }
+                                    })
+
+                                    //鍔ㄦ�佸垪
+                                    $.ajax({
+                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                        type: "GET",
+                                        data: { "HProcExchHinteID": HProcExchHinteID },
+                                        success: function (data1) {
+                                            if (data1.count == 1) {
+                                                var data = [];
+                                                var col = [];
+                                                //缁欑┖鐨勬暟缁勮祴鍊�
+                                                for (var key in data1.list) {
+                                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                                }
+                                                //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                                                col.push({ type: 'checkbox', fixed: 'left' });
+                                                for (var i = 0; i < data.length; i++) {
+                                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                                    if ($.inArray(data[i].name, titleData) > -1) {
+                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                                    }
+                                                    else {
+                                                        switch (data[i].Type) {
+                                                            //int
+                                                            case 'DateTime':
+                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                                                break;
+                                                            default:
+                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            option = {
+                                                elem: '#mainTable',
+                                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+                                                type: "GET",
+                                                //, cellMinWidth: 80
+                                                toolbar: '#toolbarDemo'
+                                                , where: { HProcExchHinteID: HProcExchHinteID }
+                                                , cols: [col]
+                                                , height: 500
+                                            }
+                                            table.render(option)
+                                        }
+                                    })
+                                    break;
+                            }
+                            //layer.close(index);
+                            //set_InitGrid();
+                            //table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            //DisPlay_HideColumn();
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //娴佹按鍙凤紙宸ュ簭鍙凤級鍥炶溅鏂规硶
+            $('#HProcNo').on('keydown', function (event) {
+                var sProcNo = $('#HProcNo').val();
+                var sBillNo = $('#HBarCode').val();
+                if (event.keyCode == 13) {
+                    if (!HProcExchBillNoFlag) {
+                        layer.msg("娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栬�呭湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒");
+                        return;
+                    }
+                    txtHProcNo_KeyDown(sBillNo, sProcNo);
+                }
+            });
+
+            function txtHProcNo_KeyDown(sBillNo, sProcNo) {
+                var index = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",
+                    type: "GET",
+                    data: { "sBillNo": sBillNo, "sProcNo": sProcNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "lngBillSubKey": data.hsubid,
+                                "HProcName": data.宸ュ簭,
+                                "HProcID": data.HProcID,
+                                "HCenterName": data.宸ヤ綔涓績,
+                                "HCenterID": data.HCenterID
+                            });
+                            $("#HProcNo").attr("readonly", "readonly");
+                            $("#HProcNo").css("background-color", "#efefef4d");
+                            layer.close(index);
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#region 椤甸潰蹇嵎閿脊绐椻�斿伐搴忔祦杞崱鍏宠仈鏁伴噺
+            $('body').on('keydown', function (e) {
+                var HinteID = $("#HProcExchHinteID").val();
+                if (e.key == "F7") {
+                    if (HinteID == "" || HinteID == null || HinteID == undefined) {
+                        layer.alert("璇峰厛杈撳叆鏉″舰鐮佹垨鎵弿鏉″舰鐮�", { icon: 5 });
+                    }
+                    else {
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '宸ュ簭娴佽浆鍗″叧鑱旀暟閲�',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['90%', '90%'],
+                            maxmin: true,
+                            content: ['../宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationQty.html?HInterID=' + HinteID, 'yes'],
+                            end: function () {
+                            }
+                        });
+                    }
+                }
+            })
+            //#endregion
+
+            //閫夋嫨鐢熶骇鐝粍寮圭獥
+            form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鏈珯宸ュ簭'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+
+            //閫夋嫨鐢熶骇璧勬簮寮圭獥
+            form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+                console.log($('#HProcNo').val())
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鐢熶骇璧勬簮'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+            //閫夋嫨鎺ユ敹浜�
+            form.on('submit(HEmployeeID-BT)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鑱屽憳鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+
+            //
+            $('#HEmpNumber').on('keydown', function (event) {
+                var HEmpNumber = $("#HEmpNumber").val();
+                if (event.keyCode == 13) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Cj_StationInBill/GetMessageByEmpNumber',
+                        type: "GET",
+                        data: { "HEmpNumber": HEmpNumber },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                $("#HEmpNumber").val(data1.data[0].HNumber);
+                                $("#HEmpName").val(data1.data[0].HName);
+                                $("#HEmpID").val(data1.data[0].HItemID);
+                              /*  layer.alert($("#HEmpID").val());*/
+                            }
+                            else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+
+
+
+
+            //閫夋嫨宸ヤ綔涓績寮圭獥
+            form.on('submit(HWorkingProcedure-BT)', function () {//閫夋嫨宸ヤ綔涓績
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '宸ヤ綔涓績'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+                //layer.msg('绂佹閫夋嫨');
+            });
+
+            //閫夋嫨褰撳墠宸ュ簭寮圭獥
+            form.on('submit(CurrPro-BT)', function () {//閫夋嫨褰撳墠宸ュ簭
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '褰撳墠宸ュ簭'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+                //layer.msg('绂佹閫夋嫨');
+            });
+
+            //閫夋嫨渚涘簲鍟�
+            form.on('submit(btnSearchSup)', function () {
+                layer.msg('绂佹閫夋嫨');
+            });
+
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+        //鍒犻櫎鏂囦欢
+        function toManager(r) {
+            //寰楀埌褰撳墠鎵�鍦ㄨ
+            var rows = r.parentNode.parentNode.rowIndex;
+            //寰楀埌鎵�鍦ㄨ鐨勭涓�鍒楃殑鍐呭:涓婚敭ID
+            var HItemID = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(0)").html();
+            //寰楀埌鎵�鍦ㄨ鐨勭浜屽垪鐨勫唴瀹�:鍗曟嵁鍙�
+            var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
+            //寰楀埌鎵�鍦ㄨ鐨勭涓夊垪鐨勫唴瀹�:鏂囦欢鍚嶇О
+            var HFileName = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(2)").html();
+            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+
+                //鍒犻櫎宸蹭笂浼犳枃浠�
+                $.ajax({
+                    url: GetWEBURL() + '/Cj_StationOutBill/DeleteFilelist',
+                    type: "GET",
+                    data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.alert(data1.Message, { icon: 1 });
+                            $("#ProImgByList tr").eq((rows - 1)).remove();
+                        }
+                        else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            })
+        }
+
+        //涓嬭浇鏂囦欢
+        function dowload(r) {
+            //寰楀埌褰撳墠鎵�鍦ㄨ
+            var rows = r.parentNode.parentNode.rowIndex;
+            //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+            var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
+            /*window.location.href = url;*/
+            window.open(url)
+        }
+
+        //杩斿洖鐢熶骇鐝粍
+        function GetProductionTeamValue(obj) {
+            $("#HGroupName").val(obj[0].鐝粍);
+            $("#HGroupID").val(obj[0].HItemID);
+        }
+
+        //杩斿洖鐢熶骇璧勬簮
+        function GetProductionResourcesValue(obj) {
+            $("#HSourceName").val(obj[0].鐢熶骇璧勬簮);
+            $("#HSourceID").val(obj[0].HItemID);
+        }
+        //杩斿洖鎿嶄綔鍛�
+        function GetHWorkerValue(obj) {
+            $("#HEmpName").val(obj[0].HName);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
+        //杩斿洖宸ヤ綔涓績
+        function GetWorkCenterValue(obj) {  //杩斿洖宸ヤ綔涓績
+            $("#HCenterName").val(obj[0].宸ヤ綔涓績);
+            $("#HCenterID").val(obj[0].HItemID);
+        }
+        //杩斿洖褰撳墠宸ュ簭
+        function GetHProcValue(obj) {  //杩斿洖褰撳墠宸ュ簭
+            $("#HProcName").val(obj[0].宸ュ簭);
+            $("#HProcID").val(obj[0].HItemID);
+        }
+
+        //杩斿洖娴佹按鍙�
+        function GetProcNoValue(obj) {
+            $("#HProcNo").val(obj[0].娴佹按鍙�);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
index 606a18c..934666a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Kf_OtherOutBill_FastList.html"
@@ -121,7 +121,8 @@
         , table = layui.table
         , form = layui.form
         , element = layui.element;
-        var sBillType = '1206'
+        var sBillType = '1206';
+        var option = [];
         //娓呯┖鐣岄潰  new
 
         //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
@@ -338,25 +339,93 @@
             })
         });
 
-        table.render({
-            elem: '#dj-table'
-            , url: GetWEBURL() + '/Web/chanpinruk'
-            , toolbar: '#toolbarDemo'
-            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
-            , cols: [[
-                { type: 'radio' }
-                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
-                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
-                , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
-                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
-                , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
-                , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
-            ]]
-            , height: 500
-            , done: function () {
-                layer.closeAll("loading");
+        //table.render({
+        //    elem: '#dj-table'
+        //    , url: GetWEBURL() + '/Web/chanpinruk'
+        //    , toolbar: '#toolbarDemo'
+        //    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+        //    , cols: [[
+        //        { type: 'radio' }
+        //        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+        //        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+        //        , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+        //        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+        //        , { field: 'HQty', title: '鏁伴噺', width: 100 }
+        //        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+        //        , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
+        //        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+        //    ]]
+        //    , height: 500
+        //    , done: function () {
+        //        layer.closeAll("loading");
+        //    }
+        //})
+
+        //鍔ㄦ�佸垪
+        $.ajax({
+            url: GetWEBURL() + "/Web/chanpinruk1",
+            type: "GET",
+            async: false,
+            data: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] },
+            //async: false,
+            success: function (data1) {
+              
+                if (data1.count == 1) {
+
+                    var data = [];
+                    var col = [];
+                    //缁欑┖鐨勬暟缁勮祴鍊�
+                    for (var key in data1.list) {
+                        data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                    }
+                    //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                    col.push({ type: 'radio', fixed: 'left' });
+                    for (var i = 0; i < data.length; i++) {
+                        if ($.inArray(data[i].name, "") > -1) {
+                            col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                        }
+                        else {
+                            switch (data[i].Type) {
+                                //int
+                                case 'DateTime':
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                    break;
+                                default:
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                            }
+                        }
+                    }
+
+                    option = {
+                        elem: '#dj-table'
+                        , toolbar: '#toolbarDemo'
+                        , height: 500
+                        , page: true //寮�鍚垎椤�
+                        , limit: 50
+                        , limits: [50, 500, 5000, 20000]
+                        , cols: [col]
+                        , data: data1.data
+                    };
+                    table.render(option);
+                } else {
+                    option = {
+                        elem: '#dj-table'
+                        , toolbar: '#toolbarDemo'
+                        , height: 500
+                        , page: true //寮�鍚垎椤�
+                        , limit: 50
+                        , limits: [50, 500, 5000, 20000]
+                        , cols: [[
+                            { type: 'radio' }
+                            , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+                            , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                            , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                        ]]
+                        , data:[]
+                    };
+                    table.render(option);
+                }
             }
         })
         
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 39729ad..b49065e 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -1119,7 +1119,9 @@
                                 //$("#HStockPlaceID").val(result.data[0].HItemID);
                                 $("#HWHID").val(result.data[0].HItemID);
                                 $("#HWHNAME").val(result.data[0].HName);
-                                element.tabChange('tab-POStockInBill', '2');
+                                element.tabChange('tab-SellOutBill', '3');
+                                //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉$爜涓�
+                                $("#HBarCode").focus();
                             }
                             else {
                                 // $("#verifycode").click();
@@ -1680,9 +1682,9 @@
                             //$("#HDeptID").val(result.data[0].HDeptID);
                             //$("#HDeptName").val(result.data[0].HDeptName);
                             HSourceFlag = true;
-                            element.tabChange('tab-SellOutBill', '3');
+                            element.tabChange('tab-SellOutBill', '2');
                             //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉$爜涓�
-                            $("#HBarCode").focus();
+                            $("#HWHNAME").focus();                            
                             //table.reload('wl-table', {
                             //    where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                             //});
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 2a75eaa..ef11660 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -416,7 +416,7 @@
             $("#HBillerID").hide();
             var HSourceFlag = sessionStorage["SourceFlag"];//婧愬崟宸叉爣璁�
 
-            //鍏夋爣榛樿鏄剧ず鍦ㄥ師鍗曞彿浣嶇疆
+            //鍏夋爣榛樿鏄剧ず鍦ㄦ簮鍗曞彿浣嶇疆
             $("#HSourceBillNo").focus();
 
             //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛�
@@ -801,7 +801,9 @@
                                 //$("#HStockPlaceID").val(result.data[0].HItemID);
                                 $("#HWHID").val(result.data[0].HItemID);
                                 $("#HWHNAME").val(result.data[0].HName);
-                                element.tabChange('tab-POStockInBill', '2');
+                                element.tabChange('tab-MateOutBill', '3');
+                                //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉$爜涓�
+                                $("#HBarCode").focus();
                             }
                             else {
                                 // $("#verifycode").click();
@@ -1272,9 +1274,9 @@
                         if (result.data.hMulSourceFlagField == 0) {
                             $("#HSourceBillNo").attr("readonly", "readonly");
                         }
-                        element.tabChange('tab-MateOutBill', '3');
-                        //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌鏉$爜涓�
-                        $("#HBarCode").focus();
+                        element.tabChange('tab-MateOutBill', '2');
+                        //鎵簮鍗曟垚鍔熷悗锛屽厜鏍囨樉绀哄埌浠撳簱涓�
+                        $("#HWHNAME").focus();                       
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             playSound1();//鎾斁澹伴煶
                             layer.load(3)                           
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index c2402ba..f207774 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -120,7 +120,7 @@
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label>
                                         </div>
                                         <div class="layui-col-xs6">
-                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
+                                            <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
                                             <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
@@ -357,7 +357,7 @@
             var HSourceFlag = sessionStorage["SourceFlag"];
             //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
 
-            $("#HBarCode").focus();
+            $("#HWHNAME").focus();                 
 
             // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
             function formatDate(date) {
@@ -1167,6 +1167,7 @@
                             if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 //$("#HStockPlaceName").val(result.data[0].HName);
                                 //$("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HBarCode").focus();      
                                 $("#HWHID").val(result.data[0].HItemID);
                                 $("#HWHNAME").val(result.data[0].HName);
                                 element.tabChange('tab-POStockInBill', '2');
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index e2544f4..69dc78e 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -556,8 +556,8 @@
             else {
                 //榛樿杩涘叆鍗曟嵁淇℃伅椤电
                 element.tabChange('tab-POStockInBill', '2');
-                //榛樿鍏夋爣鏄剧ず鍦ㄦ潯鐮侀噷闈�
-                var pFocus = $("#HBarCode");
+                //榛樿鍏夋爣鏄剧ず鍦ㄤ粨搴撻噷闈�
+                var pFocus = $("#HWHNAME");
                 pFocus.focus();
                 pFocus.select();
             }
@@ -911,6 +911,7 @@
                             if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 //$("#HStockPlaceName").val(result.data[0].HName);
                                 //$("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HBarCode").focus();
                                 $("#HWHID").val(result.data[0].HItemID);
                                 $("#HWHNAME").val(result.data[0].HName);
                                 element.tabChange('tab-POStockInBill', '2');
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
index e1a680d..884845c 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_FastList.html"
@@ -111,62 +111,62 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
-    layui.config({
-        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-    }).extend({
-        index: 'lib/index' //涓诲叆鍙fā鍧�
-    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-        var $ = layui.$
-        , admin = layui.admin
-        , layer = layui.layer
-        , table = layui.table
-        , form = layui.form
-        , element = layui.element;
-        var sBillType = '1201'
-        //娓呯┖鐣岄潰  new
-
-        //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
-
-        //鍔犺浇婧愬崟绫诲瀷
-
-        //璇诲彇鍗曟嵁鍒楄〃
-
-        //閫�鍑�
-        form.on('submit(cmdCancel)', function () {
-            layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                parent.location.href = "../../../views/index.html";
-            });
-            //parent.location.href = "../../../views/index.html"
-            //window.close();//鍏抽棴褰撳墠椤�
-        })
-        //缂栬緫
-        form.on('submit(cmdModify)', function () {
-            var checkStatus = table.checkStatus('dj-table')
-                     , data = checkStatus.data;
-            //ajaxLabelData = data;
-            //layer.alert(rows);
-            layer.open({
-                type: 2
-                , area: ['100%', '100%']
-                , title: '澶栬喘鍏ュ簱鍗�'
-                , shade: 0.6 //閬僵閫忔槑搴�
-                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
-                , resize: false
-                , cancel: function () {
-                    $(".layui-btn").removeClass("layui-btn-disabled");
-                }
-            })
-        });
-        //鍒锋柊
-        form.on('submit(cmdRefresh)', function () {//
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
             var sBillType = '1201'
-            table.render({
-                elem: '#dj-table'
-                    ,url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
-                    ,toolbar: '#toolbarDemo'
-                    , where: { HBillType: sBillType,sWhere:''}
+            //娓呯┖鐣岄潰  new
+
+            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
+
+            //鍔犺浇婧愬崟绫诲瀷
+
+            //璇诲彇鍗曟嵁鍒楄〃
+
+            //閫�鍑�
+            form.on('submit(cmdCancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.location.href = "../../../views/index.html";
+                });
+                //parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {
+                var checkStatus = table.checkStatus('dj-table')
+                    , data = checkStatus.data;
+                //ajaxLabelData = data;
+                //layer.alert(rows);
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '澶栬喘鍏ュ簱鍗�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        $(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //鍒锋柊
+            form.on('submit(cmdRefresh)', function () {//
+                var sBillType = '1201'
+                table.render({
+                    elem: '#dj-table'
+                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillType: sBillType, sWhere: '' }
                     , cols: [[
                         { type: 'radio' }
                         , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
@@ -178,11 +178,181 @@
                         , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
                         , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
                     ]]
-                      , height: 500
-                      , done: function () {
-                          layer.closeAll("loading");
-                      }
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+                table.render({
+                    elem: '#yd-table'
+                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+                    , toolbar: '#toolbarDemo'
+                    , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                    , page: true  // 寮�鍚垎椤�
+                    , limits: [20, 40, 80, 100]
+                    , limit: 20
+                    , cols: [[
+                        { type: 'radio' }
+                        , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                        , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                        , { field: 'HOrgID', title: '缁勭粐', width: 120 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                })
             });
+            //鎾ら攢鍔熻兘
+            form.on('submit(cmdRescind)', function () {
+                var checkStatus = table.checkStatus('yd-table');
+                var checkStatus2 = table.checkStatus('sy-table');
+                var data = "";
+                if (checkStatus.data.length != 0) {
+                    data = checkStatus.data;
+                } else if (checkStatus2.data.length != 0) {
+                    data = checkStatus2.data;
+                } else {
+                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                }
+                var sInterID = data[0].HInterID
+                var sBillNo = data[0].HBillNo
+                var sBillType = '1201'
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/Web/Rescind_Json",
+                        async: true,
+                        data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, {
+                                icon: 5,
+                                time: 20000
+                            }, function () {
+                                //do something
+                            });
+                        }
+                    });
+            });
+            //鍒犻櫎
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('dj-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var sInterID = data[0].HInterID
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/Web/Delete_Json",
+                                async: true,
+                                data: { "sHInterID": sInterID },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                        });
+                                    }
+                                    else {
+                                        layer.msg(data.Message, { icon: 2 });
+                                    }
+                                },
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, {
+                                        icon: 5,
+                                        time: 20000
+                                    }, function () {
+                                        //do something
+                                    });
+                                }
+                            });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            });
+            //鏌ヨ
+            form.on('submit(cmdQuery)', function () {
+                var HBillNo = $("#HBillNo").val();
+                var HSourceBillNo = $("#HSourceBillNo").val();
+                var index = layer.load();//閬僵
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Web/QueryBillUpdateLoad_Json',
+                    type: "GET",
+                    data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            });
+
+
+            //缂撳瓨鍒楄〃
+            table.render({
+                elem: '#dj-table'
+                , url: GetWEBURL() + '/Web/chanpinruk'
+                , toolbar: '#toolbarDemo'
+                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+                , cols: [[
+                    { type: 'radio' }
+                    , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 100 }
+                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                    , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
+                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+                ]]
+                , height: 500
+                , done: function () {
+                    layer.closeAll("loading");
+                }
+            })
+            //宸蹭笂浼犲垪琛�
             table.render({
                 elem: '#yd-table'
                 , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
@@ -209,158 +379,10 @@
                     layer.closeAll("loading");
                 }
             })
-        });
-        //鎾ら攢鍔熻兘
-        form.on('submit(cmdRescind)', function () {
-            var checkStatus = table.checkStatus('yd-table');
-            var checkStatus2 = table.checkStatus('sy-table');
-            var data = "";
-            if (checkStatus.data.length != 0) {
-                data = checkStatus.data;
-            } else if (checkStatus2.data.length != 0) {
-                data = checkStatus2.data;
-            } else {
-                return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-            }
-            var sInterID = data[0].HInterID
-            var sBillNo = data[0].HBillNo
-            var sBillType = '1201'
-            $.ajax(
-                {
-                    type: "Get",
-                    url: GetWEBURL() + "/Web/Rescind_Json",
-                    async: true,
-                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                // 寰楀埌frame绱㈠紩
-                                var index = layer.getFrameIndex(window.name);
-                                //鍏抽棴褰撳墠frame
-                                layer.close(index);
-                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                window.location.reload();
-                            });
-                            }
-                       else {
-                            layer.msg(data.Message, { icon: 2 });
-                        }
-                    },
-                    error: function (err) {
-                        layer.msg('閿欒' + err, {
-                            icon: 5,
-                            time: 20000
-                        }, function () {
-                            //do something
-                        });
-                    }
-                });
-        });
-        //鍒犻櫎
-        form.on('submit(cmdDelete)', function () {
-            var checkStatus = table.checkStatus('dj-table')
-                , data = checkStatus.data;
-            if (checkStatus.data.length === 1) {
-                var sInterID = data[0].HInterID
-                //閫昏緫鍒犻櫎鏂规硶
-                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                    $.ajax(
-                        {
-                            type: "Get",
-                            url: GetWEBURL() + "/Web/Delete_Json",
-                            async: true,
-                            data: { "sHInterID": sInterID },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                        // 寰楀埌frame绱㈠紩
-                                        var index = layer.getFrameIndex(window.name);
-                                        //鍏抽棴褰撳墠frame
-                                        layer.close(index);
-                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                        window.location.reload();
-                                    });
-                                }
-                                else {
-                                    layer.msg(data.Message, { icon: 2 });
-                                }
-                            },
-                            error: function (err) {
-                                layer.msg('閿欒' + err, {
-                                    icon: 5,
-                                    time: 20000
-                                }, function () {
-                                    //do something
-                                });
-                            }
-                        });
-                })
-            }
-            else {
-                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-            }
-           
-        });
-        //鏌ヨ
-        form.on('submit(cmdQuery)', function () {
-            var HBillNo = $("#HBillNo").val();
-            var HSourceBillNo = $("#HSourceBillNo").val();
-            var index = layer.load();//閬僵
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Web/QueryBillUpdateLoad_Json',
-                type: "GET",
-                data: { "BillType":sBillType,"HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-        });
-        
-        
-        //缂撳瓨鍒楄〃
-        table.render({
-            elem: '#dj-table'
-            , url: GetWEBURL() + '/Web/chanpinruk'
-            , toolbar: '#toolbarDemo'
-            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
-            , cols: [[
-                { type: 'radio' }
-                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
-                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
-                , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
-                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
-                , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
-                , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
-            ]]
-            , height: 500
-            , done: function () {
-                layer.closeAll("loading");
-            }
-        })
-        //宸蹭笂浼犲垪琛�
-        table.render({
-                elem: '#yd-table'
-                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
+            //宸蹭笂浼犳煡璇�
+            table.render({
+                elem: '#sy-table'
                 , toolbar: '#toolbarDemo'
-                , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
-                , page: true  // 寮�鍚垎椤�
-                , limits: [20, 40, 80, 100]
-                , limit: 20
                 , cols: [[
                     { type: 'radio' }
                     , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
@@ -375,46 +397,24 @@
                     , { field: 'HOrgID', title: '缁勭粐', width: 120 }
                 ]]
                 , height: 500
-                , done: function () {
-                    layer.closeAll("loading");
-                }
-        })
-        //宸蹭笂浼犳煡璇�
-        table.render({
-            elem: '#sy-table'
-            , toolbar: '#toolbarDemo'
-            , cols: [[
-                { type: 'radio' }
-                , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
-                , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
-                , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
-                , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
-                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
-                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                , { field: 'HQty', title: '鏁伴噺', width: 100 }
-                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-                , { field: 'HOrgID', title: '缁勭粐', width: 120 }
-            ]]
-            , height: 500
-        })
+            })
 
-        //鍒锋柊鏄庣粏椤电
-        table.render({
-            elem: '#mx-table'
-            // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
-            //, toolbar: '#toolbarDemo'
-            // , where: { sMsg: linterid, sMsg2: lentryid }
-         , cols: [[
-           , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
-         ]]
-         , page: true
-         , height: 500
-         , done: function () {
-         }
+            //鍒锋柊鏄庣粏椤电
+            table.render({
+                elem: '#mx-table'
+                // , url: 'http://localhost:8083/POStockInBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
         });
-    });
-    //娓呯┖琛ㄥご
+        //娓呯┖琛ㄥご
     </script>
 
 </body>

--
Gitblit v1.9.1