mrzhssss
2022-05-06 e67503fd8cc820ff14fa3398a9a7e072d4964444
新增导出功能
6个文件已修改
48 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakin/pakin.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakout/pakout.js 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/order/order.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakin/pakin.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -359,6 +359,7 @@
        for (Pakout pakout : pakouts) {
            total = pakout.getAnfme() + total;
        }
        StoPrintVo vo = new StoPrintVo();
        vo.setDocNum(param.getOrderNo());
        vo.setList(pakouts);
src/main/resources/application.yml
@@ -14,7 +14,7 @@
    #    password: xltys1995
    # sql-server
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.1.56:1433;databasename=htasrs
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=htasrs
    username: sa
    password: sa@123
  mvc:
src/main/webapp/static/js/pakin/pakin.js
@@ -17,7 +17,7 @@
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        toolbar: '#other',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
@@ -90,6 +90,7 @@
    // 监听头工具栏事件
    table.on('toolbar(pakin)', function (obj) {
        console.log(obj)
        var checkStatus = table.checkStatus(obj.config.id);
        switch(obj.event) {
            case 'addData':
@@ -105,7 +106,7 @@
               });
               del(ids);
               break;
            case 'exportData':
            case 'otherExportData':
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
src/main/webapp/static/js/pakout/pakout.js
@@ -114,16 +114,16 @@
                if (data.length === 0){
                    layer.msg('请勾选打印记录', {icon: 9});
                } else {
                    layer.msg('权限不足、请联系管理员', {icon: 3});
                    // console.log(data);
                    // layer.confirm(res.msg, {
                    //         shadeClose: true
                    //         , btn: ['打印拣货单']
                    //     }, function() {
                    //         layer.closeAll();
                    //         printPakouts(data.number);
                    //     }
                    // )
                    // layer.msg('权限不足、请联系管理员', {icon: 3});
                    console.log(data);
                    layer.confirm(res.msg, {
                            shadeClose: true
                            , btn: ['打印拣货单']
                        }, function() {
                            layer.closeAll();
                            printPakouts(data.number);
                        }
                    )
                }
                break;
            // 导出
src/main/webapp/views/order/order.html
@@ -117,9 +117,9 @@
    {{#if (d.settle == 1){ }}
    <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">拣货单</a>
    {{# } }}
    {{#if (d.settle == 2 || d.settle == 4){ }}
<!--    {{#if (d.settle == 2 || d.settle == 4){ }}-->
    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">打印</a>
    {{# } }}
<!--    {{# } }}-->
</script>
<script type="text/html" id="settleTpl">
src/main/webapp/views/pakin/pakin.html
@@ -54,12 +54,24 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
<!--        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
</script>
<script type="text/html" id="other">
    <div class="layui-btn-container">
        <!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
        <!--        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-other" lay-event="otherExportData">导出</button>
    </div>
</script>
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>