zy-asrs-master.git

			@@ -17,6 +17,7 @@
			import com.zy.asrs.wcs.core.entity.Task;
			import com.zy.asrs.wcs.core.entity.TaskCtg;
			import com.zy.asrs.wcs.core.kernel.AnalyzeService;
			import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
			import com.zy.asrs.wcs.core.model.enums.TaskStsType;
			import com.zy.asrs.wcs.core.service.BasShuttleService;
			import com.zy.asrs.wcs.core.service.MotionService;
			@@ -30,7 +31,6 @@
			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;
			import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
			import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
			import com.zy.asrs.wcs.system.controller.BaseController;
			import com.zy.asrs.wcs.utils.ExcelUtil;
			@@ -60,8 +60,6 @@
			private MotionService motionService;
			@Autowired
			private DeviceService deviceService;
			@Autowired
			private DeviceTypeService deviceTypeService;

			@PreAuthorize("hasAuthority('core:basShuttle:list')")
			@PostMapping("/basShuttle/page")
			@@ -202,16 +200,8 @@
			@PostMapping("/basShuttle/moveLoc")
			@Transactional
			public synchronized R shuttleMoveLoc(@RequestBody ShuttleMoveLocParam param) {
			DeviceType deviceType = deviceTypeService.getOne(new LambdaQueryWrapper<DeviceType>()
			.eq(DeviceType::getFlag, String.valueOf(SlaveType.Shuttle))
			.eq(DeviceType::getStatus, 1)
			.eq(DeviceType::getHostId, getHostId()));
			if (deviceType == null) {
			return R.error();
			}

			Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
			.eq(Device::getDeviceType, deviceType.getId())
			.eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val())
			.eq(Device::getStatus, 1)
			.eq(Device::getHostId, getHostId())
			.eq(Device::getDeviceNo, param.getShuttleNo()));