#

LSH

2024-04-08 ddcf876e45251da902743aa095afe68a536e2217

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

@@ -1291,7 +1291,7 @@
                continue;
            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                    && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
                    && staDetl.getCanining() != null && staDetl.getCanining().equals("Y") && staDetl.getWrkNo().equals(wrkMast.getWrkNo())) {
                flag = true;
            }
            if (!flag) {
@@ -3936,7 +3936,7 @@
                                continue;
                            }
                            if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
                                if (basDevp.getEmptyMk().equals("Y")){
                                if (!basDevp.getEmptyMk().equals("Y")){
                                    continue;
                                }
                            }