Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs

tqs

2022-12-15 94e38780aaaca83dcec2935109b9399f977f3cc4

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

@@ -160,7 +160,7 @@
                    // 检测目标库位是否为空库位
                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                        if (shallowLoc.getLocType1()>=locTypeDto.getLocType1()){
                        if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
                            continue;
                        }
                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {