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

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

 src/main/java/com/zy/asrs/controller/LocDetlController.java

@@ -72,7 +72,7 @@
        if (Cools.isEmpty(param.get("supplier"))) {
            param.remove("supplier");
        }
        /* 生成单号为空，删除生成单号warehouse */
        /* 生产单号为空，删除生产单号warehouse */
        if (Cools.isEmpty(param.get("warehouse"))) {
            param.remove("warehouse");
        }