#

zhou zhou

2026-01-05 b4a8d50e3d97fc9e893b554a60134e4eceb012eb

 src/main/webapp/views/pda/combProAgv.html

@@ -87,11 +87,10 @@
               oninput="if(value.length>8)value=value.slice(0,8)" placeholder="扫码 / 输入" autocomplete="off">
    </div>
    <div class="layui-form">
        <div style="margin: 5px 1px 5px 5px; display: inline-block">
        <div style="margin: 5px 1px 5px 5px; display: none">
            <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>提取</button>
        </div>
        <div style="display: inline-block">
            工作区
            <!-- 工作区 -->
            <div class="layui-inline" style="width: 100px; margin-left: 10px">
                <select id="devpSelect">
@@ -244,7 +243,7 @@
        // 获取工作区
        function getDevp(){
            $.ajax({
                url: baseUrl+"/available/put/site",
                url: baseUrl+"/agv/put/site",
                headers: {'token': localStorage.getItem('token')},
                method: 'POST',
                async: false,
@@ -287,22 +286,26 @@

    // 添加表格数据
    function addTableData(data) {
        if (isEmpty(data.matName)){
            tips("提取失败", true);
            return;
        }
        let toPush = true;
        for (var j=0;j<matData.length;j++){
            if (data.matNo === matData[j].matNo) {
                matData[j].count = Number(matData[j].count) + Number(data.count);
                toPush  = false;
        for (var i = 0; i < data.length; i++) {
            var toPush = true;
            for (var j = 0; j < matData.length; j++) {
                if (data[i].matNo === matData[j].matNo && data[i].mnemonic === matData[j].mnemonic) {
                    matData[j].count = Number(matData[j].count) + Number(data[i].count);
                    toPush = false;
                }
            }
            if (toPush) {
                matData.push(data[i]);
                sourceData.push({
                    matNo: data[i].matNo,
                    count: data[i].count,
                    supplier: data[i].supplier,
                    mnemonic: data[i].mnemonic,
                });
            }
            tips("提取成功");
            tableIns.reload({data: matData});
        }
        if (toPush) {
            matData.push(data);
        }
        tips("提取成功");
        tableIns.reload({data: matData});
    }


@@ -321,14 +324,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) {
@@ -336,9 +340,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";
@@ -432,28 +436,28 @@
            tips("请选择工作区", true);
            return;
        }
        alert("小车关联组托完成（功能还未实现）");
//        $.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,
               agvSite: devp
           }),
           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)
               }
           }
       })
    }

    /**