Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yangle

2022-07-11 cc60441578ce0c1fcb4a344a11c2e8616a9b13ec

 WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html

@@ -366,7 +366,7 @@
            $("#HInterID").val("");
            $("#HBillNo").val("");
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                url: GetWEBURL() + "/Web/GetMAXNumPDA",
                type: "GET",
                data: { "HBillType": '3711' },
                success: function (d) {
@@ -816,11 +816,12 @@
                                                    elem: '#wl-table'
                                                , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
                                                  , where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
                                                  , cellMinWidth : 115
                                                , cellMinWidth: 115
                                                , totalRow: true
                                                  , cols: [[
                                                      { type: 'radio' }
                                                    , { field: 'HQty', title: '鏁伴噺', sort: true }
                                                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true  }
                                                      , { field: 'HQty', title: '鏁伴噺', sort: true, totalRow: true}
                                                      , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, totalRow: true}
                                                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true }
                                                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
                                                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
@@ -881,14 +882,15 @@
                            table.render({
                                elem: '#wl-table'
                                , cellMinWidth: 80
                                , totalRow: true
                              //, url: 'http://61.130.49.162:9090/WMSAPI///POStockInBill/DisBillEntryList_Webs_Json'
                                , url: GetWEBURL() + '/POStockInBill/DisBillEntryList_Webs_Json'
                              //, toolbar: '#toolbarDemo'
                              , where: { HBillID: sInterID, HBillType: '3711', sWhere: '' }
                              , cols: [[
                                  { type: 'radio' }
                                , { field: 'HQty', title: '鏁伴噺', sort: true }
                                , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
                                  , { field: 'HQty', title: '鏁伴噺', sort: true, totalRow: true}
                                  , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, totalRow: true}
                                , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true }
                                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
                                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }