#

yxFwq

2024-07-17 fc94238a57a2b90a9938fa2b628b7bcd2774f6d5

#

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

@@ -1233,7 +1233,7 @@
            } else {
                staProtocol = staProtocol.clone();
            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
            if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == null || staProtocol.getWorkNo() == 0)) {

                // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn,crnNo);
@@ -4561,7 +4561,7 @@
                            sign[0] = 2;
                            sign[1] = 1;
                        }
                        return false;
                        break;
                    case 3:
                        if (crnProtocol.getStatusTypeTwo() == CrnStatusType.IDLE
                                && crnProtocol.getTaskNoTwo() == 0
@@ -4579,7 +4579,7 @@
                            sign[0] = 2;
                            sign[1] = 2;
                        }
                        return false;
                        break;
                    default:
                }
            }