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

TQS

2023-02-02 7b983df0c9fc8b1eb99429dd37699443c62e1d9d

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

@@ -59,7 +59,7 @@

            if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
                WrkMast wrkMast = wrkMastService.selectById(station.getWrkNo());
                if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
                if (wrkMast!=null && wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
                    throw new CoolException(devpNo+"站点已有工作号");
                }