#

cpT

8 天以前 45cf0155027278bd4927ad25b40322b47df78c1c

 src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java

@@ -248,11 +248,6 @@
        }

        Integer crnNo = basDualCrnp.getCrnNo();
        int station = calcStation(dualCrnProtocol, "in");
        if (station == 0) {
            News.info("双工位堆垛机:{} 无可用工位", basDualCrnp.getCrnNo());
            return false;
        }

        if (wrkMast.getWrkSts() != WrkStsType.INBOUND_DEVICE_RUN.sts) {
            return false;
@@ -311,6 +306,33 @@
                inStationObjModel = stationObjModel;
                break;
            }

            StationObjModel dualCrnSlaveStationObjModel = stationObjModel.getDualCrnSlaveStation();
            if (dualCrnSlaveStationObjModel == null) {
                continue;
            }

            StationProtocol slaveStationProtocol = stationProtocolMap.get(dualCrnSlaveStationObjModel.getStationId());
            if (slaveStationProtocol == null) {
                continue;
            }

            if (!slaveStationProtocol.isAutoing()) {
                continue;
            }

            if (!slaveStationProtocol.isLoading()) {
                continue;
            }

            if (slaveStationProtocol.getTaskNo() <= 0) {
                continue;
            }

            if (slaveStationProtocol.getTaskNo().equals(wrkMast.getWrkNo())) {
                inStationObjModel = dualCrnSlaveStationObjModel;
                break;
            }
        }

        if (inStationObjModel == null) {
@@ -318,6 +340,7 @@
            return false;
        }

        Integer station = inStationObjModel.getDualCrnExecuteStation();
        String sourceLocNo = Utils.getLocNo(inStationObjModel.getDeviceRow(), inStationObjModel.getDeviceBay(), inStationObjModel.getDeviceLev());

        List<DualCrnCommand> commandList = new ArrayList<>();