Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

zhang

2025-08-01 b1cbb59d39cea44d35110d95e54fbd86d4a12e13

 src/main/webapp/views/pakStore/locDetlQuery.html

@@ -64,12 +64,32 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="matnr" placeholder="商品编号"  autocomplete="off">
                <input class="layui-input" type="text" name="brand" placeholder="包装组号"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="maktx" placeholder="物料描述" autocomplete="off">
                <input class="layui-input" type="text" name="model" placeholder="卷号" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="unit" placeholder="箱号" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="matnr" placeholder="空箱" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="batch" placeholder="尺寸" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="memo" placeholder="备注" autocomplete="off">
            </div>
        </div>
        <!-- 日期范围 -->
@@ -126,6 +146,7 @@
        var form = layui.form;
        var admin = layui.admin;
        var tableMerge = layui.tableMerge;
        var dataSource = []

        // 数据渲染
        locDetlTableIns = table.render({
@@ -144,6 +165,7 @@
                pageSize: 'limit'
            },
            parseData: function (res) {
                dataSource = res.data.records
                return {
                    'code': res.code,
                    'msg': res.msg,
@@ -164,15 +186,44 @@

        // 监听头工具栏事件
        table.on('toolbar(stockOut)', function (obj) {

            var checkStatus = table.checkStatus(obj.config.id);
            var data = checkStatus.data;
            var dataList = []
            for (var j = 0; j < data.length; j++) {
                var locno = data[j].locNo
                for(var i = 0;i < dataSource.length; i++) {
                    if (dataSource[i].locNo === locno) {
                        dataList.push(dataSource[i])
                    }
                }
            }

            switch(obj.event) {
                case 'confirm':
                    if (data.length === 0){
                        layer.msg("请选择数据");
                        return;
                    }
                    parent.addTableData(data);

                    const reqDate = [...new Set(dataList.map(obj => obj.brand))]
                    $.ajax({
                        url: baseUrl+"/getLocDateByLocNo",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(reqDate),
                        contentType:'application/json;charset=UTF-8',
                        dataType:'json',
                        method: 'POST',
                        success: function (res) {
                            if (res.code === 200){
                                parent.addTableData(res.data);
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                    break;
            }
        });