Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-16 4f7488aa49ab6420d25a6f7883ffebccbec9b73a

 src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java

@@ -56,11 +56,11 @@
                );
                if (wrkMasts.size() > 0) continue;

//                //暂停移库
//                BasCrnp crnp = basCrnpService.selectById(crnNo);
//                if(!Cools.isEmpty(crnp) && crnp.getOrigin()!=0){
//                    continue;
//                }
                //暂停移库
                BasCrnp crnp = basCrnpService.selectById(crnNo);
                if(!Cools.isEmpty(crnp) && crnp.getTankQty()==0){
                    continue;
                }

                List<LocMast> locMasts = locMastService.queryShallowLocFMast(crnNo);
                if (null == locMasts) continue;