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

zyx

2023-10-19 668e40d51e654104287a3f63c7fd856657a35a11

 src/main/webapp/views/agvBasDevpVisualized/basDevp.html

@@ -35,7 +35,7 @@

    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="searchByStaion" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="searchByStaion">搜索</button>
        <button id="checkAll" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="checkAll">全选</button>
        <button id="uncheckAll" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="uncheckAll">反选</button>
        <button id="start" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="start">启动入库</button>
@@ -61,15 +61,16 @@
<!--                        <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}">拣料入库</button>-->
<!--                    </div>-->

                    {{#if agvWrkDetl}}
                    {{#if containerMoveOutFlag}}
                    <div style=" padding-bottom: 20px">

                        <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="containerMoveOut">容器离场</button>
                        <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">拣料入库</button>

                    </div>
                    {{/if}}

                    {{#if pickInFlag}}
                    <div style=" padding-bottom: 20px">
                        <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">拣料/盘点入库</button>
                    </div>
                    {{/if}}
                    <div>
                        工作站编码：{{devNo}} </br>
                        站点状态：{{locSts$}}
@@ -80,7 +81,7 @@
                        {{#if agvWaitPakin.batch}}
                        序列码：{{agvWaitPakin.batch}} </br>
                        {{/if}}
                        托盘码：{{agvWaitPakin.zpallet}} </br>
                        料箱码：{{agvWaitPakin.suppCode}} </br>
                        数量：{{agvWaitPakin.anfme}}
                    </div>
                    {{/if}}
@@ -97,7 +98,7 @@
                        {{#if agvWrkDetl.batch}}
                        序列码：{{agvWrkDetl.batch}} </br>
                        {{/if}}
                        托盘码：{{agvWrkDetl.zpallet}} </br>
                        料箱码：{{agvWaitPakin.suppCode}} </br>
                        数量：{{agvWrkDetl.anfme}}
                    </div>
                    {{/if}}
@@ -156,11 +157,11 @@
        });

        // 搜索
        form.on('submit(search)', function (data) {
            param = null;
            param = {'stationCode' : $('#rowSelect').val()};
            loadData(param);
        });
        // form.on('submit(search)', function (data) {
        //     param = null;
        //     param = {'stationCode' : $('#rowSelect').val()};
        //     loadData(param);
        // });

        //全选
        form.on('submit(checkAll)', function () {
@@ -168,6 +169,14 @@
            for (var i = 0; i < cks.length; i++) {
                cks[i].checked = true;
            }
        });

        //搜索
        form.on('submit(searchByStaion)', function () {
            console.log("search.....")
            param = null;
            param = {'stationCode' : $('#rowSelect').val()};
            loadData(param);
        });

        //反选
@@ -204,7 +213,7 @@

        });

        //拣料入库
        //拣料/盘点入库
        form.on('submit(pickIn)', function () {
            var devNoList = [];
            devNoList.push(this.value);