Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

zyx

2023-10-31 3dd2b439ffa1eb8c3bad1fff9a71055138e0b957

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

@@ -344,6 +344,11 @@
                    break;
                }
            }

            if (locMast == null) {
                //单品找不到库位，允许尝试从混放区域中进行搜索
                locMast = getLocNoStepMixed(matNos, locTypeDto, 1);
            }
        }

        return locMast;