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

whycq

2023-03-15 f0d2defd354a3d6fbaf77338f0c42fe133f019fd

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

@@ -886,6 +886,11 @@
            // 获取工作状态为11（生成出库ID）的出库工作档
//            WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
            //            获取工作状态为14的工作档
            WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep14(slave.getId(), crnStn.getStaNo());
            if (wrkMast1.getIoType().equals(103) || wrkMast1.getIoType().equals(107) ) {
                continue;
            }
            for (WrkMast wrkMast : wrkMasts) {
                if (wrkMast == null) {
                    continue;