Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-25 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078

 src/main/webapp/views/pack/pack.html

@@ -18,9 +18,19 @@
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label">条码:</label>
                        <label class="layui-form-label">条&emsp;码:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="barcode" placeholder="请输入..." autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <label class="layui-form-label">状&emsp;态:</label>
                        <div class="layui-input-inline">
                            <select name="settle">
                                <option value="">选择状态</option>
                                <option value="1">未处理</option>
                                <option value="2">下线帮托</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
@@ -87,15 +97,15 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">商品编号: </label>
                    <label class="layui-form-label">物料号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入商品编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">批号: </label>
                    <label class="layui-form-label">订单号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="batch" placeholder="请输入批号">
                        <input class="layui-input" name="batch" placeholder="请输入序列码">
                    </div>
                </div>
                <div class="layui-form-item">