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

whycq

2023-07-08 f107eaf4d1857d2230a5bc6983e4beb7fb811aa1

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -336,8 +336,6 @@
                            staNo = 103;
                            if (basDevps1.size()!=0 && basDevps2.size()!=0){
                                continue;
                            } else if (basDevps1.size()!=0){
                                staNo = 203;
                            }

                            List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType((int)staNo);
@@ -360,8 +358,6 @@
                            staNo = 203;
                            if (basDevps1.size()!=0 && basDevps2.size()!=0){
                                continue;
                            } else if (basDevps2.size()!=0){
                                staNo = 103;
                            }

//                            if (basDevps2.size()!=0){
@@ -4401,7 +4397,7 @@

            if (null == loc) {
                News.error("深库位出库 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());
                return;
//                return;
//                throw new CoolException("深库位出库 --- 浅库位阻塞异常！ 待移转浅库位：" + shallowLoc.getLocNo());
            }