#

luxiaotao1123

23 小时以前 ff952db837b9193a58ddf42396d8aff34d5b34ff

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -1780,8 +1780,7 @@
                                    break;
                                }
                                // convey plc valid
                                //if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
                                if (false){
                                if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.OUT)) {
                                    // reserve rollback
                                    staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.OUT);
                                    break;
@@ -1796,8 +1795,7 @@
                                    break;
                                }
                                // convey plc valid
                                //if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
                                if (false){
                                if (!conveyorStationService.allowAgvWork(sta, currTask, currSeg, StaReserveType.IN)) {
                                    // reserve rollback
                                    staReserveService.rollbackWaitingToReserved(sta, currTask, StaReserveType.IN);
                                    break;