#

Junjie

2025-02-14 ac4341ea6b66ae02427d39d35f41d42d78b2eb2e

 zy-asrs-admin/src/components/orderOut/orderOutMergePreview/stockOut.vue

@@ -165,7 +165,7 @@
        list: tableData.value
    };

    post('/api/out/orderOut/merge', requestParam).then((resp) => {
    post('/api/out/orderOut/merge/wave', requestParam).then((resp) => {
        let result = resp.data;
        if (result.code == 200) {
            message.success(formatMessage('page.add.success', '出库成功'));
@@ -207,21 +207,11 @@
            let idx = 0;
            let colSpan = []
            tmp.forEach((item) => {
                item.locs.forEach((val) => {
                    let dataTmp = JSON.parse(JSON.stringify(item));
                    dataTmp.locId = val.locId;
                    dataTmp.locNo = val.locNo;
                    dataTmp.locDetlId = val.locDetlId;
                    dataTmp.anfme = val.anfme;
                    dataTmp.key = idx;
                    dataTmp.operationPort = defaultOperationPort;

                    tableDataTmp.push(dataTmp);
                })

                let count = item.locs.length;
                if (item.anfme > 0) {

                if (item.locs.length == 0) {
                    let dataTmp = JSON.parse(JSON.stringify(item));

                    dataTmp.locId = null;
                    dataTmp.locNo = null;
                    dataTmp.locDetlId = null;
@@ -231,9 +221,47 @@

                    tableDataTmp.push(dataTmp);
                    count++;
                } else {
                    let isused = item.anfme;
                    console.log(isused);

                    for (let i = 0; i < item.locs.length; i++) {
                        if (isused == 0) {
                            break;
                        }
                        const val = item.locs[i];
                        let dataTmp = JSON.parse(JSON.stringify(item));
                        let anfme = isused - val.anfme > 0 ? val.anfme : isused;
                        isused -= anfme;

                        dataTmp.locId = val.locId;
                        dataTmp.locNo = val.locNo;
                        dataTmp.locDetlId = val.locDetlId;
                        dataTmp.anfme = anfme;
                        dataTmp.key = idx;
                        dataTmp.operationPort = defaultOperationPort;

                        tableDataTmp.push(dataTmp);
                    }

                    console.log(tableDataTmp);
                    

                    if (isused > 0) {
                        let dataTmp = JSON.parse(JSON.stringify(item));
                        dataTmp.locId = null;
                        dataTmp.locNo = null;
                        dataTmp.locDetlId = null;
                        dataTmp.anfme = isused;
                        dataTmp.key = idx;
                        dataTmp.operationPort = defaultOperationPort;

                        tableDataTmp.push(dataTmp);
                        count++;
                    }
                }

                colSpan[idx] = count
                colSpan[idx] = count;
                idx += count;
            })