zy-asrs-master.git

			@@ -9,6 +9,7 @@
			import com.zy.asrs.wcs.core.model.enums.MotionStsType;
			import com.zy.asrs.wcs.core.model.enums.TaskStsType;
			import com.zy.asrs.wcs.core.service.*;
			import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
			import com.zy.asrs.wcs.core.utils.Utils;
			import com.zy.asrs.wcs.rcs.News;
			import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
			@@ -62,6 +63,8 @@
			private TaskCtgService taskCtgService;
			@Autowired
			private DictService dictService;
			@Autowired
			private ShuttleDispatcher shuttleDispatcher;

			/**
			* 组托
			@@ -356,6 +359,9 @@
			continue;
			}

			//获取避让位置
			String standByLocNo = shuttleDispatcher.searchStandByLocNo(Integer.valueOf(device.getDeviceNo()), device.getHostId(), shuttleThread.getStatus().getCurrentLocNo());

			Task task = new Task();
			task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
			task.setTaskNo(String.valueOf(Utils.getTaskNo("MOVE")));
			@@ -365,7 +371,7 @@
			task.setOriginSite(null);
			task.setOriginLoc(null);
			task.setDestSite(null);
			task.setDestLoc("1-1-1"); // 暂时未定
			task.setDestLoc(standByLocNo); // 避让位置
			task.setIoTime(new Date());
			task.setStartTime(new Date());
			task.setHostId(device.getHostId());