Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

野心家

2025-01-08 c688ad2d55d6a5355e0e75402177f3e7989600bc

 src/main/java/com/zy/common/service/CommonService.java

@@ -161,7 +161,7 @@
                }
            }
            //预留空库位
            if (tmp != null) {
            if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
                locMast = tmp;
                break;
            }