Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

luxiaotao1123

2022-04-02 c61be765fe40fce1a57471a8fc8b93932c0a970c

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

@@ -43,12 +43,12 @@
    }

    @Override
    public BasDevp checkSiteStatus(Integer devpNo, boolean put) {
    public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) {
        BasDevp station = selectById(devpNo);
        if (station == null){
            throw new CoolException(devpNo+"站点不存在");
        }
        if (put) {
        if (pakin) {
            if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
                throw new CoolException(devpNo+"站点不是自动状态");
            }