Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas

wang..123

2022-03-25 f4f3c04ba37cec6739370c4aa0b9622493de8a23

 src/main/webapp/static/js/wave/wave.js

@@ -181,7 +181,7 @@
                        }
                        ,yes: function(index, layero){
                            //按钮【马上拣货】的回调
                            stockOut(res.data);
                            stockOut(res.data,data);
                        }
                        ,btn2: function(index, layero){
                            //按钮【稍后处理】的回调
@@ -198,7 +198,7 @@


    }
    function stockOut(mData){
    function stockOut(mData, data){

        console.log(mData);
        layer.confirm('确定生成该波次的拣货单？', {
@@ -216,6 +216,7 @@
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.closeAll();
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
@@ -343,7 +344,7 @@

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
        layer.confirm('确定要撤销选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {