陈婷婷
2026-03-31 7953d6eb2b77a2dbebdc8596768f5687916d636a
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -920,7 +920,7 @@
                        var width = parseFloat(result.data[i].容器宽度) || 0;
                        var height = parseFloat(result.data[i].容器高度) || 0;
                        var rowVolume = (length * width * height).toFixed(2);
                        console.log(result.data)
                        this.editData.push(
                            {
                                "HSourceInterID": result.data[i].源单主内码,
@@ -1261,6 +1261,10 @@
                // 显示源单数据加载状态
                this.sourceDataLoading = true;
                var dataArray = [];
                let hmainidVal = []
                for (var i = 0; i < checkStatus.length; i++) {
                    hmainidVal[i] = "'" + checkStatus[i].hmainid + '-' + checkStatus[i].hsubid + "'"
                }
                // 使用Promise.all等待所有异步请求完成
                const promises = checkStatus.map(async (item) => {
                    const temp = await this.getPushSeOutStockBillInit(item.hmainid, item.hsubid);
@@ -1281,41 +1285,37 @@
                var existingData = this.editData || [];
                var orginHQTY = 0;
                // 创建物料ID映射
                var materialMap = {};
                for (var i = 0; i < dataArray.length; i++) {
                    orginHQTY = dataArray[i].数量;
                    var materialId = dataArray[i].HMaterID;
                    console.log(materialId)
                    if (!materialMap[materialId]) {
                        materialMap[materialId] = [];
                    }
                    materialMap[materialId].push({
                        HMaterID: dataArray[i].HMaterID,
                        hmainid: dataArray[i].hmainid,
                        hsubid: dataArray[i].hsubid,
                        单据号: dataArray[i].单据号
                    });
                }
                // 获取所有物料ID
                var ListMaterial = "";
                for (var materialId in materialMap) {
                    if (ListMaterial) ListMaterial += ";";
                    ListMaterial += materialId;
                }
                if (!ListMaterial) {
                    this.$modal.msgError("没有找到物料信息,请检查选择的源单是否包含有效的物料数据!");
                    this.sourceDataLoading = false;
                    return;
                }
                let hmainidVal = []
                for (var i = 0; i < dataArray.length; i++) {
                    hmainidVal[i] = dataArray[i].hmainid
                }
                // const response = await axios.get(this.baseURL + '/WLYayBillController/GetMesByOrginBill_1', {
                // var materialMap = {};
                // for (var i = 0; i < dataArray.length; i++) {
                //     orginHQTY = dataArray[i].数量;
                //     var materialId = dataArray[i].HMaterID;
                //     console.log(materialId)
                //     if (!materialMap[materialId]) {
                //         materialMap[materialId] = [];
                //     }
                //     materialMap[materialId].push({
                //         HMaterID: dataArray[i].HMaterID,
                //         hmainid: dataArray[i].hmainid,
                //         hsubid: dataArray[i].hsubid,
                //         单据号: dataArray[i].单据号
                //     });
                // }
                // // 获取所有物料ID
                // var ListMaterial = "";
                // for (var materialId in materialMap) {
                //     if (ListMaterial) ListMaterial += ";";
                //     ListMaterial += materialId;
                // }
                // if (!ListMaterial) {
                //     this.$modal.msgError("没有找到物料信息,请检查选择的源单是否包含有效的物料数据!");
                //     this.sourceDataLoading = false;
                //     return;
                // }
                const response = await axios.get(this.baseURL + '/WLYayBillController/GetList', {
                    params: {
                        "user": sessionStorage["HUserName"],
                        "hmainid": hmainidVal.join(',')
                        "hmainid_hsubid": hmainidVal.join(',')
                    },
                });
                console.log('源单详情', response.data.data)
@@ -1323,18 +1323,7 @@
                if (result.count == 1) {
                    let res = result.data;
                    var newRows = [];
                    // 为每个源单行创建对应的子表行
                    // for (var materialId in materialMap) {
                    // var sourceInfos = materialMap[materialId];
                    // // 查找该物料ID对应的包装容器信息
                    // var materialInfo = null;
                    // for (var i = 0; i < res.length; i++) {
                    //     if (res[i].HMaterID == materialId) {
                    //         materialInfo = res[i];
                    //         break;
                    //     }
                    // }
                    // if (materialInfo) {
                    // 为每个源单行创建一条记录
                    for (var j = 0; j < res.length; j++) {
                        var sourceInfo = res[j];
@@ -1352,7 +1341,7 @@
                            continue;
                        }
                        // 计算相关数量
                        var qty = orginHQTY || 0;
                        var qty = res[j].物料数量 || 0;
                        var snp = res[j].托标准容器数量 || 0;
                        var mouldQty = 0;
                        if (snp > 0) {
@@ -1377,12 +1366,12 @@
                            "HUnitID": res[j].HUnitID,
                            "HMouldID": res[j].HMouldID,
                            "HPackV": res[j].托体积,
                            "HStandardQtyForMouldInPack": res[j].托数量,
                            "HStandardQtyForMouldInPack": res[j].容器数量,
                            "HMouldLength": res[j].长度,
                            "HMouldWidth": res[j].宽度,
                            "HMouldHeight": res[j].高度,
                            "HMouldFoldHeight": res[j].折叠高度,
                            "HQty": orginHQTY,
                            "HQty": res[j].物料数量,
                            "HQty_origin": orginHQTY,
                            "HMouldQty": mouldQty,
                            "HVolume": rowVolume,
@@ -1392,8 +1381,6 @@
                        });
                        this.form.HTotalVolume = this.form.HTotalVolume * 1 + rowVolume * 1
                    }
                    // }
                    // }
                    if (newRows.length === 0) {
                        this.$modal.msgError("没有可添加的新记录,可能是源单数据已存在或物料信息不完整!");
                        this.sourceDataLoading = false;