#

Junjie

2024-10-16 f0b0f5d954d54840d62135a4a88db94797898967

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/Utils.java

@@ -15,6 +15,7 @@
import com.zy.asrs.wcs.core.service.TaskService;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceService;
@@ -139,6 +140,14 @@
                continue;
            }

            if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
                continue;
            }

            if (shuttleProtocol.getCurrentLocNo() == null) {
                continue;
            }

            if (shuttleProtocol.getCurrentLocNo().equals(locNo)) {
                return true;
            }
@@ -186,9 +195,9 @@
    /**
     * 检测穿梭车是否有任务绑定
     */
    public static boolean checkShuttleHasBinding(Device device) {
    public static boolean checkShuttleHasBinding(Device device, String taskNo) {
        TaskService taskService = SpringUtils.getBean(TaskService.class);
        List<Task> tasks = taskService.selectWorkingByShuttle(Integer.parseInt(device.getDeviceNo()));
        List<Task> tasks = taskService.selectWorkingByShuttle(Integer.parseInt(device.getDeviceNo()), taskNo);
        if (tasks.isEmpty()) {
            return false;//无任务绑定
        }
@@ -199,8 +208,15 @@
     * 检测提升机是否有任务绑定
     */
    public static boolean checkLiftHasBinding(Integer liftNo) {
        return checkLiftHasBinding(liftNo, null);
    }

    /**
     * 检测提升机是否有任务绑定
     */
    public static boolean checkLiftHasBinding(Integer liftNo, String taskNo) {
        TaskService taskService = SpringUtils.getBean(TaskService.class);
        List<Task> tasks = taskService.selectWorkingByLift(liftNo);
        List<Task> tasks = taskService.selectWorkingByLift(liftNo, taskNo);
        if (tasks.isEmpty()) {
            return false;//无任务绑定
        }