From 65968b3e0e9e03ef0904de35b78872224b9ce00a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 23 九月 2025 14:15:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html |   82 ++++++++++++++++++++++++++++------------
 1 files changed, 57 insertions(+), 25 deletions(-)

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/Add_Edit_Kf_MoveStockBill.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/Add_Edit_Kf_MoveStockBill.html"
index 35375c8..619f2b2 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/Add_Edit_Kf_MoveStockBill.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/Add_Edit_Kf_MoveStockBill.html"
@@ -1361,20 +1361,34 @@
                                     var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
                                     var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    if (checkStatus.data.length <1) {
+                                        return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
                                     }
-
-
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                        "HMaterID": checkStatus.data[0].HItemID,
-                                        "鐗╂枡浠g爜": checkStatus.data[0].鐗╂枡浠g爜,
-                                        "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О,
-                                        "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿,
-                                        "HUnitID": checkStatus.data[0].HUnitID,
-                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
-                                    })
+                                    OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+                                    if (checkStatus.data.length > 1) {
+                                        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爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                                                    "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+                                                    "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                                                    "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);//娓叉煋鐣岄潰
+                                            }
+                                            option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID; 
+                                            option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜;
+                                            option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О; 
+                                            option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿; 
+                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; 
+                                            option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О; 
+                                        }
+                                        table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+                                    }
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
@@ -1658,6 +1672,10 @@
                 })
 
                 $(document).off('dblclick', ".layui-table-edit").on('dblclick', '.layui-table-edit', function (e) {
+                    //鎵嬪姩澶辩劍
+                    var element = document.getElementById("HBillNo");
+                    element.focus();
+
                     //鐗╂枡
                     if (obj.event == "HMaterID") {
                         layer.open({
@@ -1675,20 +1693,34 @@
                                 var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
                                 var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
 
-                                if (checkStatus.data.length != 1) {
+                                if (checkStatus.data.length < 1) {
                                     return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                                 }
-
-
-                                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                obj.update({
-                                    "HMaterID": checkStatus.data[0].HItemID,
-                                    "鐗╂枡浠g爜": checkStatus.data[0].鐗╂枡浠g爜,
-                                    "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О,
-                                    "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿,
-                                    "HUnitID": checkStatus.data[0].HUnitID,
-                                    "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
-                                })
+                                OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+                                if (checkStatus.data.length > 1) {
+                                    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爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                                                "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+                                                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                                                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                                                "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);//娓叉煋鐣岄潰
+                                        }
+                                        option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;
+                                        option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜;
+                                        option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О;
+                                        option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿;
+                                        option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
+                                        option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О;
+                                    }
+                                    table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+                                }
                                 layer.close(index);//鍏抽棴寮圭獥
                             }
                             , end: function () {

--
Gitblit v1.9.1