#
luxiaotao1123
2021-03-26 641e3e8729273d55f2643a6a1693061bf86ce9ab
#
3个文件已修改
29 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/safeSto/safeSto.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/home/console.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -98,21 +98,28 @@
            }
        }
        // 安全库存警告
        List<Map<String, Object>> safeQuaList = jdbcTemplate.queryForList("select \n" +
        List<Map<String, Object>> safeQuaList = jdbcTemplate.queryForList("select\n" +
                "top 5\n" +
                "mp.node_id,\n" +
                "mp.node_name,\n" +
                "mp.matnr,\n" +
                "mp.maktx,\n" +
                "mp.safe_qua,\n" +
                "mld.anfme,\n" +
                "(mp.safe_qua - isnull(mld.anfme, 0)) as dValue\n" +
                "ISNULL(ls.amount, 0) as amount,\n" +
                "(mp.safe_qua - isnull(ls.amount, 0)) as dValue\n" +
                "from man_prior mp\n" +
                "left join \n" +
                "(select SUM(anfme) as anfme, node_id from man_loc_detl where 1=1 group by node_id) mld on mp.node_id = mld.node_id\n" +
                "where 1=1 \n" +
                "and mp.safe_qua > mld.anfme or mld.anfme is null\n" +
                "order by (mp.safe_qua - isnull(mld.anfme, 0)) desc");
                "left join\n" +
                "(\n" +
                "    select\n" +
                "    node_id,\n" +
                "    matnr,\n" +
                "    sum(anfme) as amount\n" +
                "    from man_loc_detl\n" +
                "    group by node_id, matnr\n" +
                ") as ls on ls.node_id = mp.node_id and ls.matnr = mp.matnr\n" +
                "where 1=1\n" +
                "and mp.safe_qua > ls.amount or ls.amount is null\n" +
                "order by (mp.safe_qua - isnull(ls.amount, 0)) desc");
        for (int i=0;i<safeQuaList.size();i++) {
            safeQuaList.get(i).put("no", i+1);
            if (Cools.isEmpty(safeQuaList.get(i).get("dValue"))){
src/main/webapp/static/js/safeSto/safeSto.js
@@ -105,7 +105,6 @@
        switch (obj.event) {
            // 补仓
            case 'allot':
                console.log(data)
                layer.confirm(data.node_name +'补仓 '+ data.matnr + ',数量:' + (data.safe_qua - data.amount), function(){
                    var index = layer.load(1, {shade: [0.1,'#000']});
                    $.ajax({
src/main/webapp/views/home/console.html
@@ -369,7 +369,10 @@
                </div>
            </div>
            <div class="layui-card">
                <div class="layui-card-header">安全库存警告</div>
                <div class="layui-card-header">
                    安全库存警告
                    <button class="layui-btn layui-btn-primary layui-btn-xs" style="float: right; margin: 11px 5px 0 0" lay-href="safeSto/safeSto.html?resourceId=30466" lay-text="安全库存">查看更多</button>
                </div>
                <div class="layui-card-body" id="safeQuaList">
                </div>
            </div>