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

1

昨天 7b6329313ca3a5e6ff96246eeaf96f839df7760b

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

 src/main/webapp/static/js/basArmMast/basArmMast.js

@@ -40,6 +40,7 @@
            ,{field: 'supplier', align: 'center',title: '货源',hide: false}
            ,{field: 'ctns', align: 'center',title: '箱数',hide: true}
            ,{field: 'createTime', align: 'center',title: '时间戳',hide: true}
            ,{field: 'barcode', align: 'center',title: '托盘码',hide: false}
            ,{field: 'armError', align: 'center',title: '异常代码',hide: true}
            ,{field: 'armMsg', align: 'center',title: '异常信息',hide: true}


 src/main/webapp/static/js/basArmMastLog/basArmMastLog.js

@@ -40,6 +40,7 @@
            ,{field: 'supplier', align: 'center',title: '货源',hide: false}
            ,{field: 'ctns', align: 'center',title: '箱数',hide: true}
            ,{field: 'createTime', align: 'center',title: '时间戳',hide: true}
            ,{field: 'barcode', align: 'center',title: '托盘码',hide: false}
            ,{field: 'armError', align: 'center',title: '异常代码',hide: true}
            ,{field: 'armMsg', align: 'center',title: '异常信息',hide: true}


 src/main/webapp/views/basArmMast/basArmMast.html

@@ -82,6 +82,11 @@
                            <input class="layui-input" type="text" name="binding_tags" placeholder="分拣绑定标记" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="barcode" placeholder="托盘码" autocomplete="off">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="condition" placeholder="请输入" autocomplete="off">-->
@@ -234,6 +239,12 @@
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">托盘码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="barcode" placeholder="请输入托盘码" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">异常代码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="armError" placeholder="请输入异常代码">

 src/main/webapp/views/basArmMastLog/basArmMastLog.html

@@ -17,11 +17,11 @@
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
<!--                    <div class="layui-inline">-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="arm_no" placeholder="机械臂编号" autocomplete="off">
@@ -82,6 +82,11 @@
                            <input class="layui-input" type="text" name="binding_tags" placeholder="分拣绑定标记" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="barcode" placeholder="托盘码" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索