#
zhou zhou
2026-01-05 b4a8d50e3d97fc9e893b554a60134e4eceb012eb
src/main/webapp/views/pda/combPro.html
@@ -230,7 +230,7 @@
    }
    // 添加表格数据
    //    var matData = [];
    var matData = [];
    function addTableData(data) {
        for (var i = 0; i < data.length; i++) {
@@ -271,14 +271,15 @@
            return;
        }
        // 赋值前清空表格
//        matData = [];
       matData = [];
        tableIns.reload({data: matData});
        $.ajax({
            url: baseUrl + "/mobile/bill/query/auth",
            headers: {'token': localStorage.getItem('token')},
            data: {
                billNo: billNo
                billNo: billNo,
                mnemonic: '',
            },
            method: 'POST',
            success: function (res) {
@@ -286,9 +287,9 @@
                    if (res.data != null) {
                        addTableData(res.data);
                        // 延迟1秒后清空通知单号
                        setTimeout(function () {
                            $('#billNo').val("");
                        }, 500);
                        // setTimeout(function () {
                        //     $('#billNo').val("");
                        // }, 500);
                    }
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
@@ -377,36 +378,27 @@
            tips("请提取物料", true);
            return;
        }
        for (var i = 0; i < matData.length; i++) {
            for (var j = 0; j < sourceData.length ; j++) {
                if (matData[i].matNo == sourceData[j].matNo && matData[i].mnemonic == sourceData[j].mnemonic && matData[i].count == sourceData[j].count) {
                    // 数量提醒
                    layer.confirm('数量和剩余数量一致,确定继续组托吗?', function(){
                        $.ajax({
                            url: baseUrl + "/mobile/comb/auth/batch",
                            headers: {'token': localStorage.getItem('token')},
                            data: JSON.stringify({
                                barcode: barcode,
                                combMats: matData,
                            }),
                            contentType: 'application/json;charset=UTF-8',
                            method: 'POST',
                            async: false,
                            success: function (res) {
                                if (res.code === 200) {
                                    reset();
                                    tips("组托成功")
                                } else if (res.code === 403) {
                                    top.location.href = baseUrl + "/pda";
                                } else {
                                    tips(res.msg, true)
                                }
                            }
                        })
                    });
        $.ajax({
            url: baseUrl + "/mobile/comb/auth/batch",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                barcode: barcode,
                combMats: matData,
            }),
            contentType: 'application/json;charset=UTF-8',
            method: 'POST',
            async: false,
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("组托成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    tips(res.msg, true)
                }
            }
        }
        })
    }
    /**