From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序

---
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html |  191 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 178 insertions(+), 13 deletions(-)

diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 35d2bb1..d608faf 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -67,6 +67,7 @@
                                                 <label class="layui-form-label">宸ュ巶浠g爜</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
+                                                        <!--<option value="0">鑸滄垚</option>-->
                                                     </select>
                                                 </div>
                                             </div>
@@ -85,13 +86,14 @@
                                                         <option value="1">鐢熶骇璁㈠崟</option>
                                                         <option value="2">鐢熶骇姹囨姤鍗�</option>
                                                         <option value="3">閲囪喘璁㈠崟</option>
-                                                        <option value="4">鏀舵枡閫氱煡鍗�</option>
+                                                        <!--<option value="4">鏀舵枡閫氱煡鍗�</option>
                                                         <option value="5">濮斿璁㈠崟</option>
                                                         <option value="6">鐢熶骇鍏ュ簱鍗�</option>
                                                         <option value="7">閲囪喘鍏ュ簱鍗�</option>
                                                         <option value="8">閿�鍞��璐у崟</option>
                                                         <option value="9">鐢熶骇閫�鏂欏崟</option>
-                                                        <option value="10">宸ュ簭娴佽浆鍗�</option>
+                                                        <option value="10">宸ュ簭娴佽浆鍗�</option>-->
+                                                        <option value="11">閿�鍞嚭搴撳崟</option>
                                                     </select>
                                                 </div>
                                             </div>
@@ -108,6 +110,7 @@
                                                 <label class="layui-form-label">鏉$爜绫诲瀷</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
+                                                        <!--<option value="11">鍞竴鏉$爜</option>-->
                                                     </select>
                                                 </div>
                                             </div>
@@ -179,6 +182,12 @@
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
     <script>
+        //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+        var childPage = null;                       //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+        var currRowIndex = 0;                       //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+        var childData = null;                       //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+        //#endregion
+
         //鑾峰彇鍙傛暟
         var params = get_UrlVars();
         if (typeof (params[params[0]]) == "undefined") {
@@ -213,7 +222,7 @@
             var sWhere = "";
             var sBillType = "3801";
             var HModName = "Gy_BarCodeBill";
-            var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁¢噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID", "鎿嶄綔鍛業D", "鐝粍ID", "澶栫鏁�", "閽㈠嵎鎹嗗寘鍙�", "鐐夊彿", "鍘傚晢", "瀹㈡埛浠g爜", "瀹㈡埛鍚嶇О", "閿�鍞鍗曞彿", "鐢熶骇鏃ユ湡", "淇濊川鏈熻嚦", "鐑鐞�", "杈呭姪灞炴�т唬鐮�", "杈呭姪灞炴�у悕绉�", "杈呭崟浣嶆暟閲�", "鏄惁鍚敤淇濊川鏈�", "鏄惁璧犲搧","杩涙枡鏃ユ湡"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["鐗╂枡ID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "杈呭姪灞炴�D", "璁¢噺鍗曚綅ID", "瀹㈡埛ID", "HItemID", "hmainid", "hsubid", "HinterID", "杞﹂棿ID", "渚涘簲鍟咺D", "HSTOCKORGID", "鎿嶄綔鍛業D", "鐝粍ID", "澶栫鏁�", "閽㈠嵎鎹嗗寘鍙�", "鐐夊彿", "鍘傚晢", "瀹㈡埛浠g爜", "瀹㈡埛鍚嶇О", "閿�鍞鍗曞彿", "鐢熶骇鏃ユ湡", "淇濊川鏈熻嚦", "鐑鐞�", "杈呭姪灞炴�т唬鐮�", "杈呭姪灞炴�у悕绉�", "杈呭崟浣嶆暟閲�", "鏄惁鍚敤淇濊川鏈�", "鏄惁璧犲搧", "杩涙枡鏃ユ湡"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
             var HMaterID = "";
             var HBatchNo = "";
@@ -267,7 +276,7 @@
 
             var rowdata = [{
                 "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
-                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
+                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
             }];
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
@@ -299,7 +308,7 @@
 
                 var NewRow = {
                     "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
-                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
+                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
                 };
                 //console.log(NewRow);
                 switch (obj.event) {
@@ -469,6 +478,9 @@
                     case '10':
                         return "宸ュ簭娴佽浆鍗�";
                         break;
+                    case '11':
+                        return '閿�鍞嚭搴撳崟';
+                        break;
                 }
             }
 
@@ -536,6 +548,9 @@
                                             if (result.list[i].HMinQty != 0) {
                                                 result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
                                             }
+                                            result.list[i].HEmpID = sessionStorage["HEmpID"]
+                                            result.list[i].HEmpNumber = sessionStorage["HEmpNumber"]
+                                            result.list[i].HEmpName = sessionStorage["HEmpName"]
                                         }
 
                                         BatchNoArray = result.list;  //鑾峰彇鎵瑰彿锛岀敤鏉ョ粰鎵规鎸夐挳鍔熻兘涓殑鎵瑰彿璧嬪��
@@ -588,6 +603,20 @@
             //鏉$爜鐢熸垚
             form.on('submit(ToolCreate)', function (data) {
                 $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
+                for (var i = 0; i < table.cache['mainTable'].length; i++) {
+                    table.cache['mainTable'][i]["HDate"] = $("#HDate").val();
+                    if (table.cache["mainTable"][i].HMaterName!=null&&(table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1)) {
+                        table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                    }
+                    if (table.cache["mainTable"][i].HMaterModel!=null&&(table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1)) {
+                        table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                    }
+                    if (table.cache["mainTable"][i].HPinfan!=null&&("HPinfan" in table.cache["mainTable"][i])) {
+                        if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 || table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
+                            table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "鈥�").replaceAll(";", "锛�")
+                        }
+                    }                    
+                }
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 HMaterInfo = table.cache['mainTable'];
                 //鐗╂枡鏄庣粏淇℃伅涓嶄负绌哄垽鏂�
@@ -626,7 +655,7 @@
                     $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
                     $("#HSourceBillType").val('1'); //閫夋嫨涓嬫媺妗嗛粯璁ょ涓�涓�夐」
                     $("#HBarCodeType").val('0');
-                    var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "" }]
+                    var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "", "HCheckEmpName": "" }]
                     table.reload('mainTable', {
                         data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
                     });
@@ -634,7 +663,7 @@
                         "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                         , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                         , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
-                        , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
+                        , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
                     }]
                     table.reload('mainTable1', {
                         data: arr1 // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -670,7 +699,25 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].鐗╂枡浠g爜, HMaterName: checkStatus.data[0].鐗╂枡鍚嶇О, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].璁¢噺鍗曚綅浠g爜, HUnitName: checkStatus.data[0].璁¢噺鍗曚綅, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].鏁伴噺.toString("#0.00"), HMinQty: checkStatus.data[0].鏈�灏忓寘瑁呮暟, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "" }]
+
+                        var data = checkStatus.data;
+                        var arr = [];
+                       
+                        for (var i = 0; i < data.length; i++) {
+                            arr.push({
+                                "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠g爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+                                , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+                                , "HUnitNumber": data[i].璁¢噺鍗曚綅浠g爜, "HUnitName": data[i].璁¢噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+                                , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
+                                , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
+                                , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd")
+                                , "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
+                                , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+                                , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+                                , "HCheckEmpName": ""
+                            })
+                        }
+                      
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         table.reload('mainTable', {
                             data: arr // 璋冪敤table.reload 閲嶆柊娓叉煋鏄剧ず鍔犺浇杩藉姞浜嗘暟鎹殑琛ㄦ牸
@@ -837,10 +884,11 @@
                     , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', width: 200 }
                     , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
                     , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber' }
-                    , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }                   
+                    , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
                     , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
                     , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', width: 200, event: 'HGroupNumber' }
                     , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
+                    , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
                     , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
                     , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100, totalRow: true }
                     , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', totalRow: true, width: 100 }
@@ -866,8 +914,8 @@
                     , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
                     , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 100, templet: '#switchTp3', unresize: false }
                     , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, templet: '#switchTpl', unresize: false }
-                    , { field: 'HDate', title: '杩涙枡鏃ユ湡', width: 100 }
-                    , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, hide: true }
+                    , { field: 'HDate', title: '鏉$爜鏃ユ湡', width: 100, hide: true }
+                    , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
                 option = {
@@ -1001,7 +1049,7 @@
                     , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
                     , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
                     , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
-                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
+                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
                 }];
                 table.render(option);
                 //鍒锋柊琛ㄦ牸鏁版嵁
@@ -1015,7 +1063,7 @@
                     "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                     , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                     , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
-                    , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": ""
+                    , "HExpirationDateFlag": 0, "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"], "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": "", "HCheckEmpName": ""
                 }];
                 table.render(option1);
                 //鍒锋柊琛ㄦ牸鏁版嵁
@@ -1418,6 +1466,123 @@
             //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
+                    if (event.key != "F7") {
+                        var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                        if (obj.event == "HMaterNumber") {                           //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+                            if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                                if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                                    var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                                    var innerHeight = window.innerHeight;
+                                    var top = offset.top + 0.05 * innerHeight;
+                                    var left = offset.left;
+                                    if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                                        top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                                    }
+                                    layer.open({
+                                        type: 2                                                                                     //寮圭獥绫诲瀷
+                                        , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                                        , area: ['25%', '30%']                                                                      //澶у皬
+                                        , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                                        , offset: [top, left]
+                                        , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                                        //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                                        , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                                        , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                                        , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                                        , success: function (layero, index) {
+                                            setTimeout(function () {
+                                                var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                                currRowIndex = 0;
+                                                var tableView = "h_v_Gy_MaterialList";
+                                                var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                                                childPage.getData(childSWhere, tableView);
+                                            }, 200);
+                                        }
+                                        , end: function () {
+                                            obj.event = "";
+                                            childPage = null;
+                                            currRowIndex = 0;
+                                            if (childData != null) {
+                                                obj.update({
+                                                    "HMaterID": childData.HItemID,
+                                                    "HMaterNumber": childData.鐗╂枡浠g爜,
+                                                    "HMaterName": childData.鐗╂枡鍚嶇О,
+                                                    "HMaterModel": childData.瑙勬牸鍨嬪彿,
+                                                    "HUnitID": childData.HUnitID,
+                                                    "HUnitNumber": childData.璁¢噺鍗曚綅浠g爜,
+                                                    "HUnitName": childData.璁¢噺鍗曚綅鍚嶇О
+                                                });
+
+                                                if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉$爜') {
+                                                    obj.update({
+                                                        HQty: 1,    //鏁伴噺
+                                                        HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
+                                                        HBQty: 1    //绠辨暟
+                                                    });
+                                                }
+
+                                                childData = null;
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    setTimeout(function () {
+                                        var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                        currRowIndex = 0;
+                                        var tableView = "h_v_Gy_MaterialList";
+                                        var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%')  order by 鐗╂枡浠g爜 desc";
+                                        childPage.getData(childSWhere, tableView);
+                                    }, 200);
+                                }
+                            } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                                if (event.key == "ArrowUp") {
+                                    currRowIndex--;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "ArrowDown") {
+                                    currRowIndex++;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "Enter") {
+                                    //鎵嬪姩澶辩劍
+                                    var element = document.getElementById("HSourceBillNo");
+                                    element.focus();
+
+                                    childPage.getSelectedData(currRowIndex);
+
+                                    if (childData != null) {
+                                        obj.update({
+                                            "HMaterID": childData.HItemID,
+                                            "HMaterNumber": childData.鐗╂枡浠g爜,
+                                            "HMaterName": childData.鐗╂枡鍚嶇О,
+                                            "HMaterModel": childData.瑙勬牸鍨嬪彿,
+                                            "HUnitID": childData.HUnitID,
+                                            "HUnitNumber": childData.璁¢噺鍗曚綅浠g爜,
+                                            "HUnitName": childData.璁¢噺鍗曚綅鍚嶇О
+                                        });
+
+                                        if ($("#HBarCodeType").find("option:selected").html() == '鎵樼洏鏉$爜') {
+                                            obj.update({
+                                                HQty: 1,    //鏁伴噺
+                                                HMinQty: 1, //鏈�灏忓寘瑁呮暟閲�
+                                                HBQty: 1    //绠辨暟
+                                            });
+                                        }
+
+                                        childData = null;
+                                    }
+                                    
+
+                                    childPage = null;
+                                    currRowIndex = 0;
+                                    childData = null;
+                                    obj.event = "";
+                                }
+                            }
+                        }
+
+                    }
+                    //#endregion
+
                     if (event.key == "F7") {
                         //鐗╂枡淇℃伅  濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪 鎸塅7
                         if (obj.event === 'HMaterNumber')  //鐗╂枡淇℃伅  濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7

--
Gitblit v1.9.1