Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms

luxiaotao1123

2021-08-12 107d3c8bfe096b7d26869f13c1866e39cbd97c24

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

@@ -151,34 +151,36 @@

    // 拣货确认
    function pakoutConfirm() {
        if (pakoutData == null || pakoutData.length === 0) {
            tips("请确认单据编号！", true);
            return;
        }
        var docNum = pakoutData[0].docNum;
        if (isEmpty(docNum)) {
            tips("请确认单据编号！", true);
            return;
        }
        $.ajax({
            url: baseUrl+"/work/stock/out/confirm",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                number: docNum
            }),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    reset();
                    tips("拣货成功")
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    tips(res.msg, true)
                }
        layer.confirm('确认拣货完成？', {shadeClose: true}, function(){
            if (pakoutData == null || pakoutData.length === 0) {
                tips("请确认单据编号！", true);
                return;
            }
        })
            var docNum = pakoutData[0].docNum;
            if (isEmpty(docNum)) {
                tips("请确认单据编号！", true);
                return;
            }
            $.ajax({
                url: baseUrl+"/work/stock/out/confirm",
                headers: {'token': localStorage.getItem('token')},
                data: JSON.stringify({
                    orderNo: docNum
                }),
                contentType:'application/json;charset=UTF-8',
                method: 'POST',
                success: function (res) {
                    if (res.code === 200) {
                        reset();
                        tips("拣货成功")
                    } else if (res.code === 403) {
                        top.location.href = baseUrl + "/pda";
                    } else {
                        tips(res.msg, true)
                    }
                }
            })
        });
    }

    // 重置