Merge branch 'ynwcs' of http://47.97.1.152:5880/r/zy-wcs into ynwcs

luxiaotao1123

2022-11-30 03991cb0fed2b67f327f7e242988e7a2a06d8238

Merge branch 'ynwcs' of http://47.97.1.152:5880/r/zy-wcs into ynwcs

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

@@ -1327,6 +1327,7 @@
            SteProtocol steProtocol = steThread.getSteProtocol();
            if (steProtocol == null) { continue; }
            if (!steProtocol.isIdle()) { continue; }
            if (steProtocol.getRow() == 1) { continue; }
            String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
            LocMast locMast = locMastService.selectById(locNo);
            int lev = locMast.getLev1();