#

Junjie

2024-04-07 db2d8ed9e88be39ab8d94009565f8576b1bf3121

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/TaskMapper.java

@@ -26,4 +26,6 @@

    Task selectMoveWorking(Integer shuttleNo);

    Task selectChargeWorking(Integer shuttleNo);

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/TaskService.java

@@ -24,4 +24,6 @@

    Task selectMoveWorking(Integer shuttleNo);

    Task selectChargeWorking(Integer shuttleNo);

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java

@@ -251,6 +251,11 @@
                continue;
            }

            Task taskCharge = taskService.selectChargeWorking(Integer.valueOf(device.getDeviceNo()));
            if (taskCharge != null) {//已有充电任务
                continue;
            }

            String chargeLocNo = chargeLoc.getLocNo();
            Task task = new Task();
            task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java

@@ -84,4 +84,9 @@
    public Task selectMoveWorking(Integer shuttleNo) {
        return this.baseMapper.selectMoveWorking(shuttleNo);
    }

    @Override
    public Task selectChargeWorking(Integer shuttleNo) {
        return this.baseMapper.selectChargeWorking(shuttleNo);
    }
}

 zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml

@@ -49,4 +49,11 @@
        order by priority desc,start_time,task_no asc
    </select>

    <select id="selectChargeWorking" resultType="com.zy.asrs.wcs.core.entity.Task">
        select * from wcs_task
        where task_sts in (201,202,203,204)
        and shuttle_no = #{shuttleNo}
        order by priority desc,start_time,task_no asc
    </select>

</mapper>