Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms...

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

 src/main/webapp/static/js/locMatStatus/locMatStatus.js

@@ -560,7 +560,7 @@
            }
            // 更新物料状态
            $.ajax({
                url: baseUrl+"/locDetl/getAllLocDetlData?loc_no=" + param.loc_no + "&matnr=" + param.matnr + "&matStatusFlag=" + param.matStatusFlag,
                url: baseUrl+"/locDetl/getAllLocDetlData?loc_no=" + param.loc_no + "&matnr=" + param.matnr + "&mat_status=" + param.matStatusFlag,
                headers: {'token': localStorage.getItem('token')},
                // data: JSON.stringify(param),
                dataType:'json',