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

whycq

2024-07-03 7d7bb8298935b1002ee2770fdf00fc382a53864c

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

@@ -108,15 +108,15 @@
//                return false;
//            }

            if ("N".equals(crnp.getInEnable())) {
                log.error("{}号堆垛机不可入", crnNo);
                return false;
            }
//            if ("N".equals(crnp.getInEnable())) {
//                log.error("{}号堆垛机不可入", crnNo);
//                return false;
//            }
        } else {
            if ("N".equals(crnp.getOutEnable())) {
                log.error("{}号堆垛机不可出", crnNo);
                return false;
            }
//            if ("N".equals(crnp.getOutEnable())) {
//                log.error("{}号堆垛机不可出", crnNo);
//                return false;
//            }
        }

        return true;