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

pang.jiabao

2024-10-24 a6ae5a74d1de3db517526a3ba5db1e4a2a68cf65

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

@@ -899,7 +899,7 @@
                    continue;
                }
                // 判断工作档条件
                if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
                if ((wrkMast.getIoType() < 100 && wrkMast.getIoType() != 12) || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
                    continue;
                }
                // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档