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

Administrator

7 天以前 f1fdbb9fbe3614e1b9b798e0219e17e8c520e0ce

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

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -2293,6 +2293,9 @@
            order.setStatus(Integer.valueOf(param.getGroupStatus()));
            orderMapper.updateById(order);
        }
        orderDetlMapper.delete(
                new EntityWrapper<OrderDetl>().eq("order_no", param.getGroupOrderNumber())
        );

        // 2. 一一对应遍历
        List<GroupOrderConfirmParam.PackageGroupNo> pkgList = param.getPackageGroupNos();

 src/main/webapp/static/js/order/out.js

@@ -332,7 +332,7 @@
                        }
                        ,yes: function(layerIndex, layero){
                            // 立即出库按钮点击 → 先请求下拉列表
                            let loadIndex = layer.load(10);
                            let loadIndex = layer.load(2);
                            $.ajax({
                                url: baseUrl + "/getMesOrder/auth", // 你提供的接口
                                headers: {'token': localStorage.getItem('token')},
@@ -349,11 +349,14 @@
                                            success: function(layero2, index2){
                                                // 渲染下拉框
                                                let select = $(layero2).find('#batchSelectStaBox');
                                                select.empty().append(`<option value="">请选择组货单号</option>`); // 保持默认空
                                                select.empty().append(`<option value="">请选择组货单号</option>`);
                                                res.data.forEach(item => {
                                                    select.append(`<option value="${item}">${item}</option>`);
                                                });
                                                layui.form.render('select'); // 重新渲染下拉框
                                                // 注意这里 select 要加 lay-search 属性
                                                select.attr("lay-search", "");
                                                layui.form.render('select');



                                                // 确认按钮

 src/main/webapp/views/order/out.html

@@ -193,9 +193,10 @@

<script type="text/html" id="staBatchSelectDialog">
    <form class="layui-form" style="padding: 25px 50px 30px 50px;text-align: center">
        <select id="batchSelectStaBox" name="batchSta" >
            <option value="">请选择组货单号</option> <!-- 默认空值 -->
        <select id="batchSelectStaBox" name="batchSta"  lay-search>
            <option value="">请选择组货单号</option>
        </select>

        <button style="margin-top: 30px" class="layui-btn" lay-filter="staBatchSelectConfirm" lay-submit="">确定</button>
    </form>
</script>