From bbc4e956d3bd91796567eafd0dffc82e9fb902c3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 08 二月 2023 11:32:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html       |   10 
 WebTM/views/领料发货/领料出库/Kf_MateOutBackBill_Fast.html     |   53 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html        |   33 
 WebTM/views/user/login.html                            |    2 
 WebTM/views/Baseset/基础资料/OtherOutRequestBillList.html  |   50 
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html       |   77 
 WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html  |   32 
 WebTM/views/基础资料/产品基础资料/Gy_StdMinPickQty.html          |  955 ++++++++++++++
 WebTM/views/领料发货/其他出库/Kf_OtherOutBill_Fast.html        |    2 
 WebTM/views/质量管理/来料检验单/Kf_QCStockInCheckBill_Fast.html |  166 +
 WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast_AR.html       |   49 
 WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html |   32 
 WebTM/views/仓存管理/仓库调拨/Kf_ARPD.html                     | 1645 ++++++++++++++++++++++++
 WebTM/views/home/console_Mobile.html                   |  186 +-
 WebTM/views/基础资料/产品基础资料/Gy_StdMinPickQtyList.html      |  623 +++++++++
 WebTM/views/Baseset/基础资料/Gy_StockPlaceListNew.html     |    5 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html         |   35 
 WebTM/views/index.html                                 |    7 
 WebTM/WebTM.csproj                                     |    3 
 19 files changed, 3,780 insertions(+), 185 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ab25efd..27216dd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -171,6 +171,7 @@
     <Content Include="views\video\success.wav" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_CheckList_New.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Check_New.html" />
+    <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_ARPD.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockOutBill_Fast.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockRequestBillEdit.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockRequestBillList.html" />
@@ -183,6 +184,8 @@
     <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryByMaterID.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_ICInventoryList_WMS.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鐢熸垚\Gy_BarCodeBill.html" />
+    <Content Include="views\鍩虹璧勬枡\浜у搧鍩虹璧勬枡\Gy_StdMinPickQty.html" />
+    <Content Include="views\鍩虹璧勬枡\浜у搧鍩虹璧勬枡\Gy_StdMinPickQtyList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ConkType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceListNew.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceListNew.html"
index 4e1977a..bf53e9f 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceListNew.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlaceListNew.html"
@@ -46,8 +46,9 @@
             return vars;
         }
         var params = getUrlVars();
-        var HWhID = params[params[0]];
-        var Type = params[params[1]];
+        var HWhID = params["HWhID"]; //params[HWhID]
+        var Type = params["Type"];//params[Type]
+        var HOrgID = params["HOrgID"];//params[HOrgID]
 
         layui.use(['table', 'form', 'layer'], function () {
             var table = layui.table
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html"
index 2be179c..50bae57 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/OtherOutRequestBillList.html"
@@ -47,7 +47,7 @@
     </div>-->
                         <div class="layui-col-xs12 layui-inline">
                             <div class="layui-row">
-                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                <!--<div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:30px;padding-left:0px;">鐢宠浜�</label>
@@ -60,7 +60,7 @@
                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HRequestManID-BT">...</button>
                                         </div>
                                     </div>
-                                </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
@@ -107,14 +107,14 @@
                 , cellMinWidth: 90
                 , cols: [[
                     { type: 'radio', fixed: 'left' }
-                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', sort: true }
-                    , { field: 'HDate', title: '鏃ユ湡', sort: true }
+                    , { field: 'FBILLNO', title: '鍗曟嵁鍙�', sort: true, width: 300 }
+                    , { field: 'FDATE', title: '鏃ユ湡', sort: true }
                     , { field: 'HMaker', title: '鍒跺崟浜�' }
                     , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡' }
                 ]]
             };
 
-            var index = layer.load(0, { shade: false });
+            //var index = layer.load(0, { shade: false });
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             //$.ajax({
             //    url: GetWEBURL() + '/PublicPageMethod/EqpList',
@@ -136,20 +136,46 @@
             //});
 
 
+            function Format(datetime, fmt) {
+                if (parseInt(datetime) == datetime) {
+                    if (datetime.length == 10) {
+                        datetime = parseInt(datetime) * 1000;
+                    } else if (datetime.length == 13) {
+                        datetime = parseInt(datetime);
+                    }
+                }
+                datetime = new Date(datetime);
+                var o = {
+                    "M+": datetime.getMonth() + 1,                 //鏈堜唤   
+                    "d+": datetime.getDate(),                    //鏃�   
+                    "h+": datetime.getHours(),                   //灏忔椂   
+                    "m+": datetime.getMinutes(),                 //鍒�   
+                    "s+": datetime.getSeconds(),                 //绉�   
+                    "q+": Math.floor((datetime.getMonth() + 3) / 3), //瀛e害   
+                    "S": datetime.getMilliseconds()             //姣   
+                };
+                if (/(y+)/.test(fmt))
+                    fmt = fmt.replace(RegExp.$1, (datetime.getFullYear() + "").substr(4 - RegExp.$1.length));
+                for (var k in o)
+                    if (new RegExp("(" + k + ")").test(fmt))
+                        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+                return fmt;
+            }
+
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HEmPID = $("#HRequestManID").val();
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                 var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
 
-                if (HEmPID) {
-                    sWhere += " and HEmpID = " + HEmPID +"";
-                }
+                var OrganizationID = sessionStorage["OrganizationID"];
+
                 if (HDate) {
-                    sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
+                    sWhere += " and Fdate >= '" + HDate + "' and FSTOCKORGID = " + OrganizationID + "";
                 }
                 if (HDate1) {
-                    sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
+                    sWhere += " and Fdate <= '" + HDate1 + "'and FSTOCKORGID = " + OrganizationID + "";
                 }
                 $.ajax({
                     url: GetWEBURL() + '/OtherOutRequestBillList/CX',
@@ -159,7 +185,7 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 213136b..6b05ca3 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -22,90 +22,90 @@
                   <div class="layadmin-shortcut">
                       <div carousel-item>
                           <ul class="layui-row layui-col-space10">
-                              <li class="layui-col-xs3">
-                                  <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-find-fill"></i>
-                                      <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
-                                  </a>
-                              </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-find-fill"></i>
-                                      <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
-                                  </a>
-                              </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-find-fill"></i>
-                                      <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
-                                  </a>
-                              </li>
+                              <!--<li class="layui-col-xs3">
+        <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-find-fill"></i>
+            <cite>宸ュ簭杩涚珯鎺ユ敹鍗�</cite>
+        </a>
+    </li>
+    <li class="layui-col-xs3">
+        <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-find-fill"></i>
+            <cite>宸ュ簭鍑虹珯姹囨姤鍗�</cite>
+        </a>
+    </li>-->
+                              <!--<li class="layui-col-xs3">
+        <a href="../杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-find-fill"></i>
+            <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
+        </a>
+    </li>-->
                               <li class="layui-col-xs3">
                                   <a href="../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html" target="main_self_frame">
                                       <i class="layui-icon layui-icon-console"></i>
                                       <cite>澶栬喘鍏ュ簱</cite>
                                   </a>
                               </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-template-1"></i>
-                                      <cite>濮斿鍏ュ簱</cite>
-                                  </a>
-                              </li>
+                              <!--<li class="layui-col-xs3">
+        <a href="../楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-template-1"></i>
+            <cite>濮斿鍏ュ簱</cite>
+        </a>
+    </li>-->
                               <li class="layui-col-xs3">
                                   <a href="../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html" target="main_self_frame">
                                       <i class="layui-icon layui-icon-template-1"></i>
                                       <cite>浜у搧鍏ュ簱</cite>
                                   </a>
                               </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-chart"></i>
-                                      <cite>棰嗘枡鍑哄簱</cite>
-                                  </a>
-                              </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-chart"></i>
-                                      <cite>濮斿鍑哄簱</cite>
-                                  </a>
-                              </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-chat"></i>
-                                      <cite>閿�鍞嚭搴�</cite>
-                                  </a>
-                              </li>
+                              <!--<li class="layui-col-xs3">
+        <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-chart"></i>
+            <cite>棰嗘枡鍑哄簱</cite>
+        </a>
+    </li>
+    <li class="layui-col-xs3">
+        <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-chart"></i>
+            <cite>濮斿鍑哄簱</cite>
+        </a>
+    </li>
+    <li class="layui-col-xs3">
+        <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-chat"></i>
+            <cite>閿�鍞嚭搴�</cite>
+        </a>
+    </li>-->
                               <li class="layui-col-xs3">
                                   <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html" target="main_self_frame">
                                       <i class="layui-icon layui-icon-find-fill"></i>
                                       <cite>璋冩嫧鍗�</cite>
                                   </a>
                               </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-find-fill"></i>
-                                      <cite>鐢熶骇鎷嗙鍗�</cite>
-                                  </a>
-                              </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-find-fill"></i>
-                                      <cite>鐢熶骇姹囨姤鍗�</cite>
-                                  </a>
-                              </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-find-fill"></i>
-                                      <cite>鏉$爜搴撳瓨</cite>
-                                  </a>
-                              </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../鐢熶骇绠$悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-find-fill"></i>
-                                      <cite>缁勬墭鍗曠紪杈�</cite>
-                                  </a>
-                              </li>
+                              <!--<li class="layui-col-xs3">
+        <a href="../鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-find-fill"></i>
+            <cite>鐢熶骇鎷嗙鍗�</cite>
+        </a>
+    </li>
+    <li class="layui-col-xs3">
+        <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-find-fill"></i>
+            <cite>鐢熶骇姹囨姤鍗�</cite>
+        </a>
+    </li>
+    <li class="layui-col-xs3">
+        <a href="../浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-find-fill"></i>
+            <cite>鏉$爜搴撳瓨</cite>
+        </a>
+    </li>
+    <li class="layui-col-xs3">
+        <a href="../鐢熶骇绠$悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-find-fill"></i>
+            <cite>缁勬墭鍗曠紪杈�</cite>
+        </a>
+    </li>-->
                               <li class="layui-col-xs3">
                                   <a href="../楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_Check_New.html" target="main_self_frame">
                                       <i class="layui-icon layui-icon-find-fill"></i>
@@ -118,12 +118,12 @@
                                       <cite>鍏朵粬鍑哄簱鍗曟牎楠岀紦瀛樺垪琛�</cite>
                                   </a>
                               </li>
-                              <li class="layui-col-xs3">
-                                  <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html" target="main_self_frame">
-                                      <i class="layui-icon layui-icon-find-fill"></i>
-                                      <cite>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</cite>
-                                  </a>
-                              </li>
+                              <!--<li class="layui-col-xs3">
+        <a href="../鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html" target="main_self_frame">
+            <i class="layui-icon layui-icon-find-fill"></i>
+            <cite>鐢熶骇姹囨姤鍗曠紦瀛樺垪琛�</cite>
+        </a>
+    </li>-->
                               <li class="layui-col-xs3">
                                   <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Check_New.html" target="main_self_frame">
                                       <i class="layui-icon layui-icon-find-fill"></i>
@@ -166,6 +166,48 @@
                                       <cite>鍒拌揣纭(瀹夌憺)</cite>
                                   </a>
                               </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../棰嗘枡鍙戣揣/鐢熶骇琛ユ枡/Kf_MateReplenishOutBill_Check_New.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鐢熶骇琛ユ枡鏍¢獙</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../棰嗘枡鍙戣揣/濮斿琛ユ枡/Kf_EntrustReplenishOutBill_Check_New.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>濮斿琛ユ枡鏍¢獙</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Check_New.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>濮斿棰嗘枡鏍¢獙</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Check_New.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>閿�鍞嚭搴撴牎楠�</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鐢熶骇閫�鏂�</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鍏朵粬鍑哄簱</cite>
+                                  </a>
+                              </li>
+                              <li class="layui-col-xs3">
+                                  <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_ARPD.html" target="main_self_frame">
+                                      <i class="layui-icon layui-icon-find-fill"></i>
+                                      <cite>鐩樼偣鍗�</cite>
+                                  </a>
+                              </li>
                           </ul>
                       </div>
                   </div>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index e433e94..8e21177 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -1003,6 +1003,13 @@
                                     </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>
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 8ca4119..ff448ae 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -25,7 +25,7 @@
         <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>
-                <p style="color: white;">瀹夌憺LMES绠$悊绯荤粺</p>
+                <p style="color: white;">鏅轰簯LMES绠$悊绯荤粺</p>
             </div>
             <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
                 <div class="layui-form-item">
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_ARPD.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_ARPD.html"
new file mode 100644
index 0000000..218d0b3
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_ARPD.html"
@@ -0,0 +1,1645 @@
+锘�<!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">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-col-xs8 {
+            width: 55.666667%;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 5px; height:800px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div style="background-color:#0085E8;">
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐩樼偣鍗�</span>
+                    </div>
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
+                        <div class="layui-row">
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉$爜</label>
+                            </div>
+                            <div class="layui-col-xs8">
+                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-col-xs2">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-col-xs12" lay-filter="tab-MoveStockBill">
+                        <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>
+                            <li lay-id="5" style="padding:1px;">搴撳瓨淇℃伅</li>
+                            <li lay-id="6" style="padding:1px;min-width: 35px;">姹囨��</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--閫夋嫨婧愬崟-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <select name=" HBillType" id="HBillType">
+                                                <option value="-1">鎵嬪伐褰曞叆</option>
+                                                <option value="3720">鐢熶骇浠诲姟鍗�-鎶曟枡</option>
+                                                <option value="1243">璋冩嫧鐢宠鍗�</option>
+                                                <!--<option value="1201">濮斿璁㈠崟-鎶曟枡</option>
+                    <option value="1402">鍙戣揣閫氱煡鍗�</option>
+                    <option value="1234">涓嬫灦閫氱煡鍗�</option>
+                    <option value="1243">璋冩嫧鐢宠鍗�</option>-->
+                                            </select>
+                                            <!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs2">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HFIFOWHNAME" id="HFIFOWHNAME" lay-verify="HFIFOWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HFIFOWHID" id="HFIFOWHID" lay-verify="HFIFOWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HFIFOWHID-BT" lay-submit="" class="layui-btn" lay-filter="HFIFOWHID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <select name=" HStockStyle" id="HStockStyle">
+                                                <option value="1">缁勭粐鍐呰皟鎷�</option>
+                                                <option value="2">璺ㄧ粍缁囪皟鎷�</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧鏂瑰悜</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HDBFXName" id="HDBFXName" lay-verify="HDBFXName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HDBFXID" id="HDBFXID" lay-verify="HDBFXID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HDBFXID-BT" lay-submit="" class="layui-btn" lay-filter="HDBFXID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍑鸿揣绫诲瀷</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HCHLXName" id="HCHLXName" lay-verify="HCHLXName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HCHLXID" id="HCHLXID" lay-verify="HCHLXID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HCHLXID-BT" lay-submit="" class="layui-btn" lay-filter="HCHLXID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs5">
+                                            <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" disabled="disabled" autocomplete="off" class="layui-input mobile">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--琛ㄥご淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;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">
+                                            <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨叆浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HSCWHID-BT" lay-submit="" class="layui-btn" lay-filter="HSCWHID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">鐝粍</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HGroupName" id="HGroupName" lay-verify="HGroupName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="ProductionTeam-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">淇濈</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HKeeper" id="HKeeper" lay-verify="HKeeper" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HKeeperID" id="HKeeperID" lay-verify="HKeeperID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">楠屾敹</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">閮ㄩ棬</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨嚭缁勭粐</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockOutOrgName" id="HStockOutOrgName" lay-verify="HStockOutOrgName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockOutOrgID" id="HStockOutOrgID" lay-verify="HStockOutOrgID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HStockOutOrgID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;">璋冨叆缁勭粐</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HStockInOrgName" id="HStockInOrgName" lay-verify="HStockInOrgName" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HStockInOrgID" id="HStockInOrgID" lay-verify="HStockInOrgID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HStockInOrgID-BT">...</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:30px;padding-left:0px;display:none">鍒跺崟浜�</label>
+                                        </div>
+                                        <div class="layui-col-xs6">
+                                            <input type="text" name="HBillerID" id="HBillerID" lay-verify="HBillerID" autocomplete="off" class="layui-input">
+                                            <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HMakerID" id="HMakerID" lay-verify="HMakerID" value="0" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="HOrgID" id="HOrgID" lay-verify="HOrgID" value="0" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--<div class="layui-form-item" >
+                                <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冩嫧绫诲瀷</label>
+                                <div class="layui-input-inline">
+                                    <select name=" HBillType" id="HBillType">
+                                        <option value="">浠撳簱璋冩嫧</option>
+                                        <option value="">棰嗘枡璋冩嫧</option>
+                                    </select>
+                                    <input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>-->
+                            </div>
+                            <!--鏄庣粏淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding:0px;margin:0px">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                            </div>
+                            <!--涓嬫灦淇℃伅-->
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="FIFOlist-table" lay-filter="FIFOlist-table"></table>
+                            </div>
+                            <!--搴撳瓨淇℃伅-->
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
+                            </div>
+                            <!--姹囨��-->
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+                            </div>
+                        </div>
+                        <!--<div class="layui-form-item" style="margin-bottom: 20px;">
+            <div class="layui-row">
+                <div class="layui-col-xs3">
+                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                </div>
+                <div class="layui-col-xs3">
+                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                </div>
+                <div class="layui-col-xs3">
+                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Delete">鍒犻櫎</button>
+                </div>
+                <div class="layui-col-xs3">
+                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                </div>
+            </div>
+        </div>-->
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../video/success.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
+    </script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        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;
+            $("#HBarCode").focus();
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
+            //$("#HSCWHID").val(sessionStorage["HWHID"]);
+           
+
+
+           // $("#HSCWHNAME").val(sessionStorage["HWHName"]);
+            //$("#HOutStockPlaceID").val(sessionStorage["HSPID"]);
+            //$("#HOutStockPlaceName").val(sessionStorage["HSPName"]);
+            $("#HDeptID").val(sessionStorage["HDeptID"]);
+            $("#HDeptName").val(sessionStorage["HDept"]);
+            $("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
+            $("#HSecManager").val(sessionStorage["HSecManager"]);
+            $("#HKeeperID").val(sessionStorage["HKeeperID"]);
+            $("#HKeeper").val(sessionStorage["HKeeper"]);
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMaker").hide();
+            $("#HMakerID").hide();
+            $("#HBillerID").val(sessionStorage["HBillerID"]);
+            $("#HBillerID").hide();
+            $("#HOrgID").val(sessionStorage["OrganizationID"]);
+            $("#HOrgID").hide();
+            $("#HStockOutOrgID").val(sessionStorage["OrganizationID"]);
+            $("#HStockOutOrgName").val(sessionStorage["Organization"]);
+            $("#HStockInOrgID").val(sessionStorage["OrganizationID"]);
+            $("#HStockInOrgName").val(sessionStorage["Organization"]);
+            var HSourceFlag = sessionStorage["SourceFlag"];
+
+          
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            //鑾峰彇鍙傛暟
+            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();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetPonderationBill",
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (d) {
+                        // console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HBillType").val(d.data[0].HSourceBillType);
+                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
+                        $("#HSourceBillNo").attr("disabled","true");
+                        //$("#HSourceBillNo").append.readonly = true;
+                        HSourceFlag = true;
+                        //$("#HWHID").val(d.data[0].HWhID);
+                        //$("#HKeeperID").val(d.data[0].HKeeperID);
+                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
+                        //$("#HDeptID").val(d.data[0].HDeptID);
+                        //$("#HBarCode").val(d.data[0].HBarCode);
+                        //$("#HQty").val(d.data[0].HQty);
+                    }
+                })
+            }
+
+
+            function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
+            {
+                table.render({
+                    elem: '#wl-table'
+                    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
+                    , toolbar: '#toolbarDemo'
+                    , defaultToolbar: []
+                    , where: { HBillID: linterid, HBillType: '1207', sWhere: '' }
+                    , cols: [[
+                          { type: 'radio' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
+                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                        //, { field: 'HBatchNo', title: '鎵规', width: 150 }
+                        , { field: 'HMaterID', title: '鐗╂枡鍐呯爜', width: 150, hide: true }
+                        , { field: 'HAuxPropID', title: '', width: 150, hide: true }
+                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 150, hide: true }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                    ]]
+                    , height: 500
+                    , done: function () {
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
+                    type: "GET",
+                    data: { "HBillType": '1207' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(linterid);
+                RoadBillSub(linterid);
+            }
+
+
+
+            //閫夋嫨鍏堣繘鍏堝嚭浠撳簱
+            form.on('submit(HFIFOWHID-BT)', function () {//閫夋嫨璋冨嚭浠撳簱
+                var HStockOutOrgID = $("#HStockOutOrgID").val();
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HFIFOWHID&HOrgID=' + HStockOutOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //閫夋嫨璋冨叆浠撳簱
+            form.on('submit(HWHID-BT)', function () {//閫夋嫨璋冨叆浠撳簱
+                var HStockInOrgID = $("#HStockInOrgID").val();
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockInOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                    }
+                })
+            });
+
+
+            //閫夋嫨璋冨叆缁勭粐
+            form.on('submit(HStockInOrgID-BT)', function () {//閫夋嫨璋冨叆缁勭粐
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '缁勭粐鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_OrganizationtList.html?Type=HStockInOrgID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                    }
+                })
+            });
+
+            //閫夋嫨璋冨嚭缁勭粐
+            form.on('submit(HStockOutOrgID-BT)', function () {//閫夋嫨璋冨嚭缁勭粐
+               
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '缁勭粐鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_OrganizationtList.html?Type=HStockOutOrgID', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                    }
+                })
+            });
+
+            //閫夋嫨璋冨叆浠撲綅
+            form.on('submit(HSpID-BT)', function () {//閫夋嫨璋冨叆浠撲綅
+                var HStockInOrgID = $("#HStockInOrgID").val();
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID&HOrgID=' + HStockInOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                    }
+                })
+            });
+
+            //form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '浠撲綅鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+
+            //閫夋嫨璋冨嚭浠撳簱
+            form.on('submit(HSCWHID-BT)', function () {//閫夋嫨璋冨嚭浠撳簱
+                var HStockOutOrgID = $("#HStockOutOrgID").val();
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HSCWHID&HOrgID=' + HStockOutOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //閫夋嫨璋冨嚭浠撲綅
+            form.on('submit(HOSpID-BT)', function () {//閫夋嫨璋冨嚭浠撲綅
+                var HStockOutOrgID = $("#HStockOutOrgID").val();
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '浠撲綅鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID&HOrgID=' + HStockOutOrgID + '', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //form.on('submit(HOSpID-BT)', function () {//閫夋嫨浠撲綅
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '浠撲綅鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+
+
+
+
+            ////閫夋嫨淇濈
+            //form.on('submit(HKeeperID-BT)', function () {//閫夋嫨淇濈
+            //    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=HKeeper', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+
+            ////閫夋嫨楠屾敹
+            //form.on('submit(HSecManagerID-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(HKeeperID-BT)', function () {//閫夋嫨淇濈
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeper").val(checkStatus.data[0].HName);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨鍙戣揣
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/UserInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManager").val(checkStatus.data[0].HName);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            });
+
+
+
+
+
+            //閫夋嫨閮ㄩ棬
+            form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+
+            //閫夋嫨鐝粍
+            form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐝粍
+                layer.open({
+                    type: 2
+                    , area: ['60%', '60%']
+                    , title: '鐝粍鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                    }
+                })
+            });
+
+            //缂栬緫
+            form.on('submit(cmdModify)', function () {//缂栬緫
+                var sSubStr = table.cache['wl-table'];
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏄庣粏鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+                // }
+            });
+
+            //鍒犻櫎
+            form.on('submit(Delete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                var sInterID = $('#HInterID').val()
+                var sMaterID = data[0].HMaterID
+                var sBillType = '1207'
+                var sAuxPropID = data[0].HAuxPropID
+                //var sMTONo = data[0].HMTONo
+                var sMTONo = ''
+                var sSourceInterID = data[0].HSourceInterID
+                var sSourceEntryID = data[0].HSourceEntryID
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/MoveStock/Delete_Json",
+                        async: true,
+                        data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                table.render({
+                                    elem: '#wl-table'
+                                    , url: GetWEBURL() + '/MoveStockBill/DisBillEntryList_Webs_Json'
+                                    , cellMinWidth: 80
+                                    , toolbar: '#toolbarDemo'
+                                    , defaultToolbar: []
+                                    , where: { HBillID: sInterID, HBillType: '1207', sWhere: '' }
+                                    , cols: [[
+                                        { type: 'radio' }
+                                        , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+                                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 100 }
+                                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 100 }
+                                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+                                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+                                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+                                        //, { field: 'HBatchNo', title: '鎵规', width: 100 }
+                                        , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+                                        , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+                                        , { field: 'HMaterID', title: '鐗╂枡ID', width: 100 }
+                                    ]]
+                                    , height: 500
+                                })
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+            });
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                var sInterID = $("#HInterID").val()
+                var HBillType = '1207'
+                $.ajax(
+                    {
+                        type: "Get",
+                        url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_Json",
+                        async: true,
+                        data: { "HInterID": sInterID, "HBillType": HBillType },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 2 });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, {
+                                icon: 5,
+                                time: 20000
+                            }, function () {
+                            });
+                        }
+                    });
+                parent.location.href = "../../../views/index.html"
+            })
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //debugger;
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = table.cache['wl-table'];
+                var sSourceType = '-1'
+                if (AllowLoadData(sSubStr, 'Saver') != false)//闈炵┖楠岃瘉
+                {
+                    var index = layer.load(3);
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/MoveStockBill/set_SaveMoveStockBill_PD", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm("鐢熸垚璋冩嫧鍗�" + data.Message + $("#HBillNo").val(), {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                                        btn2: function () {
+                                            //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                            //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                            parent.location.href = "../../../views/index.html"
+                                        }//鍏抽棴
+                                    }, function () { window.location.reload(); });//鏂板
+                                }
+                                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: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    return false;
+                }
+            });
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+
+            //#region 鎵弿婧愬崟鏉$爜
+
+            //鎵簮鍗�
+            $('#HSourceBillNo').on('keydown', function (event) {      //鎵簮鍗�
+                if (event.keyCode == 13) {
+                    GetMeesageBySourceBillNo();
+                }
+            });
+
+            //纭畾
+            form.on('submit(QueDin2)', function (data) {
+                GetMeesageBySourceBillNo();
+            });
+
+            //鎵弿婧愬崟鏉$爜
+            function GetMeesageBySourceBillNo(obj) {
+                var sInterID = $("#HInterID").val()
+                var sBillNo = $("#HBillNo").val()
+                var HBillType = '1207'
+                var HSourceBillNo = $('#HSourceBillNo').val()
+                var HSourceBillType = $("#HBillType").val()
+                var HMaker = sessionStorage["HUserName"]
+                var HFIFOWhID = $("#HFIFOWHID").val()
+                var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+                $.ajax({
+                    url: GetWEBURL() + "/WEBSController/get_SourceBarCode_MoveStock_Json",
+                    type: "GET",
+                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HFIFOWhID": HFIFOWhID, "HOWNERID": HStockOutOrgID },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            playSound1();
+                            HSourceFlag = true;
+                            if (result.data.hDeptIDField != 0) {
+                                $("#HDeptID").val(result.data.hDeptIDField);
+                                $("#HDeptName").val(result.data.hDeptNameField);
+                            }
+
+                            $("#HStockStyle").find("option:contains('" + result.data.hStockStyleField +"')").attr("selected", true);
+                            $("#HStockInOrgID").val(result.data.hStockInOrgIDField);
+                            $("#HStockInOrgName").val(result.data.hStockInOrgNameField);
+                            $("#HStockOutOrgID").val(result.data.hStockOutOrgIDField);
+                            $("#HStockOutOrgName").val(result.data.hStockOutOrgNameField);
+                            $("#HSourceBillNo").val(result.data.hSourceBillNoField);
+
+                            $("#HStockStyle").attr("disabled", "disabled");
+                            $("#HStockInOrgName").attr("readonly", "readonly");
+                            $("#HStockOutOrgName").attr("readonly", "readonly");
+                            $("#HBillType").attr("disabled", "disabled");
+                            form.render('select');
+                            if (result.data.hMulSourceFlagField == 0) {
+                                $("#HSourceBillNo").attr("readonly", "readonly");
+                            }
+                            layer.load(3);
+                            element.tabChange('tab-MoveStockBill', '2');
+
+                            $.ajax({
+                                url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                type: "GET",
+                                data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+                                success: function (result) {
+                                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        listOption.data = result.data.Materlist;
+                                        table.render(listOption);
+                                        FIFOlistOption.data = result.data.FIFOlist;
+                                        table.render(FIFOlistOption);
+
+                                        //console.log(result.data.list2);
+                                        var count = 0;
+                                        var count1 = 0;
+                                        for (var i = 0; i < result.data.Materlist.length; i++) {
+                                            count += result.data.Materlist[i].HQty;
+                                            count1 += result.data.Materlist[i].HPieceQty;
+                                        }
+                                        $("#HSumQtys").val(count);
+                                        $("#HBarCodeQtys").val(count1);
+                                        //return;
+                                    }
+                                    else {
+                                        layer.msg(result.Message);
+                                    }
+                                    layer.closeAll("loading");
+                                }
+                            });
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+
+            //#endregion
+
+
+            //#region 鎵弿鐗╂枡鏉$爜
+
+            //鎵潯鐮�
+            $('#HBarCode').on('keydown', function (event) {
+                var sQty = $("#HQty").val();
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+
+            //纭畾
+            form.on('submit(QueDin)', function (data) {
+                GetMeesageByBarCode();
+            });
+
+            //鎵潯鐮�
+            function GetMeesageByBarCode(obj) {  //杩斿洖宸ヤ綔涓績
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+
+                var sInterID = $("#HInterID").val()
+                var HBillType = '1207';
+                var sBillNo = $("#HBillNo").val()
+                var sMaker = $("#HMaker").val();//鍒跺崟浜�
+                var WhID = $("#HWHID").val()//璋冨叆浠撳簱
+                var SPID = $("#HStockPlaceID").val()//璋冨叆浠撲綅
+                var HSCWhID = $("#HSCWHID").val()//璋冨嚭浠撳簱
+                var HSCSPID = $("#HOutStockPlaceID").val()//璋冨嚭浠撲綅
+                var sQty = $("#HQty").val()
+                if (sQty == "") {
+                    sQty = 0;
+                }
+                var sSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍙�
+                if (sSourceBillNo == null) {
+                    sSourceBillNo = "";
+                }
+                var sHBillType = $("#HBillType").val()
+                var HStockInOrgID = $("#HStockInOrgID").val()//璋冨叆缁勭粐
+                var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+                var HScanStyle = "";
+
+                //鍒ゆ柇鏉$爜鏄惁涓虹┖  new
+                if (sBarCode == '') {
+                    playSound();
+                    layer.msg("鏉$爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+
+                if (HDeleteFlag == "*") {
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    $.ajax(
+                        {
+                            type: "Get",
+                            url: GetWEBURL() + "/ProductIn/Delete_Json",
+                            async: true,
+                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": '1207', "HBarCode": sBarCode },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    $.ajax({
+                                        url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                        type: "GET",
+                                        data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+                                        success: function (result) {
+                                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                                listOption.data = result.data.Materlist;
+                                                table.render(listOption);
+                                                FIFOlistOption.data = result.data.FIFOlist;
+                                                table.render(FIFOlistOption);
+
+                                                //console.log(result.data.list2);
+                                                var count = 0;
+                                                var count1 = 0;
+                                                for (var i = 0; i < result.data.Materlist.length; i++) {
+                                                    count += result.data.Materlist[i].HQty;
+                                                    count1 += result.data.Materlist[i].HPieceQty;
+                                                }
+                                                $("#HSumQtys").val(count);
+                                                $("#HBarCodeQtys").val(count1);
+                                                //return;
+                                            }
+                                            else {
+                                                layer.msg(result.Message);
+                                            }
+                                            layer.closeAll("loading");
+                                        }
+                                    });
+                                    playSound1();
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                }
+                else {
+                    if ($("#HBillNo").val() == '') {
+                        playSound();
+                        layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    if ($("#HInterID").val() == '') {
+                        playSound();
+                        layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    var sBarCode = $('#HBarCode').val()
+                    if (sBarCode != "") {
+                        $('#HBarCode').val("");
+                    }
+                    if (sQty != "") {
+                        $('#HQty').val("");
+                    }
+                    $.ajax({
+                        url: GetWEBURL() + "/WEBSController/get_BarCode_MoveStock_PD",
+                        type: "GET",
+                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": WhID, "HSPID": SPID, "HSCWHID": HSCWhID, "HSCSPID": HSCSPID, "HQty": sQty, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                if (HSourceFlag == "false") {
+                                    $("#HBillType").find("option:contains('鎵嬪伐褰曞叆')").attr("selected", true);
+                                    $("#HSourceBillNo").val("");
+
+                                    $("#HStockStyle").attr("disabled", "disabled");
+                                    $("#HStockInOrgName").attr("readonly", "readonly");
+                                    $("#HStockOutOrgName").attr("readonly", "readonly");
+                                    $("#HBillType").attr("disabled", "disabled");
+                                    $("#HSourceBillNo").attr("readonly", "readonly");
+                                    form.render('select');
+                                }
+                                HSourceFlag = true;
+                                element.tabChange('tab-MoveStockBill', '3');
+
+                                layer.load(3)
+                                $.ajax({
+                                    url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                    type: "GET",
+                                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            listOption.data = result.data.Materlist;
+                                            table.render(listOption);
+                                            FIFOlistOption.data = result.data.FIFOlist;
+                                            table.render(FIFOlistOption);
+
+                                            //console.log(result.data.list2);
+                                            var count = 0;
+                                            var count1 = 0;
+                                            for (var i = 0; i < result.data.Materlist.length; i++) {
+                                                count += result.data.Materlist[i].HQty;
+                                                count1 += result.data.Materlist[i].HPieceQty;
+                                            }
+                                            $("#HSumQtys").val(count);
+                                            $("#HBarCodeQtys").val(count1);
+                                            //return;
+                                        }
+                                        else {
+                                            layer.msg(result.Message);
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                                playSound1();
+                            }
+                            else {
+                                playSound();
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            }
+
+            //#endregion
+
+
+            
+
+
+            $('#HStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HStockPlaceName").val(result.data[0].HName);
+                                $("#HStockPlaceID").val(result.data[0].HItemID);
+                                $("#HWHID").val(result.data[0].HWHID);
+                                $("#HWHNAME").val(result.data[0].HWhName);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+            $('#HOutStockPlaceName').on('keydown', function (event) {      //鎵粨浣�
+                var HBarCode = $('#HOutStockPlaceName').val()
+                if (event.keyCode == 13) {
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    $.ajax({
+                        url: GetWEBURL() + "/LookingFor/getSpName_Json",
+                        type: "GET",
+                        data: { "HBarCode": HBarCode },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HOutStockPlaceName").val(result.data[0].HName);
+                                $("#HOutStockPlaceID").val(result.data[0].HItemID);
+                                $("#HSCWHNAME").val(result.data[0].HWhName);
+                                $("#HSCWHID").val(result.data[0].HWHID);
+                                element.tabChange('tab-POStockInBill', '2');
+                            }
+                            else {
+                                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                        }
+                    });
+                }
+            });
+
+
+            //#region 鍒犻櫎鍔熻兘鎺т欢
+            form.on('submit(cmdDelete)', function () {//鍒犻櫎
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
+                        var sInterID = $("#HInterID").val()
+                        var sBillNo = $("#HBillNo").val()
+                        var sMaterID = data[0].HMaterID
+                        var sAuxPropID = data[0].HAuxPropID
+                        var sMTONo = ''
+                        var sSourceInterID = data[0].HSourceInterID
+                        var sSourceEntryID = data[0].HSourceEntryID
+                        var HBillType = '1207';
+                        var HStockOutOrgID = $("#HStockOutOrgID").val()//璋冨嚭缁勭粐
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json",
+                                async: true,
+                                data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "HBillType": HBillType },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                        //鏄剧ず琛ㄤ綋鏄庣粏
+                                        $.ajax({
+                                            url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
+                                            type: "GET",
+                                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": HBillType, "HStockOrgID": HStockOutOrgID },
+                                            success: function (result) {
+                                                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                                    listOption.data = result.data.Materlist;
+                                                    table.render(listOption);
+                                                    FIFOlistOption.data = result.data.FIFOlist;
+                                                    table.render(FIFOlistOption);
+
+                                                    //console.log(result.data.list2);
+                                                    var count = 0;
+                                                    var count1 = 0;
+                                                    for (var i = 0; i < result.data.Materlist.length; i++) {
+                                                        count += result.data.Materlist[i].HQty;
+                                                        count1 += result.data.Materlist[i].HPieceQty;
+                                                    }
+                                                    $("#HSumQtys").val(count);
+                                                    $("#HBarCodeQtys").val(count1);
+                                                    //return;
+                                                }
+                                                else {
+                                                    layer.msg(result.Message);
+                                                }
+                                                layer.closeAll("loading");
+                                            }
+                                        });
+                                    }
+                                    else {
+                                        layer.msg(data.Message, { icon: 2 });
+                                    }
+                                },
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, {
+                                        icon: 5,
+                                        time: 20000
+                                    }, function () {
+                                    });
+                                }
+                            });
+                        layer.close(index)
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                }
+            });
+            //#endregion
+
+            table.render({
+                elem: '#mx-table'
+                // , url: GetWEBURL() + '/MoveStockBill/GetHBarCodeShowBillSub'
+                //, toolbar: '#toolbarDemo'
+                // , where: { sMsg: linterid, sMsg2: lentryid }
+                , cols: [[
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                ]]
+                , page: true
+                , height: 500
+                , done: function () {
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(wl-table)', function (obj) {
+                var data = obj.data;
+                console.log(data.婧愬崟涓诲唴鐮�);
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'edit') {
+                    var _obj = obj;
+                    layer.open({
+                        type: 2
+                        , area: ['90%', '90%']
+                        , title: '鎵爜璇︽儏鍒楄〃'
+                        , content: ['../../../views/Baseset/鍩虹璧勬枡/WMSBarCodeDetailsList.html?HInterID=' + data.HSourceInterID + '&HBillType=3789', 'yes']
+                        , end: function () {
+
+                        }
+                    })
+                }
+            });
+
+            function playSound() {
+                console.log("playSound");
+                //var audio = document.getElementById("cs");
+                //$("appendAut").html("");
+                //if (audio == null)
+                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
+                //$("appendAut").attr("src","../../video/jingbao.wav")
+                var audio = document.getElementById("cs");
+                audio.play();
+            }
+            function playSound1() {
+                console.log("playSound1");
+                //var audio = document.getElementById("cs");
+                //$("appendAut").html("");
+                //if (audio == null)
+                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/success.wav" type = "audio/ogg"> </audio >');
+                //$("appendAut").attr("src", "../../video/success.wav")
+                var audio = document.getElementById("cs2");
+                audio.play();
+            }
+            
+        });
+
+
+        var listOption = {
+            elem: '#wl-table'
+            , toolbar: '#toolbarDemo'
+            , cellMinWidth: 90
+            , limit: 3000
+            , totalRow: true
+            , cols: [[
+                { type: 'radio' }
+            , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
+            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+            , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+            //, { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
+                , { field: 'HPieceQty', title: '鏉$爜鏁伴噺', width: 150, totalRow: true }
+            , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
+            , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
+            , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
+            , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 150, hide: true }
+            , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        }
+        var FIFOlistOption = {
+            elem: '#FIFOlist-table'
+            , toolbar: '#toolbarDemo'
+            , cellMinWidth: 90
+            , limit: 3000
+            , totalRow: true
+            , cols: [[
+                { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+                , { field: 'HQtyMust', title: '涓嬫灦鏁伴噺', width: 150, totalRow: true }
+                , { field: 'HWhName', title: '浠撳簱', width: 150 }
+                , { field: 'HSPName', title: '浠撲綅', width: 150 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        }
+        var listOption1 = {
+            elem: '#mx-table'
+            , toolbar: '#toolbarDemo'
+            , cellMinWidth: 90
+            , cols: [[
+                { type: 'radio' }
+                , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+                , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+                , { field: 'HBatchNo', title: '鎵规', width: 150 }
+                , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+            ]]
+            , height: 500
+            , done: function () {
+                layer.closeAll("loading");
+            }
+        }
+
+        //浠ヤ笂涓簂ayui妯″潡
+        
+        function GetHFIFOWHNAMEValue(obj)  //杩斿洖鍏堣繘鍏堝嚭浠撳簱
+        {
+            $("#HFIFOWHNAME").val(obj[0].HName);
+            $("#HFIFOWHID").val(obj[0].HItemID);
+        }
+        function GetHWHValue(obj)  //杩斿洖璋冨叆浠撳簱
+        {
+            $("#HWHNAME").val(obj[0].HName);
+            //sessionStorage["HWHID"] = obj[0].HItemID;
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHOrgNameValue(obj)  //杩斿洖璋冨叆缁勭粐
+        {
+            $("#HStockInOrgName").val(obj[0].HName);
+            $("#HStockInOrgID").val(obj[0].HItemID);
+
+        }
+        function GetHOutOrgNameValue(obj)  //杩斿洖璋冨嚭缁勭粐
+        {
+            $("#HStockOutOrgName").val(obj[0].HName);
+            $("#HStockOutOrgID").val(obj[0].HItemID);
+
+        }
+        function GetHSpValue(obj) {  //杩斿洖璋冨叆浠撲綅
+            $("#HStockPlaceName").val(obj[0].HName);
+            $("#HStockPlaceID").val(obj[0].HItemID);
+            $("#HWHNAME").val(obj[0].HWhName);
+            $("#HWHID").val(obj[0].HWHID);
+        }
+        function GetHSCWHNAMEValue(obj)  //杩斿洖璋冨嚭浠撳簱
+        {
+            $("#HSCWHNAME").val(obj[0].HName);
+            $("#HSCWHID").val(obj[0].HItemID);
+        }
+        function GetHOutStockPlaceIDValue(obj) {  //杩斿洖璋冨嚭浠撲綅
+            $("#HOutStockPlaceName").val(obj[0].HName);
+            $("#HOutStockPlaceID").val(obj[0].HItemID);
+            $("#HSCWHNAME").val(obj[0].HWhName);
+            $("#HSCWHID").val(obj[0].HWHID);
+        }
+        function GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
+            $("#HSupName").val(obj[0].HName);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHKeeperValue(obj) {  //杩斿洖淇濈
+            $("#HKeeper").val(obj[0].HName);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
+            $("#HSecManager").val(obj[0].HName);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue(obj) {   //杩斿洖閮ㄩ棬
+            $("#HDeptName").val(obj[0].HName);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        function GetProductionTeamValue(obj) {   //杩斿洖鐝粍
+            if (obj.length == 0) {
+                layer.msg("璇峰厛閫夋嫨鐝粍", { index: 0 });
+            } else {
+                $("#HGroupName").val(obj[0].鐝粍);
+                $("#HGroupID").val(obj[0].HItemID);
+                layer.closeAll();
+            }
+        }
+
+        function AllowLoadData(sSubStr, bnt) {  //闈炵┖楠岃瘉
+            //鏁板瓧姝e垯(鍖呭惈灏忔暟)
+            var reg = /^\d+(\.\d+)?$/;
+            //if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+            //    layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HSourceBillNo").val() == '') {
+            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+            //    return false;
+            //}
+            if ($("#HDeptName").val() == '') {
+                layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HSecManager").val() == '') {
+                layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HKeeper").val() == '') {
+                layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //if ($("#HSupName").val() == '') {
+            //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            if ($("#HWHNAME").val() == '') {
+                layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
+            //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (bnt == 'Saver') {
+                if (!typeof (sSubStr) == "undefined") {
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+                        if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+                            if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust)) {
+                                layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                return false;
+                            }
+                        }
+                    }
+                    //for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                    //    if (parseFloat(sSubStr[i].HQty) == 0) {
+                    //        layer.msg("澶栬喘鍏ュ簱璁板綍鏈壂鐮侊紒", { icon: 5 });
+                    //        return false;
+                    //    }
+                    //}
+                }
+            }
+            else {
+                return true;
+            }
+        }
+        
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index e081139..b22a9d5 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -652,23 +652,8 @@
             });
 
             //閫夋嫨璋冨叆浠撲綅
-            //form.on('submit(HSpID-BT)', function () {//閫夋嫨璋冨叆浠撲綅
-
-            //    layer.open({
-            //        type: 2
-            //        , area: ['100%', '100%']
-            //        , title: '浠撲綅鍒楄〃'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID&HOrgID=HStockInOrgID', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //        }
-            //    })
-            //});
-
-            form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+            form.on('submit(HSpID-BT)', function () {//閫夋嫨璋冨叆浠撲綅
+                var HStockInOrgID = $("#HStockInOrgID").val();
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -676,13 +661,28 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID&HOrgID=' + HStockInOrgID + '', 'yes']
                     , resize: false
                     , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
             });
+
+            //form.on('submit(HSpID-BT)', function () {//閫夋嫨浠撲綅
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '浠撲綅鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
 
             //閫夋嫨璋冨嚭浠撳簱
             form.on('submit(HSCWHID-BT)', function () {//閫夋嫨璋冨嚭浠撳簱
@@ -703,23 +703,8 @@
             });
 
             //閫夋嫨璋冨嚭浠撲綅
-            //form.on('submit(HOSpID-BT)', function () {//閫夋嫨璋冨嚭浠撲綅
-            //    layer.open({
-            //        type: 2
-            //        , area: ['100%', '100%']
-            //        , title: '浠撲綅鍒楄〃'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID&HOrgID=HStockOutOrgID', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
-
-            form.on('submit(HOSpID-BT)', function () {//閫夋嫨浠撲綅
+            form.on('submit(HOSpID-BT)', function () {//閫夋嫨璋冨嚭浠撲綅
+                var HStockOutOrgID = $("#HStockOutOrgID").val();
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
@@ -727,13 +712,29 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID&HOrgID=' + HStockOutOrgID + '', 'yes']
                     , resize: false
                     , cancel: function () {
                         //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
             });
+
+            //form.on('submit(HOSpID-BT)', function () {//閫夋嫨浠撲綅
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '浠撲綅鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HOSpID', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
 
 
 
@@ -1495,7 +1496,7 @@
             , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
             , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
             //, { field: 'HBatchNo', title: '鎵规', width: 150, hide: true }
-            , { field: 'HPieceQty', title: '鏉$爜鏁伴噺', width: 150, hide: true }
+                , { field: 'HPieceQty', title: '鏉$爜鏁伴噺', width: 150, totalRow: true }
             , { field: 'HMaterID', title: 'HMaterID', width: 150, hide: true }
             , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
             , { field: 'HSourceInterID', title: 'HSourceInterID', width: 150, hide: true }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\344\272\247\345\223\201\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdMinPickQty.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\344\272\247\345\223\201\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdMinPickQty.html"
new file mode 100644
index 0000000..03d742b
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\344\272\247\345\223\201\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdMinPickQty.html"
@@ -0,0 +1,955 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>渚涘簲鍟嗕笌鐗╂枡娓呭崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px;">
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button type="button" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                    </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>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍥哄畾椤圭洰</label>
+                                            <div class="layui-input-block">
+                                                <input type="radio" name="FixedItems" value="SMater" title="鐗╂枡">
+                                                <input type="radio" name="FixedItems" value="SSup" title="渚涘簲鍟�">
+                                                <input type="radio" name="FixedItems" value="SUnit" title="鍖呰鏂瑰紡" checked>
+                                                <input type="radio" name="FixedItems" value="SFree" title="鑷敱" checked>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" 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">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" 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="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" 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="HSupNumber" id="HSupNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSup" id="btnSearchSup" 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">
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" 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="HMouldModel" id="HMouldModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍖呰鏂瑰紡浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPackTypeNumber" id="HPackTypeNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HPackTypeID" id="HPackTypeID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchPackType" id="btnSearchPackType" 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">
+                                                <input type="text" class="layui-input" name="HPackTypeName" id="HPackTypeName" 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="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="HChecker" id="HChecker" 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="HCloseMan" id="HCloseMan" 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="HCheckDate" id="HCheckDate" 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="HCloseDate" id="HCloseDate" 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="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="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="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="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>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
+                    <input type="hidden" name="HItemID" id="HItemID" value="0">
+                </form>
+            </div>
+        </div>
+    </div>
+    <!--琛屾寜閽�-->
+    <script type="text/html" id="barDemo">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </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
+                , laydate = layui.laydate
+                , element = layui.element
+                , util = layui.util;
+            //鍏敤鍙橀噺
+            var rowdata;
+            var option = [];
+            var HModName = "Gy_MateMould";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "HMaterIDCol", "HSupIDCol", "HPackTypeIDCol", "浣跨敤鏍囪", "瀹℃牳浜�", "瀹℃牳鏃ユ湡", "鍒跺崟浜�", "鍒跺崟鏃ユ湡"];
+            //褰撳墠鏃ユ湡
+            var dt = new Date();
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1.2;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+            }
+
+            //鍒ゆ柇鏄惁鏂板
+            if (OperationType == 1.1) {
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 1.2) {
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+            }
+            else if (OperationType == 3) {
+                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HUpDater").val(sessionStorage["HUserName"]);
+                GetMateMouldValue(linterid);
+            }
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            if (linterid == undefined) {
+                linterid = 0;
+            }
+            //鏌ヨ
+            GetMateMouldValue(linterid);
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterIDCol": "", "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HSupIDCol": "",
+                    "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟嗗悕绉�": "", "HPackTypeIDCol": "", "鍖呰鏂瑰紡浠g爜": "", "鍖呰鏂瑰紡鍚嶇О": "",
+                    "鏍囧噯鍖呰鏁伴噺": "0", "澶栫鍖呰鏁伴噺": "0", "寮�濮嬫棩鏈�": "", "缁撴潫鏃ユ湡": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
+                        if (FixedItems == "SFree") {
+
+                        }
+                        else if (FixedItems == "SUnit") {
+                            NewRow.HPackTypeIDCol = $("#HPackTypeID").val();
+                            NewRow.鍖呰鏂瑰紡鍚嶇О = $("#HPackTypeName").val();
+                            NewRow.鍖呰鏂瑰紡浠g爜 = $("#HPackTypeNumber").val();
+                        }
+                        else if (FixedItems == "SMater") {
+                            NewRow.HMaterIDCol = $("#HMaterID").val();
+                            NewRow.鐗╂枡浠g爜 = $("#HMaterNumber").val();
+                            NewRow.鐗╂枡鍚嶇О = $("#HMaterName").val();
+                            NewRow.瑙勬牸鍨嬪彿 = $("#HMaterModel").val();
+                        }
+                        else if (FixedItems == "SSup") {
+                            NewRow.HSupIDCol = $("#HSupID").val();
+                            NewRow.渚涘簲鍟嗕唬鐮� = $("#HSupNumber").val();
+                            NewRow.渚涘簲鍟嗗悕绉� = $("#HSupName").val();
+                        }
+                        NewRow.寮�濮嬫棩鏈� = Format(new Date(), "yyyy-MM-dd");
+                        NewRow.缁撴潫鏃ユ湡 = Format(new Date(), "yyyy-MM-dd");
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+
+                        form.render('select');
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+
+                            form.render('select');
+                        }
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                }
+            });
+
+            //閫�鍑烘寜閽�
+            form.on('submit(btn-Exit)', function (data) {
+                get_Exit();
+            });
+
+            //鏂板鎸夐挳
+            form.on('submit(btn-AddNew)', function (data) {
+                //window.location.reload();
+                option.data = [{ HItemID: "0", HMaterIDCol: "0", HSupIDCol: "0", 寮�濮嬫棩鏈�: dt, 缁撴潫鏃ユ湡: dt, HPackTypeIDCol: "0", 鍖呰鏂瑰紡浠g爜: "", 鍖呰鏂瑰紡鍚嶇О: "", HRemarkCol: "", 渚涘簲鍟嗕唬鐮�: "", 渚涘簲鍟嗗悕绉�: "", 鐗╂枡浠g爜: "", 鐗╂枡鍚嶇О: "", 瑙勬牸鍨嬪彿: "", 鏍囧噯鍖呰鏁伴噺: "0", 澶栫鍖呰鏁伴噺:"0" }];
+                table.render(option)
+
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HUpDateDate").val("");
+                $("#HUpDater").val("");
+                OperationType = 1.1
+            });
+
+
+            //閫�鍑�
+            function get_Exit() {
+                if (OperationType == 1.1) {
+                    Pub_Close(1);
+                } else if (OperationType == 1.2) {
+                    Pub_Close(2);
+                } else if (OperationType == 2) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (OperationType == 3) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                }
+            }
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();                           
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+
+                if (obj.event == 'Date') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                    });
+                }
+
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HMaterCheck') {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim',
+                                title: '鐗╂枡鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterList.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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HMaterIDCol: checkStatus.data[0].HItemID
+                                        , 鐗╂枡浠g爜: checkStatus.data[0].鐗╂枡浠g爜
+                                        , 鐗╂枡鍚嶇О: checkStatus.data[0].鐗╂枡
+                                        , 瑙勬牸鍨嬪彿: checkStatus.data[0].瑙勬牸鍨嬪彿
+                                    });
+                                    var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
+                                    if (FixedItems == "SSup") {
+                                        obj.update({
+                                            HSupIDCol: $("#HSupID").val()
+                                            , 渚涘簲鍟嗕唬鐮�: $("#HSupNumber").val()
+                                            , 渚涘簲鍟嗗悕绉�: $("#HSupName").val()
+                                        });
+                                    }
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+                        if (obj.event == 'HSupCheck') {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim',
+                                title: '渚涘簲鍟嗗垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HSupIDCol: checkStatus.data[0].HItemID
+                                        , 渚涘簲鍟嗕唬鐮�: checkStatus.data[0].渚涘簲鍟嗕唬鐮�
+                                        , 渚涘簲鍟嗗悕绉�: checkStatus.data[0].渚涘簲鍟嗗悕绉�
+                                    });
+                                    var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
+                                    if (FixedItems == "SMater") {
+                                        obj.update({
+                                            HMaterIDCol: $("#HMaterID").val()
+                                            , 鐗╂枡浠g爜: $("#HMaterNumber").val()
+                                            , 鐗╂枡鍚嶇О: $("#HMaterName").val()
+                                            , 瑙勬牸鍨嬪彿: $("#HMaterModel").val()
+                                        });
+                                    }
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+                        if (obj.event == 'HPackTypeCheck') {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim',
+                                title: '鍖呰鏂瑰紡鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PackType.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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HPackTypeIDCol: checkStatus.data[0].HItemID
+                                        , 鍖呰鏂瑰紡浠g爜: checkStatus.data[0].鍖呰鏂瑰紡浠g爜
+                                        , 鍖呰鏂瑰紡鍚嶇О: checkStatus.data[0].鍖呰鏂瑰紡鍚嶇О
+                                    });
+                                    console.log(obj)
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            });
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(btnSave)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //淇濆瓨
+            function set_SaveBill(data) {
+                var sSubTable = table.cache['mainTable'];
+                console.log(sSubTable)
+                for (var i = 0; i < sSubTable.length; i++) {
+                    if (!sSubTable[i].HMaterIDCol) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝鐗╂枡涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (!sSubTable[i].HSupIDCol) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (!sSubTable[i].鍖呰鏂瑰紡浠g爜) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝鍖呰鏂瑰紡涓嶈兘涓虹┖锛�", { icon: 7, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                }
+                if (!data.field.HItemID) {
+                    OperationType = 1.1
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                // 鏇挎崲瀛楃涓�
+                var a = sSubStr.replace("寮�濮嬫棩鏈�", "HBeginDateCol");
+                var b = a.replace("缁撴潫鏃ユ湡", "HEndDateCol");
+                var c = b.replace("鏍囧噯鍖呰鏁伴噺", "HMinQtyCol");
+                var d = c.replace("澶栫鍖呰鏁伴噺", "HBagQtyCol");
+                var e = d.replace("澶囨敞", "HRemarkCol");
+                var sSubStrRep = e.replaceAll(",[]", "")
+
+                var sMainSub = sMainStr + ';' + sSubStrRep + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Gy_StdMinPickQty/set_SaveBill",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            //layer.confirm(data.Message, {
+                            //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                            //    btn2: function () {
+                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                            //        parent.location.href = "../../../views/index.html"
+                            //    }//鍏抽棴
+                            //}, function () { window.location.reload(); });//鏂板
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                        }
+                        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(btnSearchMater)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐗╂枡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠g爜);
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡);
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅渚涘簲鍟嗗脊绐�
+            form.on('submit(btnSearchSup)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '渚涘簲鍟嗗垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        $("#HSupNumber").val(checkStatus.data[0].渚涘簲鍟嗕唬鐮�);
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅鍖呰鏂瑰紡寮圭獥
+            form.on('submit(btnSearchPackType)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鍖呰鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PackType.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HPackTypeID").val(checkStatus.data[0].HItemID);
+                        $("#HPackTypeName").val(checkStatus.data[0].鍖呰鏂瑰紡鍚嶇О);
+                        $("#HPackTypeNumber").val(checkStatus.data[0].鍖呰鏂瑰紡浠g爜);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                rowdata = [{
+                    "HMaterIDCol": "", "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HSupIDCol": "",
+                    "渚涘簲鍟嗕唬鐮�": "", "渚涘簲鍟嗗悕绉�": "", "HPackTypeIDCol": "", "鍖呰鏂瑰紡浠g爜": "", "鍖呰鏂瑰紡鍚嶇О": ""
+                }];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 'full-250'
+                    , cellMinWidth: 90
+                };
+                //rowdata[0].寮�濮嬫棩鏈� = Format(new Date(), "yyyy-MM-dd");
+                //rowdata[0].缁撴潫鏃ユ湡 = "2100-01-01";
+                //option.data = rowdata;
+                //table.render(option);
+                ////鍒锋柊琛ㄦ牸鏁版嵁
+                //DisPlay_HideColumn();
+            }
+
+            // 鑾峰彇缃戞牸鍒楄〃鏁版嵁
+            function GetMateMouldValue(HItemID) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_StdMinPickQty/GetSupMaterialValue",
+                    type: "GET",
+                    data: { "HItemID": HItemID },
+                    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, event: 'Date' });
+                                            break;
+                                        default:
+                                            if (data[i].name == '鐗╂枡浠g爜') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HMaterCheck", width: 200 });
+                                            } else if (data[i].name == '鍖呰鏂瑰紡浠g爜') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HPackTypeCheck", width: 200 });
+                                            } else if (data[i].name == '渚涘簲鍟嗕唬鐮�') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', event: "HSupCheck", width: 200 });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
+                                            }
+                                    }
+                                }
+                            }
+                            col.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            }
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+
+                })
+            }
+
+            //#region 闅愯棌鍒楄缃�
+            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);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HSupID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[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妯″潡
+        });
+
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\344\272\247\345\223\201\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdMinPickQtyList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\344\272\247\345\223\201\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdMinPickQtyList.html"
new file mode 100644
index 0000000..fb4481d
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\344\272\247\345\223\201\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdMinPickQtyList.html"
@@ -0,0 +1,623 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>渚涘簲鍟嗕笌鐗╂枡娓呭崟璁剧疆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="鐗╂枡浠g爜" id="鐗╂枡浠g爜">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="鐗╂枡鍚嶇О" id="鐗╂枡鍚嶇О">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="瑙勬牸鍨嬪彿" id="瑙勬牸鍨嬪彿">
+                                    </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 class="layui-colla-content">
+                                    <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="渚涘簲鍟嗕唬鐮�" id="渚涘簲鍟嗕唬鐮�">
+                                        </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="渚涘簲鍟嗗悕绉�" id="渚涘簲鍟嗗悕绉�">
+                                        </div>
+                                    </div>                                  
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <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-add-1"></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-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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var sWhere = "";
+            var option = [];
+            var Organization = sessionStorage["Organization"]
+            var HModName = "Gy_StdMinPickQtyList";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "HMaterID", "HRelationID", "HUnitID", "HSupID","HPackTypeID"];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
+
+            //#endregion
+
+            //#region 鏈〉闈㈣皟鐢ㄧ殑鎵�鏈夋柟娉�
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn-Add':
+                        set_AddNew();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn-Edit':
+                        set_ShowBill();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn-Delete':
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    //case 'btn-Audit':
+                    //    set_CheckBill();
+                    //    break;
+                    //鍙嶅鏍告寜閽�
+                    //case 'btn-DeAudit':
+                    //    set_AbandonCheck();
+                    //    break;
+                    //棰勮鎸夐挳
+                    //case 'btn-Print':
+                    //    get_PrintReport();
+                    //    break;
+                    //鍒锋柊鎸夐挳
+                    case 'get_Refresh':
+                        get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#鐗╂枡浠g爜").val("");
+                $("#鐗╂枡鍚嶇О").val("");
+                $("#瑙勬牸鍨嬪彿").val("");
+                $("#渚涘簲鍟嗕唬鐮�").val("");
+                $("#渚涘簲鍟嗗悕绉�").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
+
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                var 鐗╂枡浠g爜 = $("#鐗╂枡浠g爜").val();
+                var 鐗╂枡鍚嶇О = $("#鐗╂枡鍚嶇О").val();
+                var 瑙勬牸鍨嬪彿 = $("#瑙勬牸鍨嬪彿").val();
+                var 渚涘簲鍟嗕唬鐮� = $("#渚涘簲鍟嗕唬鐮�").val();
+                var 渚涘簲鍟嗗悕绉� = $("#渚涘簲鍟嗗悕绉�").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+
+                if (鐗╂枡浠g爜) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + 鐗╂枡浠g爜 + "%'";
+                }
+                if (鐗╂枡鍚嶇О) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + 鐗╂枡鍚嶇О + "%'";
+                }
+                if (瑙勬牸鍨嬪彿) {
+                    sWhere += " and 瑙勬牸鍨嬪彿 like '%" + 瑙勬牸鍨嬪彿 + "%'";
+                }
+                if (渚涘簲鍟嗕唬鐮�) {
+                    sWhere += " and 渚涘簲鍟嗕唬鐮� like '%" + 渚涘簲鍟嗕唬鐮� + "%'";
+                }
+                if (渚涘簲鍟嗗悕绉�) {
+                    sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + 渚涘簲鍟嗗悕绉� + "%'";
+                }              
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                //鍒濆鍖栫綉鏍�
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+
+            //#region 鍔犺浇缃戠粶
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
+                var ajaxLoad = layer.load();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_StdMinPickQty/list',// Gy_Employee/list
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
+                    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'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            }
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+                            //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
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '渚涘簲鍟嗕笌鐗╂枡娓呭崟璁剧疆-鏂板',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: './Gy_StdMinPickQty.html?OperationType=1.1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        get_FastQuery(table, option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '渚涘簲鍟嗕笌鐗╂枡娓呭崟璁剧疆-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: './Gy_StdMinPickQty.html?OperationType=3&linterid=' + linterid
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_StdMinPickQty',
+                            type: "GET",
+                            data: { "HItemID": ItemID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            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);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            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
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 瀹℃牳
+            //function set_CheckBill() {
+            //}
+            //#endregion
+
+            //#region 鍙嶅鏍�
+            //function set_AbandonCheck() {
+            //}
+            //#endregion
+
+            //#region 棰勮
+            //function get_PrintReport() {
+            //    var checkStatus = table.checkStatus('mainTable')
+            //        , data = checkStatus.data;
+            //    if (checkStatus.data.length === 1) {
+            //        var InterID = data[0].HItemID.toString();
+            //        layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + InterID);
+            //        //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
+            //        window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HDepartMent" + "&OpenTmp=b");
+            //    }
+            //    else {
+            //        layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+            //    }
+            //}
+            //#endregion
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+                                    //#endregion
+
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
index cc56dc9..3cb7ad3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/Kf_QCStockInCheckBill_Fast.html"
@@ -31,21 +31,22 @@
                             <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">
                                     <!--<div class="layui-row">
-        <div class="layui-col-xs3">
-            <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
-        </div>
-        <div class="layui-col-xs8">
-            <select name="HBillType" id="HBillType">
-                <option value="1103">鏀舵枡閫氱煡鍗�</option>
-            </select>
-        </div>
-    </div>-->
+                <div class="layui-col-xs3">
+                    <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+                </div>
+                <div class="layui-col-xs8">
+                    <select name="HBillType" id="HBillType">
+                        <option value="1103">鏀舵枡閫氱煡鍗�</option>
+                    </select>
+                </div>
+            </div>-->
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
                                             <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡鏉$爜</label>
@@ -85,10 +86,16 @@
                                         </div>
                                     </div>
                                     <!--<input id="upload" type="file" accept="image/*"  @change="changePic" />-->
-                                    <input id="takepicture" type="file" accept="image/*">
-                                    <div>
-                                        <img id="blah" src="#" alt="鏄剧ず鎮ㄤ笂浼犵殑鍟嗗搧鍥剧墖" />
-                                    </div>
+                                    <!--<input id="takepicture" type="file" accept="image/*">
+            <div>
+                <img id="blah" src="#" alt="鏄剧ず鎮ㄤ笂浼犵殑鍟嗗搧鍥剧墖" />
+            </div>-->
+
+
+
+
+
+
                                 </div>
                             </div>
                             <!--鐗╂枡娓呭崟-->
@@ -328,24 +335,44 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
-                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
-                        <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
-                       <!-- <button id="capture">鎷嶇収</button>-->
-                    </div>
-                    <div id="" style="display:none;">
-                        <audio id="cs" hidden controls>
-                            <source src="../../video/jingbao.wav" type="audio/ogg">
-                        </audio>
-                    </div>
-                    <div id="" style="display:none;">
-                        <audio id="cs2" hidden controls>
-                            <source src="../../video/success.wav" type="audio/ogg">
-                        </audio>
-                    </div>
-                </form>
+                            <!--闄勪欢淇℃伅-->
+                            <div 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="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+                                <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+                                <!-- <button id="capture">鎷嶇収</button>-->
+                            </div>
+                            <div id="" style="display:none;">
+                                <audio id="cs" hidden controls>
+                                    <source src="../../video/jingbao.wav" type="audio/ogg">
+                                </audio>
+                            </div>
+                            <div id="" style="display:none;">
+                                <audio id="cs2" hidden controls>
+                                    <source src="../../video/success.wav" type="audio/ogg">
+                                </audio>
+                            </div>
+</form>
             </div>
         </div>
     </div>
@@ -365,11 +392,12 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        }).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;
             //娓呯┖鐣岄潰  new
@@ -519,6 +547,7 @@
                         //console.log(d.data);
                         $("#HInterID").val(d.data[0].HInterID);
                         $("#HBillNo").val(d.data[0].HBillNo);
+                        PicUpload();
                     }
                 });
             }
@@ -772,6 +801,10 @@
                 var HSLSeQ = $("#HSLSeQ").val();     //鏀舵枡閫氱煡鍗曡鍙�
                 var HBatchNo = $("#HBatchNo").val();     //鎵瑰彿
 
+
+                var HBillNo = $("#HBillNo").val();     //鏉ユ枡妫�楠屽崟鍗曞彿
+                var HInterID = $("#HInterID").val();     //鏉ユ枡妫�楠屽崟涓籌D
+
                 if (HBadQty == "") {
                     HBadQty = 0;
                 }
@@ -809,7 +842,7 @@
                                 , "HBadQty": HBadQty, "HCheckResult": HCheckResult, "HSupNumber": HSupNumber, "HWHNumber": HWHNumber
                                 , "HUseResult": HUseResult, "HSeQ": HSeQ, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo
                                 , "user": sessionStorage["HUserName"], "HWHID": HWHID, "HSPID": HSPID, "HSupID": HSupID, "HKeeperID": HKeeperID
-                                , "HMaterID": HMaterID, "HSourceBillType": HSourceBillType, "HSLInterID": HSLInterID, "HSLEntryID": HSLEntryID, "HSLBillNo": HSLBillNo, "HSLSeQ": HSLSeQ
+                                , "HMaterID": HMaterID, "HSourceBillType": HSourceBillType, "HSLInterID": HSLInterID, "HSLEntryID": HSLEntryID, "HSLBillNo": HSLBillNo, "HSLSeQ": HSLSeQ, "HBillNo": HBillNo, "HInterID": HInterID
                             },
                             dataType: "json",
                             success: function (data) {
@@ -1108,6 +1141,73 @@
                 var audio = document.getElementById("cs2");
                 audio.play();
             }
+
+
+            //鏂囦欢涓婁紶
+            function PicUpload() {
+                //澶氬浘鐗囦笂浼�
+                //澶氭枃浠跺垪琛ㄧず渚�
+                var ProImgByList = $('#ProImgByList')
+                    , uploadListIns = upload.render({
+                        elem: '#testList'
+                        , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile2"
+                        , 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'); //鏄剧ず涓婁紶
+                        }
+                    });
+            }
+
+
+
             //鎵簮鍗�
             function GetMeesageBySourceBillNo(obj) {
                 var HSourceBillNo = $('#HSourceBillNo').val()
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index 78b0369..d56c92c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -471,6 +471,7 @@
                 $('#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");
@@ -730,6 +731,37 @@
                 });
             })
 
+            //#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
+
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
                 //var tableData = data.field;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index a5c0b44..5b36bee 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -451,6 +451,7 @@
                 $('#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");
@@ -823,6 +824,37 @@
                 });
             }
 
+            //#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 瀹℃牳鎸夐挳
             form.on('submit(set_CheckBill)', function () {
                 //瀹℃牳鏂规硶
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 0b815a2..92b4b31 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"
@@ -720,6 +720,7 @@
                 $('#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");
@@ -796,6 +797,38 @@
                     }
                 })
             }
+
+            //#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;
             //鍒濆鍩烘湰淇℃伅璧嬪��
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.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.html"
index 0a2e3b5..4611b2c 100644
--- "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.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.html"
@@ -416,7 +416,7 @@
             var params = get_UrlVars();
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = [];
+            var titleData = [];           
 
             if (typeof (params[params[0]]) == "undefined") {
                 var OperationType = 1;//鎿嶄綔绫诲瀷
@@ -466,6 +466,7 @@
                 $('#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");
@@ -636,6 +637,38 @@
             }
             //#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();
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_Fast.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_Fast.html"
index 390311d..3ddc547 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_Fast.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_Fast.html"
@@ -837,7 +837,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSourceBillNo").val(checkStatus.data[0].HBillNo);
+                        $("#HSourceBillNo").val(checkStatus.data[0].FBILLNO);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
index a1d21d6..1146829 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast_AR.html"
@@ -142,6 +142,7 @@
 
                     <div class="layer-footer" style="text-align: center;">
                         <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="btn_Check" id="btn_Check">瀹℃牳</button>
+                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
                         <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
                     </div>
                 </form>
@@ -229,6 +230,49 @@
                     GetMeesageByBarCode();
                 }
             });
+
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                // console.log(data);
+                var HBillNo = $('#HBillNo').val()
+                var HMaterID = data[0].HMaterID
+                $.ajax(
+                    {
+                        type: "Get",
+                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Kf_ReciveBill_Fast_AR/Delete_Json_AN",
+                        async: true,
+                        data: { "HBillNo": HBillNo, "HMaterID": HMaterID},
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) {
+                                $.ajax({
+                                    url: GetWEBURL() + '/Kf_ReciveBill_Fast_AR/Display111',
+                                    type: "GET",
+                                    data: { HBillNo: HBillNo},
+                                    success: function (result) {
+                                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                            option.data = result.data;
+                                            table.render(option);
+                                        }
+                                        else {
+                                            layer.msg(result.Message);
+                                        }
+                                        layer.closeAll("loading");
+                                    }
+                                });
+                            }
+                            else {
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        },
+                        error: function (err) {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+            });
+
             //鏉″舰鐮佺‘璁�
             form.on('submit(QueDin)', function (data) {
                 GetMeesageByBarCode();
@@ -337,6 +381,7 @@
             function set_InitGrid() {
                 //琛ㄥご
                 columns = [
+                    { type: 'radio' }
                     //{ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left' }
                     //, { field: 'HSQty', title: '鏁伴噺', edit: 'text', totalRow: true }
                     //, { field: 'HQty', title: '璁㈠崟鏁伴噺' }
@@ -348,8 +393,7 @@
                     //, { field: 'HEntryID', title: '瀛愬唴鐮�', sort: true, width: 200 }
                     //, { field: 'HPieceQty', title: '鏉$爜鏁伴噺', width: 150 }
                     , { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true }
-                    , { field: 'HQtyMust', title: '璁㈠崟鏁伴噺' }
-                    , { field: 'HMaterID', title: 'HMaterID', sort: true, width: 200 }
+                    //, { field: 'HQtyMust', title: '璁㈠崟鏁伴噺' }
                     , { field: 'HNumber', title: '鐗╂枡浠g爜' }
                     , { field: 'HName', title: '鐗╂枡鍚嶇О' }
                     , { field: 'HModel', title: '瑙勬牸鍨嬪彿' }
@@ -357,6 +401,7 @@
                     , { field: 'HInterID', title: '涓诲唴鐮�', sort: true, width: 200 }
                     , { field: 'HEntryID', title: '瀛愬唴鐮�', sort: true, width: 200 }
                     , { field: 'HBillNo', title: '鏀舵枡閫氱煡鍗曞彿', sort: true, width: 200 }
+                    , { field: 'HMaterID', title: 'HMaterID', sort: true, width: 200 }
 
                 ];
                 option = {
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_MateOutBackBill_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_MateOutBackBill_Fast.html"
index 65312d6..f5fb43b 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_MateOutBackBill_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_MateOutBackBill_Fast.html"
@@ -566,6 +566,8 @@
                     }
                 })
             });
+
+
             //閫夋嫨渚涘簲鍟�
             form.on('submit(HSupID-BT)', function () {
                 layer.open({
@@ -646,13 +648,17 @@
             });
 
             //閫�鍑�
+            //form.on('submit(Cancel)', function () {
+            //    sessionStorage["SourceFlag"] = false;
+            //    //parent.location.href = "../../../views/index.html"
+            //    //window.close();//鍏抽棴褰撳墠椤�
+            //    layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+            //        window.close();
+            //    });
+            //})
+
             form.on('submit(Cancel)', function () {
-                sessionStorage["SourceFlag"] = false;
-                //parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    window.close();
-                });
+                parent.location.href = "../../../views/index.html"
             })
             //缂栬緫
             form.on('submit(cmdModify)', function () {//缂栬緫
@@ -951,10 +957,11 @@
                     }
                 }
                 $.ajax({
-                    url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
+                    //url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
+                    url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                     type: "GET",
                     //data: { "sCode": '1001456360', "sInterID": 122554, "HBillType": '1204', "sBillNo": 'MATO00000055', "sMaker": sessionStorage["HUserName"], "WhID": 484080, "SPID": 0, "sQty": 0, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": 'PPBOM202112226', "sSourceType": '3720', "HOWNERID": sessionStorage["OrganizationID"] },
-                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+                    data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": true, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                     success: function (result) {
                         if (result.count == 1) {
 
@@ -1042,22 +1049,22 @@
                             layer.load(3)
 
                             $.ajax({
-                                url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
+                                url: GetWEBURL() + '/MateOutBackBill/DisBillEntryList',
                                 type: "GET",
-                                data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: '1244', sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+                                data: { HBillID: sInterID, HBillType: '1244', sWhere: '' },
                                 success: function (result) {
                                     if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                         listOption.data = result.data.list;
                                         table.render(listOption);
-                                        $("#HBarCode_B").val(result.data.list2[0].HBarCode);
-                                        $("#HMaterName_B").val(result.data.list2[0].HMaterName);
-                                        $("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
-                                        $("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
-                                        $("#HUnitName_B").val(result.data.list2[0].HUnitName);
-                                        $("#HQty_B").val(result.data.list2[0].HQty);
-                                        $("#HTMQty_B").val(result.data.list2[0].HTMQty);
-                                        $("#HWHName_B").val(result.data.list2[0].HWHName);
-                                        $("#HSPName_B").val(result.data.list2[0].HSPName);
+                                        //$("#HBarCode_B").val(result.data.list2[0].HBarCode);
+                                        //$("#HMaterName_B").val(result.data.list2[0].HMaterName);
+                                        //$("#HMaterModel_B").val(result.data.list2[0].HMaterModel);
+                                        //$("#HBatchNo_B").val(result.data.list2[0].HBatchNo);
+                                        //$("#HUnitName_B").val(result.data.list2[0].HUnitName);
+                                        //$("#HQty_B").val(result.data.list2[0].HQty);
+                                        //$("#HTMQty_B").val(result.data.list2[0].HTMQty);
+                                        //$("#HWHName_B").val(result.data.list2[0].HWHName);
+                                        //$("#HSPName_B").val(result.data.list2[0].HSPName);
                                     }
                                     else {
                                         layer.msg(result.Message);
@@ -1121,14 +1128,18 @@
                 if (HPPQty == "") {
                     HPPQty = 0;
                 }
+                var sRedBlue = "绾㈠瓧";
                 var sMouldManagerCtl = "N";  //鏄惁鍚敤鍣ㄥ叿绠$悊
                 var sFIFOCtl = "N";          //鏄惁鍚敤鍏堣繘鍏堝嚭绠$悊
                 $.ajax({
-                    url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json",
+                    url: GetWEBURL() + "/MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json_Back",
                     type: "GET",
-                    data: { "sInterID": sInterID, "sBillNo": sBillNo, "HBillType": '1244', "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "sMaker": sessionStorage["HUserName"], "sPPQty": HPPQty, "sPlanMode": HPlanMode, "sFIFOWHID": HFIFOWHID, "HOWNERID": sessionStorage["OrganizationID"] },
+                    data: {
+                        "sInterID": sInterID, "sBillNo": sBillNo, "HBillType": '1244', "sSourceBillNo": HSourceBillNo, "sSourceType": HSourceBillType, "sRedBlue": sRedBlue
+                    },
                     success: function (result) {
                         HSourceFlag = true;
+                        sessionStorage["SourceFlag"] = true;
                         $("#HPlanMode").attr("disabled", "true");
                         $("#HBillType").attr("disabled", "true");
                         element.tabChange('tab-MateOutBill', '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 1052ef0..287863a 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"
@@ -577,13 +577,19 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceListNew.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
                     , resize: false
                     , cancel: function () {
                         //$(".layui-btn").removeClass("layui-btn-disabled");
                     }
                 })
             });
+
+
+         
+
+
+
             //閫夋嫨渚涘簲鍟�
             form.on('submit(HSupID-BT)', function () {
                 layer.open({
@@ -974,7 +980,7 @@
                         url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                         type: "GET",
                         async: false,
-                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                         success: function (result) {
                             if (result.count == 1) {
                                 playSound1();

--
Gitblit v1.9.1