From f025d969dcf4e664ef8f7f33ee2060e113c3adff Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 20:56:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/销售管理/发货通知单/Add_Edit_Xs_SeOutStockBillList.html |  172 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 135 insertions(+), 37 deletions(-)

diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
index fda95d0..e326df7 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Add_Edit_Xs_SeOutStockBillList.html"
@@ -376,7 +376,7 @@
             var shijian = year + "-" + month + "-" + day;
 
             var allVal;
-
+            var topScroll = 0;//璁板綍婊氬姩鏉$殑浣嶇疆
             var HModName = "Add_Edit_Xs_SeOutStockBillList";
             //#endregion
 
@@ -445,14 +445,6 @@
             }
             //#endregion
 
-            
-
-            var rowdata = [{
-                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
-                "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
-                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-            }];
-
             // 鍒濆鍖栫晫
             set_InitGrid();
             //鑾峰彇婧愬崟绫诲瀷
@@ -464,7 +456,7 @@
                 //鏂板琛岃〃鏍兼暟鎹�
                 var NewRow = {
                     "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
-                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
+                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "","HInventoryQty":0,
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 };
                 switch (obj.event) {
@@ -662,6 +654,8 @@
                                         j++;
                                     }
                                     table.render(option);
+                                    //璁剧疆褰撳墠搴撳瓨
+                                    SetAllInventoryByMaterID();
                                     layer.close(ajaxLoad);
                                     layer.msg("鏌ヨ鎴愬姛", { time: 1 * 1000, icon: 1 });
                                 }
@@ -688,6 +682,7 @@
                 var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
                 var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
                 var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//鑾峰彇婊氬姩鏉′綅缃�
                 // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
                 var oldText = $(this).prev().text();
                 var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -880,6 +875,8 @@
                         $("#HWHName").val(checkStatus.data[0].涓讳粨搴�);
 
                         table.render(option);
+                        //璁剧疆褰撳墠搴撳瓨
+                        SetAllInventoryByMaterID();
                         layer.close(index);//鍏抽棴寮圭獥
                     }
 
@@ -940,6 +937,8 @@
                             }
                         }
                         getSeletMainInfo(sMainWhere);
+                        //璁剧疆褰撳墠搴撳瓨
+                        SetAllInventoryByMaterID();
                         layer.close(index);//鍏抽棴寮圭獥
                     }
                 });
@@ -1053,6 +1052,7 @@
                     , limit: 500
                     , height: 500
                     , loading: false
+                    , totalRow:true
                     , cols: [[ //瀛愯〃
                         { type: 'checkbox', totalRowText: '鍚堣琛�' }
                         , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
@@ -1068,15 +1068,23 @@
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
                         , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
                         , { field: '鍙戣揣浠撳簱', title: '鍙戣揣浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
-                        , { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text' }
+                        , { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text', totalRow: true  }
+                        , { field: 'HInventoryQty', title: '褰撳墠搴撳瓨', width: 100}
                         , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
-                        , { field: 'HMoney', title: '閲戦', width: 100 }
+                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true  }
                         , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
                     ]]
+                    , done: function (res, curr, count) {
+                        $(".layui-table-main").scrollTop(topScroll);
+                    }
                 }
 
-                option.data = [];
+                option.data = [{
+                        "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
+                        "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "", "HInventoryQty": 0,
+                        "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                    }];
                 table.render(option);
 
                 DisPlay_HideColumn();
@@ -1102,6 +1110,7 @@
                             //}
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
+                                , "HInterID": data.hmainid
                                 , "HDate": formatDate(data.鏃ユ湡)
                                 , "HSeOrderBillNo_M": data.閿�鍞鍗曞彿
                                 , "HEmpID": data.HEmpID
@@ -1151,7 +1160,7 @@
                                 rowdata.push(
                                     {
                                         "HMaterID": subdata[i].HMaterID, "鐗╂枡浠g爜": subdata[i].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": subdata[i].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": subdata[i].瑙勬牸鍨嬪彿, "HUnitID": subdata[i].HUnitID, "璁¢噺鍗曚綅": subdata[i].璁¢噺鍗曚綅,
-                                        "HWHID": subdata[i].HWHID, "鍙戣揣浠撳簱": subdata[i].鍙戣揣浠撳簱, "HQty": subdata[i].鏁伴噺, "HPrice": subdata[i].鍗曚环, "HMoney": subdata[i].閲戦, "HRemark": subdata[i].琛ㄤ綋澶囨敞
+                                        "HWHID": subdata[i].HWHID, "鍙戣揣浠撳簱": subdata[i].鍙戣揣浠撳簱, "HQty": subdata[i].鏁伴噺,"HPrice": subdata[i].鍗曚环, "HMoney": subdata[i].閲戦, "HRemark": subdata[i].琛ㄤ綋澶囨敞
                                         , "HSourceBillNo": subdata[i].婧愬崟鍗曞彿,    //婧愬崟鍙�
                                         "HSourceBillType": subdata[i].婧愬崟绫诲瀷,   //婧愬崟绫诲瀷
                                         "HSourceInterID": subdata[i].婧愬崟涓诲唴鐮�,   //婧愬崟涓诲唴鐮�
@@ -1161,6 +1170,8 @@
                             }
                             option.data = rowdata;
                             table.render(option);
+                            //璁剧疆褰撳墠搴撳瓨
+                            SetAllInventoryByMaterID();
                             form.render('select');
 
                             layer.close(ajaxLoad);
@@ -1369,6 +1380,8 @@
                                             if (childData != null) {
                                                 //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                                 OptionData = childData;
+                                                //鑾峰彇褰撳墠搴撳瓨
+                                                var HInventoryQty = GetInventoryByMaterID(OptionData.HItemID, obj.data["HWHID"]);
                                                 obj.update({
                                                     "HMaterID": OptionData.HItemID
                                                     , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
@@ -1377,7 +1390,9 @@
                                                     , "HUnitID": OptionData.HUnitID
                                                     , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
                                                     , "HQty": 1
+                                                    , "HInventoryQty": HInventoryQty
                                                 })
+
 
                                                 OptionData = {};
                                                 childData = null;
@@ -1410,6 +1425,7 @@
                                     if (childData != null) {
                                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                         OptionData = childData;
+                                        var HInventoryQty = GetInventoryByMaterID(OptionData.HItemID, obj.data["HWHID"]);
                                         obj.update({
                                             "HMaterID": OptionData.HItemID
                                             , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
@@ -1418,6 +1434,7 @@
                                             , "HUnitID": OptionData.HUnitID
                                             , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
                                             , "HQty": 1
+                                            , "HInventoryQty": HInventoryQty
                                         })
 
                                         OptionData = {};
@@ -1456,7 +1473,9 @@
 
                                     if (checkStatus.data.length == 0) {
                                         return layer.msg("璇烽�夋嫨鏁版嵁");
-                                    }else if (checkStatus.data.length == 1) {
+                                    } else if (checkStatus.data.length == 1) {
+                                        //鑾峰彇褰撳墠搴撳瓨
+                                        var HInventoryQty = GetInventoryByMaterID(checkStatus.data[0].HItemID, obj.data["HWHID"]);
                                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                         obj.update({
                                             "HMaterID": checkStatus.data[0].HItemID
@@ -1465,20 +1484,37 @@
                                             , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
                                             , "HUnitID": checkStatus.data[0].HUnitID
                                             , "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                            , "HInventoryQty": HInventoryQty
                                             ,"HQty": 1
                                         })
                                         layer.close(index);//鍏抽棴寮圭獥
                                     } else {
-                                        table.cache["mainTable"].splice(0, 1);
-                                        for (var rowData of checkStatus.data) {
-                                            var NewRow = {
-                                                "HMaterID": rowData.HItemID, "鐗╂枡浠g爜": rowData.鐗╂枡浠g爜, "鐗╂枡鍚嶇О": rowData.鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": rowData.瑙勬牸鍨嬪彿, "HUnitID": rowData.HUnitID, "璁¢噺鍗曚綅": rowData.璁¢噺鍗曚綅鍚嶇О, "HWHID": "0", "鍙戣揣浠撳簱": "",
-                                                "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
-                                                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-                                            };
-                                            table.cache["mainTable"].push(NewRow);
+                                        var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+                                        for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+                                            if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+                                                //鏂板琛岃〃鏍兼暟鎹�
+                                                var NewRow = {
+                                                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
+                                                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
+                                                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                                                };
+
+                                                table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
+                                                option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+                                                table.render(option);//娓叉煋鐣岄潰
+                                            }
+                                            //鑾峰彇褰撳墠搴撳瓨
+                                            var HInventoryQty = GetInventoryByMaterID(checkStatus.data[i].HItemID, option.data[rowIndex + i].HWHID);
+                                            option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;  //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠g爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨�  鐗╂枡鍚嶇О  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿; //灏唎ption.data鏁扮粍涓搴旇鐨�  瑙勬牸鍨嬪彿  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                            option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁¢噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID   鏇存柊璁¢噺鍗曚綅灞炴��
+                                            option.data[rowIndex + i].HQty = 1;  //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠h〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
+                                            option.data[rowIndex + i].HInventoryQty = HInventoryQty;  //褰撳墠搴撳瓨
                                         }
-                                        option.data = table.cache["mainTable"];
                                         table.render(option);
                                         layer.close(index);//鍏抽棴寮圭獥
                                     }
@@ -1486,6 +1522,7 @@
                                 }
                                 , end: function () {
                                     if (typeof (OptionData.HItemID) != "undefined") {
+                                        var HInventoryQty = GetInventoryByMaterID(OptionData.HItemID, obj.data["HWHID"]);
                                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                         obj.update({
                                             "HMaterID": OptionData.HItemID
@@ -1495,6 +1532,7 @@
                                             , "HUnitID": OptionData.HUnitID
                                             , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
                                             , "HQty": 1
+                                            , "HInventoryQty": HInventoryQty
                                         })
                                         OptionData = [];
                                     }
@@ -1560,19 +1598,23 @@
                                     if (checkStatus.data.length != 1) {
                                         return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                                     }
+                                    var HInventoryQty = GetInventoryByMaterID(obj.data["HMaterID"], checkStatus.data[0].HItemID);
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
 
                                         "HWHID": checkStatus.data[0].HItemID,
-                                        "鍙戣揣浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
+                                        "鍙戣揣浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О,
+                                        "HInventoryQty": HInventoryQty
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
                                     if (typeof (OptionData.HItemID) != "undefined") {
+                                        var HInventoryQty = GetInventoryByMaterID(obj.data["HMaterID"],OptionData.HItemID);
                                         obj.update({
                                             "HWHID": OptionData.HItemID
                                             , "鍙戣揣浠撳簱": OptionData.浠撳簱鍚嶇О
+                                            , "HInventoryQty": HInventoryQty
                                         })
                                         OptionData = [];
                                     }
@@ -1607,6 +1649,8 @@
                             if (checkStatus.data.length == 0) {
                                 return layer.msg("璇烽�夋嫨鏁版嵁");
                             } else if (checkStatus.data.length == 1) {
+                                //鑾峰彇褰撳墠搴撳瓨
+                                var HInventoryQty = GetInventoryByMaterID(checkStatus.data[0].HItemID, obj.data["HWHID"]);
                                 //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                 obj.update({
                                     "HMaterID": checkStatus.data[0].HItemID
@@ -1615,20 +1659,37 @@
                                     , "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿
                                     , "HUnitID": checkStatus.data[0].HUnitID
                                     , "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                    , "HInventoryQty": HInventoryQty
                                     , "HQty": 1
                                 })
                                 layer.close(index);//鍏抽棴寮圭獥
                             } else {
-                                table.cache["mainTable"].splice(0, 1);
-                                for (var rowData of checkStatus.data) {
-                                    var NewRow = {
-                                        "HMaterID": rowData.HItemID, "鐗╂枡浠g爜": rowData.鐗╂枡浠g爜, "鐗╂枡鍚嶇О": rowData.鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": rowData.瑙勬牸鍨嬪彿, "HUnitID": rowData.HUnitID, "璁¢噺鍗曚綅": rowData.璁¢噺鍗曚綅鍚嶇О, "HWHID": "0", "鍙戣揣浠撳簱": "",
-                                        "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
-                                        "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-                                    };
-                                    table.cache["mainTable"].push(NewRow);
+                                var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+                                for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+                                    if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+                                        //鏂板琛岃〃鏍兼暟鎹�
+                                        var NewRow = {
+                                            "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": "0", "鍙戣揣浠撳簱": "",
+                                            "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
+                                            "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                                        };
+
+                                        table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
+                                        option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+
+                                        table.render(option);//娓叉煋鐣岄潰
+                                    }
+                                    //鑾峰彇褰撳墠搴撳瓨
+                                    var HInventoryQty = GetInventoryByMaterID(checkStatus.data[i].HItemID, option.data[rowIndex + i].HWHID);
+                                    option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;  //灏唎ption.data鏁扮粍涓搴旇鐨凥MaterID灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜; //灏唎ption.data鏁扮粍涓搴旇鐨� 鐗╂枡浠g爜 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨�  鐗╂枡鍚嶇О  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿; //灏唎ption.data鏁扮粍涓搴旇鐨�  瑙勬牸鍨嬪彿  灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; //灏唎ption.data鏁扮粍涓搴旇鐨� HUnitID 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID
+                                    option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О; //灏唎ption.data鏁扮粍涓搴旇鐨� 璁¢噺鍗曚綅 灞炴�ф洿鏂颁负浠巖esultData瀵硅薄涓幏鍙栫殑鐗╂枡ID   鏇存柊璁¢噺鍗曚綅灞炴��
+                                    option.data[rowIndex + i].HQty = 1;  //灏嗗搴旇鐨凥Qty灞炴�э紙鍙兘浠h〃鏁伴噺锛夎缃负1銆傝繖琛ㄧず瀵逛簬姣忎釜閫変腑鐨勭墿鏂欙紝鍏堕粯璁ゆ暟閲忚璁剧疆涓�1
+                                    option.data[rowIndex + i].HInventoryQty = HInventoryQty;  //褰撳墠搴撳瓨
                                 }
-                                option.data = table.cache["mainTable"];
                                 table.render(option);
                                 layer.close(index);//鍏抽棴寮圭獥
                             }
@@ -1636,6 +1697,7 @@
                         }
                         , end: function () {
                             if (typeof (OptionData.HItemID) != "undefined") {
+                                var HInventoryQty = GetInventoryByMaterID(OptionData.HItemID, obj.data["HWHID"]);
                                 //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                 obj.update({
                                     "HMaterID": OptionData.HItemID
@@ -1645,6 +1707,7 @@
                                     , "HUnitID": OptionData.HUnitID
                                     , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
                                     , "HQty": 1
+                                    , "HInventoryQty": HInventoryQty
                                 })
                                 OptionData = [];
                             }
@@ -1705,6 +1768,37 @@
             }
             //#endregion
 
+            //#region 鍙婃椂搴撳瓨鏌ヨ
+            function GetInventoryByMaterID(HMaterID, HWHID) {
+                var HInventoryQty = 0;
+                $.ajax({
+                    url: GetWEBURL() + '/Xs_SeOutStockBill/GetICInventory',
+                    async: false,
+                    type: "GET",
+                    data: { "HMaterID": HMaterID, "HWHID": HWHID, "HORGID": sessionStorage["OrganizationID"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            HInventoryQty = data1.data;
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+                return HInventoryQty;
+            }
+            //璁剧疆鑾峰彇鎵�鏈塷ption鐨勫綋鍓嶅簱瀛�
+            function SetAllInventoryByMaterID() {
+                option.date = table.cache["mainTable"];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    var HInventoryQty = GetInventoryByMaterID(table.cache["mainTable"][i].HMaterID, table.cache["mainTable"][i].HWHID);
+                    table.cache["mainTable"][i].HInventoryQty = HInventoryQty;
+                }
+                table.render(option);
+            }
+            //#endregion
+
+
             //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
             function get_HideColumn() {
                 var colName = "";
@@ -1757,6 +1851,9 @@
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol.length <= i) {
+                                    break;
+                                }
                                 var dataCols = dataCol[i].split('|');
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
@@ -1837,12 +1934,13 @@
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                             layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
                         } else {
-                            obj.del();
+                            obj.del();//鍋囧垹闄�
+                            table.cache["mainTable"].splice(rowIndex, 1);  //鈶″交搴曠Щ闄ゅ厓绱狅紝浠庣紦瀛橀噷绉婚櫎杩欎竴琛�
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
+                            table.render(option);
                             layer.close(index);
                         }
                     });

--
Gitblit v1.9.1