#

luxiaotao1123

2021-03-05 a01a9442cb2d199bef04b6189b15864099ea63a7

#

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

@@ -49,13 +49,13 @@
    }

    @RequestMapping("/stock/out")
    @ManagerAuth(memo = "捡货")
    @ManagerAuth(memo = "拣货")
    public R stockOut(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOut(stockOutParam, getUserId());
    }

    @RequestMapping("/stock/out/print")
    @ManagerAuth(memo = "捡货单打印")
    @ManagerAuth(memo = "拣货单打印")
    public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOutPrint(stockOutParam, getUserId());
    }
@@ -88,7 +88,7 @@
    }

    @RequestMapping("/stock/out/confirm")
    @ManagerAuth(memo = "捡货确认")
    @ManagerAuth(memo = "拣货确认")
    public R stockOutConfirm(@RequestBody StockConfirmParam param) {
        return workService.stockOutComplete(param, getUserId());
    }

 src/main/webapp/static/js/custOrder/custOrder.js

@@ -181,7 +181,7 @@
        switch (obj.event) {
            // 拣货
            case 'stockOut':
                layer.confirm(data.number + ' 订单开始捡货？', {shadeClose: true}, function(){
                layer.confirm(data.number + ' 订单开始拣货？', {shadeClose: true}, function(){
                    layer.closeAll();
                    $.ajax({
                        url: baseUrl+"/work/stock/out",
@@ -196,7 +196,7 @@
                            if (res.code === 200){
                                layer.confirm(res.msg, {
                                        shadeClose: true
                                        , btn: ['打印捡货单']
                                        , btn: ['打印拣货单']
                                    }, function() {
                                        layer.closeAll();
                                        printPakouts(data.number);
@@ -246,7 +246,7 @@
                break;
            // 打印
            case 'print':
                layer.confirm('开始打印' +data.number + ' 捡货单？', {shadeClose: true}, function(){
                layer.confirm('开始打印' +data.number + ' 拣货单？', {shadeClose: true}, function(){
                    layer.closeAll();
                    printPakouts(data.number);
                })
@@ -255,7 +255,7 @@
        }
    });

    // 打印捡货单
    // 打印拣货单
    function printPakouts(docNumber) {
        $.ajax({
            url: baseUrl+"/work/stock/out/print",

 src/main/webapp/views/custOrder/custOrder.html

@@ -41,7 +41,7 @@

<script type="text/html" id="operate">
    {{#if (d.status == 1){ }}
        <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">捡货</a>
        <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">拣货</a>
    {{# } }}
    {{#if (d.status == 2){ }}
        <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">打印</a>
@@ -66,7 +66,7 @@
    <div id="print-header" style="margin-bottom: 20px">
        <div style="text-align: center">
            <div style="text-align: center;margin-bottom: 10px">
                <span style="font-family: 宋体"> 捡货单 </span>
                <span style="font-family: 宋体"> 拣货单 </span>
            </div>

            <img class="template-code template-qrcode" src="{{data.barcodeUrl}}" style="width: 80%">
@@ -77,10 +77,10 @@
        </div>
        <div style="margin-top: 10px">
            <div style="float: left;width: 50%; text-align: left">
                <span style="font-size: xx-small;font-family: 宋体">捡货数量：{{data.total}}</span>
                <span style="font-size: xx-small;font-family: 宋体">拣货数量：{{data.total}}</span>
            </div>
            <div style="float: left; width: 50%; text-align: right">
                <span style="font-size: xx-small;font-family: 宋体">捡货人：{{data.workerName}}</span>
                <span style="font-size: xx-small;font-family: 宋体">拣货人：{{data.workerName}}</span>
            </div>
            <div style="clear:both;"></div>
        </div>

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

@@ -174,7 +174,7 @@
        <div class="layui-col-xs12 layui-col-sm6 layui-col-md3">
            <div class="layui-card">
                <div class="layui-card-header">
                    捡货单量<span class="layui-badge layui-badge-red pull-right">月</span>
                    拣货单量<span class="layui-badge layui-badge-red pull-right">月</span>
                </div>
                <div class="layui-card-body">
                    <p class="lay-big-font"><span id="pakoutQtyMonth">0</span></p>

 src/main/webapp/views/pda/index.html

@@ -76,7 +76,7 @@
<ul class="nav">
    <li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">组托</a></li>
    <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">上架</a></li>
    <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">捡货</a></li>
    <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">拣货</a></li>
</ul>

<!-- 主体内容 -->

 src/main/webapp/views/pda/stockOut.html

@@ -171,7 +171,7 @@
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("捡货成功")
                    tips("拣货成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {