#

Junjie

昨天 a637cdb04ab7e0954196ad0d8e7cc24ae22ee93a

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

@@ -199,18 +199,19 @@
        WrkMast stationOneWrkMast = null;
        WrkMast stationTwoWrkMast = null;

        List<Integer> disableList = basDualCrnp.getDisableStationOneBays$();
        List<Integer> disableOneList = basDualCrnp.getDisableStationOneBays$();
        List<Integer> disableTwoList = basDualCrnp.getDisableStationTwoBays$();

        for (WrkMast wrkMast : outTaskList) {
            if (stationOneWrkMast == null) {
                if (!disableList.contains(Utils.getBay(wrkMast.getSourceLocNo()))) {
                if (!disableOneList.contains(Utils.getBay(wrkMast.getSourceLocNo()))) {
                    stationOneWrkMast = wrkMast;
                    continue;
                }
            }

            if (stationTwoWrkMast == null) {
                if (!disableList.contains(Utils.getBay(wrkMast.getSourceLocNo()))) {
                if (!disableTwoList.contains(Utils.getBay(wrkMast.getSourceLocNo()))) {
                    stationTwoWrkMast = wrkMast;
                    continue;
                }