修改了判断空库位，查询语句的bug,和摄像头的连接

zyh

2026-01-04 c47395fe29493062a3f0bc2cf1d02a2946b20b88

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

@@ -158,11 +158,11 @@

    @Transactional
    public StartupDto getLocNoNew(Integer staDescId,Integer sourceStaNo, LocTypeDto locTypeDto) {
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("crn_err", 0).eq("in_enable", "Y"));
        if(basCrnps.size() == 0) {
            log.error("入库请求库位失败：堆垛机报警/无可用/无可入");
            throw new CoolException("入库请求库位失败：堆垛机报警/无可用/无可入");
        }
//        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("crn_err", 0).eq("in_enable", "Y"));
//        if(basCrnps.size() == 0) {
//            log.error("入库请求库位失败：堆垛机报警/无可用/无可入");
//            throw new CoolException("入库请求库位失败：堆垛机报警/无可用/无可入");
//        }

        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", 1));
        if (staDesc == null) {
@@ -170,11 +170,31 @@
            throw new CoolException("入库请求库位失败：路径不存在" + staDescId +"," + sourceStaNo);
        }

        Short locType2 = locTypeDto.getLocType2();
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("loc_type2", locType2).orderBy("lev1").orderBy("bay1").orderBy("row1"));
        if (locMast == null) {
            log.error("入库请求库位失败：无库位" + locType2);
            throw new CoolException("入库请求库位失败：无库位" + locType2);
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                .eq("loc_sts", "O")
                .eq("loc_type1", locTypeDto.getLocType1())
                .eq("loc_type2", locTypeDto.getLocType2())
                .orderBy("lev1")
                .orderBy("bay1")
                .orderBy("row1"));
        if (locMast == null && locTypeDto.getLocType1() ==1) {
            LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
                    .eq("loc_sts", "O")
                    .eq("loc_type1", locTypeDto.getLocType1() + 1)
                    .eq("loc_type2", locTypeDto.getLocType2())
                    .orderBy("lev1")
                    .orderBy("bay1")
                    .orderBy("row1"));
            if (locMast1 == null){
                log.error("入库请求库位失败：无库位" + locTypeDto.getLocType1());
                throw new CoolException("入库请求库位失败：无库位" + locTypeDto.getLocType1());
            }else {
                locMast =locMast1;
            }

        }else if (locMast ==null){
            log.error("入库请求库位失败：无库位" + locTypeDto.getLocType1());
            throw new CoolException("入库请求库位失败：无库位" + locTypeDto.getLocType1());
        }

        StartupDto startupDto = new StartupDto();