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

18516761980

2022-08-21 133c3145d6feb59a1b4c29322097ba8772d2da00

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

 src/main/webapp/static/js/common.js

@@ -187,7 +187,7 @@
    // ,{field: 'tagId$', align: 'center',title: '所属归类'}
    ,{field: 'maktx', align: 'center',title: '商品名称', width: 200}
    // ,{field: 'name', align: 'center',title: '别名'}
    ,{field: 'specs', align: 'center',title: '配置'}
    ,{field: 'specs', align: 'center',title: '规格'}
    ,{field: 'model', align: 'center',title: '代码', hide: false}
    ,{field: 'color', align: 'center',title: '颜色', hide: true}
    ,{field: 'brand', align: 'center',title: '品牌', hide: true}
@@ -229,7 +229,7 @@
    ,{field: 'anfme', align: 'center',title: '数量'}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}

    ,{field: 'specs', align: 'center',title: '配置'}
    ,{field: 'specs', align: 'center',title: '规格'}
    ,{field: 'model', align: 'center',title: '代码', hide: false}
    ,{field: 'color', align: 'center',title: '颜色', hide: true}
    ,{field: 'brand', align: 'center',title: '品牌', hide: true}

 src/main/webapp/static/js/mat/mat.js

@@ -255,6 +255,7 @@
                }
                // 表单提交事件
                form.on('submit(editSubmit)', function (data) {
                    console.log(data)
                    data.field.tagId = insXmSel.getValue('valueStr');
                    if (isEmpty(data.field.tagId)) {
                        layer.msg('分类不能为空', {icon: 2});

 src/main/webapp/static/js/pakStore/pakStore.js

@@ -84,6 +84,7 @@
                    layer.msg("请选择入库站", {icon: 2});
                    return;
                }
                console.log(matCodeData)
                $.ajax({
                    url: baseUrl+"/full/store/put/start",
                    headers: {'token': localStorage.getItem('token')},

 src/main/webapp/views/mat/mat.html

@@ -224,9 +224,9 @@
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">代码</label>
                    <label class="layui-form-label">规格</label>
                    <div class="layui-input-block">
                        <input name="model" type="number" placeholder="请输入代码" class="layui-input">
                        <input name="specs" placeholder="请输入代码" class="layui-input">
                    </div>
                </div>


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

@@ -102,7 +102,7 @@
                <select id="putSiteSelect" lay-verify="required">
                    <option value="">请选择站点</option>
                </select>
                <!-- 2.启动出库 -->
                <!-- 2.启动入库 -->
                <button class="layui-btn layui-btn-normal layui-btn-lg" id="btn-comb" lay-event="comb" style="">启动入库</button>
            </div>
        </div>