zy-asrs-master.git

			@@ -20,13 +20,11 @@
			import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
			import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
			import com.zy.asrs.wcs.rcs.entity.Device;
			import com.zy.asrs.wcs.rcs.entity.DeviceType;
			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.model.protocol.StaProtocol;
			import com.zy.asrs.wcs.rcs.service.DeviceService;
			import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
			import com.zy.asrs.wcs.rcs.thread.DevpThread;
			import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
			import com.zy.asrs.wcs.system.entity.Dict;
			@@ -55,8 +53,6 @@
			private MotionService motionService;
			@Autowired
			private DeviceService deviceService;
			@Autowired
			private DeviceTypeService deviceTypeService;
			@Autowired
			private LocCtgService locCtgService;
			@Autowired
			@@ -291,15 +287,8 @@
			return;
			}

			DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
			.eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle))
			.eq(DeviceType::getStatus, 1));
			if (deviceType == null) {
			return;
			}

			List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
			.eq(Device::getDeviceType, deviceType.getId())
			.eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
			.eq(Device::getStatus, 1));
			for (Device device : list) {
			//获取四向穿梭车线程
			@@ -314,6 +303,10 @@
			}

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

			if (!shuttleThread.isRequireCharge()) {
			continue;
			}

			@@ -438,15 +431,8 @@
			return;
			}

			DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
			.eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle))
			.eq(DeviceType::getStatus, 1));
			if (deviceType == null) {
			return;
			}

			List<Device> list = deviceService.list(new LambdaQueryWrapper<Device>()
			.eq(Device::getDeviceType, deviceType.getId())
			.eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
			.eq(Device::getStatus, 1));
			for (Device device : list) {
			//获取四向穿梭车线程