#

luxiaotao1123

2021-03-06 5aefe8c055c300e035bad35d7c65d25f1efd6794

#

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

@@ -7,7 +7,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.WrkSts;
import zy.cloud.wms.manager.service.WrkStsService;

import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
@@ -19,6 +23,8 @@

    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private WrkStsService wrkStsService;

    /**
     * 当天数据：select * from tableName where datediff(day, 字段名,getdate())=0
@@ -56,4 +62,45 @@
        );
    }

    @RequestMapping(value = "/body/auth")
    public R body() {
        // 组托
        List<Map<String, Object>> combList = jdbcTemplate.queryForList("select top 10 * from man_comb where 1=1 order by create_time desc");
        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(11, 16));
            combList.get(i).put("active", i<3?"active":"");
        }
        // 拣货单
        List<Map<String, Object>> pakoutList = jdbcTemplate.queryForList("select top 5 * from man_pakout where 1=1 order by create_time desc");
        for (int i=0;i<pakoutList.size();i++) {
            pakoutList.get(i).put("no", i+1);
            String wrk_sts = String.valueOf(pakoutList.get(i).get("wrk_sts"));
            switch (wrk_sts) {
                case "1":
                    pakoutList.get(i).put("style", "text-warning");
                    break;
                case "2":
                    pakoutList.get(i).put("style", "text-danger");
                    break;
                case "3":
                    pakoutList.get(i).put("style", "text-success");
                    break;
                default:
                    pakoutList.get(i).put("style", "text-info");
                    break;
            }
            WrkSts wrkSts = wrkStsService.selectById(Integer.parseInt(wrk_sts));
            if (null != wrkSts) {
                pakoutList.get(i).put("wrkStsName", wrkSts.getStsName());
            }
        }


        return R.ok().add(Cools
                .add("combList", combList) // 组托最新动态
                .add("pakoutList", pakoutList) // 最新拣货单
        );
    }

}

 src/main/resources/application.yml

@@ -14,7 +14,7 @@
#    password: xltys1995
    # sql-server
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=htasrs
    url: jdbc:sqlserver://192.168.2.250:1433;databasename=htasrs
    username: sa
    password: sa@123
  mvc:

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

@@ -263,86 +263,16 @@
            <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">组托动态</div>
                        <div class="layui-card-body dynamic-card-body mini-bar" style="height: 265px;">
                            <ul class="layui-timeline layui-timeline-dynamic">
                                <li class="layui-timeline-item">
                                    <i class="layui-icon layui-timeline-axis"></i>
                                    <div class="layui-timeline-content layui-text">
                                        <div class="layui-timeline-title">研发经理 指派了任务 陪客户吃饭
                                            <span class="pull-right">14:30 </span></div>
                                    </div>
                                </li>
                                <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">测试组长 提交了bug 代码错误
                                            <span class="pull-right">14:00 </span></div>
                                    </div>
                                </li>
                                <li class="layui-timeline-item">
                                    <i class="layui-icon layui-timeline-axis"></i>
                                    <div class="layui-timeline-content layui-text">
                                        <div class="layui-timeline-title">管理员 登录了系统
                                            <span class="pull-right">13:30 </span></div>
                                    </div>
                                </li>
                                <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">开发一 解决了bug 代码错误
                                            <span class="pull-right">11:30 </span></div>
                                    </div>
                                </li>
                                <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">测试一 创建了用例 用户登录
                                            <span class="pull-right">11:00 </span></div>
                                    </div>
                                </li>
                                <li class="layui-timeline-item">
                                    <i class="layui-icon layui-timeline-axis"></i>
                                    <div class="layui-timeline-content layui-text">
                                        <div class="layui-timeline-title">开发二 退出了系统
                                            <span class="pull-right">10:30 </span></div>
                                    </div>
                                </li>
                                <li class="layui-timeline-item">
                                    <i class="layui-icon layui-timeline-axis"></i>
                                    <div class="layui-timeline-content layui-text">
                                        <div class="layui-timeline-title">研发经理 指派了任务 修改大bug
                                            <span class="pull-right">10:00 </span></div>
                                    </div>
                                </li>
                                <li class="layui-timeline-item">
                                    <i class="layui-icon layui-timeline-axis"></i>
                                    <div class="layui-timeline-content layui-text">
                                        <div class="layui-timeline-title">研发经理 指派了任务 修改小bug
                                            <span class="pull-right">09:30 </span></div>
                                    </div>
                                </li>
                                <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">研发经理 指派了任务 修改小bug
                                            <span class="pull-right">09:00 </span></div>
                                    </div>
                                </li>
                                <li class="layui-timeline-item">
                                    <i class="layui-icon layui-timeline-axis"></i>
                                    <div class="layui-timeline-content layui-text">
                                        <div class="layui-timeline-title">管理员 登录了系统
                                            <span class="pull-right">08:30 </span></div>
                                    </div>
                                </li>
                            <ul id="combList" class="layui-timeline layui-timeline-dynamic">
                            </ul>
                        </div>
                    </div>
                </div>
                <div class="layui-col-md6">
                    <div class="layui-card">
                        <div class="layui-card-header">我的任务</div>
                        <div class="layui-card-header">最新拣货</div>
                        <div class="layui-card-body">
                            <table class="layui-table" lay-skin="line">
                                <colgroup>
@@ -352,51 +282,12 @@
                                </colgroup>
                                <thead>
                                <tr>
                                    <td align="center">优先级</td>
                                    <td>任务名称</td>
                                    <td align="center">数量</td>
                                    <td>拣货信息</td>
                                    <td align="center">状态</td>
                                </tr>
                                </thead>
                                <tbody>
                                <tr>
                                    <td align="center">
                                        <span class="layui-badge layui-badge-red layui-badge-priority">1</span>
                                    </td>
                                    <td><span class="layui-text"><a>参加股东大会</a></span></td>
                                    <td align="center"><span class="text-warning">未开始</span></td>
                                </tr>
                                <tr>
                                    <td align="center">
                                        <span class="layui-badge layui-badge-yellow layui-badge-priority">2</span>
                                    </td>
                                    <td><span class="layui-text"><a>陪客户吃饭</a></span></td>
                                    <td align="center"><span class="text-warning">未开始</span></td>
                                </tr>
                                <tr>
                                    <td align="center">
                                        <span class="layui-badge layui-badge-blue layui-badge-priority">3</span>
                                    </td>
                                    <td><span class="layui-text"><a>项目开发</a></span></td>
                                    <td align="center"><span class="text-success">进行中</span></td>
                                </tr>
                                <tr>
                                    <td align="center">
                                        <span class="layui-badge layui-badge-blue layui-badge-priority">3</span>
                                    </td>
                                    <td><span class="layui-text"><a>修改大bug</a></span></td>
                                    <td align="center">
                                        <del class="text-muted">已完成</del>
                                    </td>
                                </tr>
                                <tr>
                                    <td align="center">
                                        <span class="layui-badge layui-badge-blue layui-badge-priority">3</span>
                                    </td>
                                    <td><span class="layui-text"><a>修改小bug</a></span></td>
                                    <td align="center">
                                        <del class="text-muted">已完成</del>
                                    </td>
                                </tr>
                                <tbody id="pakoutList">
                                </tbody>
                            </table>
                        </div>
@@ -601,6 +492,7 @@
<!-- js部分 -->
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script>
    layui.config({
        base: '../../static/layuiadmin/' //静态资源所在路径
@@ -656,7 +548,62 @@
            })
        }

        getBodyData();

        // 头
        function getBodyData() {
            $.ajax({
                url: baseUrl + "/console/body/auth",
                headers: {'token': localStorage.getItem('token')},
                method: 'GET',
                success: function (res) {
                    if (res.code === 200) {
                        // 组托
                        var tpl1 = $('#combTpl').html();
                        var template1 = Handlebars.compile(tpl1);
                        var html1 = template1(res.data);
                        $('#combList').append(html1);
                        // 订单
                        var tpl2 = $('#orderTpl').html();
                        var template2 = Handlebars.compile(tpl2);
                        var html2 = template2(res.data);
                        $('#pakoutList').append(html2);
                    } else if (res.code === 403) {
                        top.location.href = baseUrl + "/";
                    } else {
                        layer.msg(res.msg, {icon: 2})
                    }
                }
            })
        }

    });
</script>
<script type="text/template" id="combTpl">
    {{#each combList}}
        <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>
        </li>
    {{/each}}
</script>
<script type="text/template" id="orderTpl">
    {{#each pakoutList}}
        <tr>
            <td align="center">
                <span class="layui-badge layui-badge-red layui-badge-priority">{{anfme}}</span>
            </td>
            <td><span class="layui-text"><a style="cursor: initial">{{loc_no}} <span style="color: #4c4c4c">出库：</span> {{matnr}}</a></span></td>
            <td align="center">
                <span class="{{style}}">
                    {{wrkStsName}}
                </span>
            </td>
        </tr>
    {{/each}}
</script>
</body>
</html>