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

yusijie

2022-12-22 18d20a86ec45394e545a53b4479801401123fc22

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

 WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast.html

@@ -195,32 +195,37 @@
                    return;
                }
                var index = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
                    type: "GET",
                    data: { "HBarCode": HBarCode, "HInterID": HInterID },
                    success: function (result) {
                        if (result.code == "1") {
                            var sSubStr = table.cache['mainTable'];
                            for (var i = 0; i < sSubStr.length; i++) {
                                if (sSubStr[i].HSourceEntryID == result.data[0]["HSourceEntryID"]) {
                                    sSubStr[i].HSQty += parseInt(result.data[0]["HQty"]);
                                    table.render(option);
                                    break;
                                }
                            }
                            layer.close(index);
                        }
                        else {
                            layer.close(index);
                            layer.msg(result.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: "温馨提示" });
                    }
                });
                var sSubStr = table.cache['mainTable'];
                if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
                    sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
                    table.render(option);
                    break;
                }
                layer.close(index);
                //$.ajax({
                //    url: GetWEBURL() + "/POStockInBillList/Get_ReciveBillByBarcode",
                //    type: "GET",
                //    data: { "HBarCode": HBarCode, "HInterID": HInterID },
                //    success: function (result) {
                //        if (result.code == "1") {
                //            var sSubStr = table.cache['mainTable'];
                //            if (sSubStr[i].HMaterID == HBarCode.split("#")[0]) {
                //                sSubStr[i].HSQty += parseInt(HBarCode.split("#")[1]);
                //                table.render(option);
                //                break;
                //            }
                //            layer.close(index);
                //        }
                //        else {
                //            layer.close(index);
                //            layer.msg(result.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: "温馨提示" });
                //    }
                //});
                $('#HBarCode').val("");
                $("#HBarCode").focus();
            }
@@ -278,8 +283,8 @@
                    , { field: 'HModel', title: '规格型号' }
                    , { field: 'HInterID', title: '主内码', sort: true, width: 200 }
                    , { field: 'HEntryID', title: '子内码', sort: true, width: 200 }
                    , { field: 'HSourceInterID', title: '源单主内码', sort: true, width: 200 }
                    , { field: 'HSourceEntryID', title: '源单子内码', sort: true, width: 200 }
                    //, { field: 'HSourceInterID', title: '源单主内码', sort: true, width: 200 }
                    //, { field: 'HSourceEntryID', title: '源单子内码', sort: true, width: 200 }
                ];
                option = {
                    id: 'mainTable'