#

luxiaotao1123

2021-03-06 db4180c88d1aa3b410b719ac2710e70eeb9431d3

#

 src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java

@@ -69,7 +69,7 @@
        for (int i=0;i<combList.size();i++) {
            Object create_time = combList.get(i).get("create_time");
            combList.get(i).put("time", String.valueOf(create_time).substring(5, 16));
            combList.get(i).put("active", i<3?"active":"");
            combList.get(i).put("active", String.valueOf(combList.get(i).get("io_status")).equals("4")?"":"active");
        }
        // 拣货单
        List<Map<String, Object>> pakoutList = jdbcTemplate.queryForList("select top 5 * from man_pakout where 1=1 order by create_time desc");

 src/main/webapp/views/home/console.html

@@ -265,7 +265,12 @@
            <div class="layui-row layui-col-space15">
                <div class="layui-col-md6">
                    <div class="layui-card">
                        <div class="layui-card-header">组托动态</div>
                        <div class="layui-card-header">
                            组托动态
                            <span class="icon-text pull-right" lay-tips="蓝色代表未入库" lay-direction="4" lay-offset="5px,5px">
                                <i class="layui-icon layui-icon-loading-1 layui-anim layui-anim-rotate layui-anim-loop"></i>
                            </span>
                        </div>
                        <div class="layui-card-body dynamic-card-body mini-bar" style="height: 265px;">
                            <ul id="combList" class="layui-timeline layui-timeline-dynamic">
                            </ul>
@@ -485,8 +490,10 @@
        <li class="layui-timeline-item">
            <i class="layui-icon layui-timeline-axis {{active}}"></i>
            <div class="layui-timeline-content layui-text">
                <div class="layui-timeline-title">{{matnr}} 并板 {{zpallet}} 数量：{{anfme}}
                <span class="pull-right">{{time}} </span></div>
                <div class="layui-timeline-title">
                    <span title="{{maktx}}">{{matnr}}</span> 并板 <span>{{zpallet}}</span> 托盘， 数量：{{anfme}}
                    <span class="pull-right">{{time}} </span>
                </div>
            </div>
        </li>
    {{/each}}