zy-wcs.git - Gitblit

			@@ -2,6 +2,8 @@

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.core.common.Cools;
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.*;
			@@ -23,6 +25,8 @@
			import com.zy.core.model.protocol.*;
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.thread.*;
			import com.zy.system.entity.Config;
			import com.zy.system.service.ConfigService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			@@ -69,6 +73,8 @@
			@Autowired
			private BasShuttleErrLogService basShuttleErrLogService;
			@Autowired
			private BasLiftErrLogService basLiftErrLogService;
			@Autowired
			private BasShuttleErrService basShuttleErrService;
			@Autowired
			private BasCrnErrorMapper basCrnErrorMapper;
			@@ -96,6 +102,13 @@
			private ShuttleDispatchUtils shuttleDispatchUtils;
			@Autowired
			private RedisUtil redisUtil;
			@Autowired
			private WrkMastLocMapper wrkMastLocMapper;
			@Autowired
			private BasLiftOptService basLiftOptService;
			@Autowired
			private ConfigService configService;


			/**
			* 组托
			@@ -218,7 +231,7 @@
			param.setBarcode(barcode);
			param.setIoType(1);
			param.setSourceStaNo(inSta.getStaNo());
			// param.setLocType1(locTypeDto.getLocType1());
			param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			@@ -232,14 +245,14 @@
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);
			// plc 处理
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(dto.getWorkNo().shortValue());
			staProtocol.setStaNo(dto.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);

			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			// staProtocol.setWorkNo(dto.getWorkNo().shortValue());
			// staProtocol.setStaNo(dto.getStaNo().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			//
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// if (!result) {
			// throw new CoolException("更新plc站点信息失败");
			// }

			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep11(inSta.getStaNo());
			@@ -261,10 +274,10 @@
			}
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			} else if (code == 700) {
			staProtocol.setWorkNo((short) 32002);
			staProtocol.setRollback102(1);//102站回退信号
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(5, staProtocol));
			// staProtocol.setWorkNo((short) 32002);
			// staProtocol.setRollback102(1);//102站回退信号
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(5, staProtocol));

			// led 异常显示
			if (ledThread != null) {
			@@ -399,8 +412,8 @@
			}
			if (staProtocol.isAutoing()
			&& staProtocol.isLoading()
			&& (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999)
			&& staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
			// && (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999)
			// && staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
			&& staProtocol.isPakMk()){

			// 获取条码扫描仪信息
			@@ -501,14 +514,21 @@
			}

			String sourceLocNo = wrkMast.getSourceLocNo().trim();
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//获取回库提升机目标站
			if (liftStaProtocol == null) {
			continue;
			}

			// 更新工作档数据状态
			wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
			wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
			wrkMast.setSourceStaNo(pickSta.getStaNo()); // 源站
			wrkMast.setStaNo(dto.getStaNo()); // 目标站
			wrkMast.setCrnNo(dto.getCrnNo());
			// wrkMast.setStaNo(dto.getStaNo()); // 目标站
			// wrkMast.setCrnNo(dto.getCrnNo());
			wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站
			wrkMast.setLocNo(sourceLocNo); // 目标库位 = 出库时的源库位
			wrkMast.setShuttleNo(null); // 穿梭车清空
			wrkMast.setLiftNo(null);// 提升机清空
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			@@ -525,14 +545,16 @@
			throw new CoolException("修改库位状态失败");
			}

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			}
			// // 更新站点信息且下发plc命令
			// staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			// staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// if (!result) {
			// News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			// }

			barcodeThread.setBarcode("");//清理条码

			} else if (code == 500){
			if (ledThread != null) {
			@@ -543,10 +565,10 @@
			}
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			} else {
			staProtocol.setWorkNo((short) 32002);
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// staProtocol.setWorkNo((short) 32002);
			// staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

			// led 异常显示
			if (ledThread != null) {
			@@ -659,53 +681,83 @@
			* 入库 ===>> 四向穿梭车入库作业下发
			*/
			public synchronized void shuttleInExecute() {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历入库站
			for (DevpSlave.StaRack staRack : devp.getRackInStn()) {
			// 获取入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(staRack.getStaNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			Short workNo = staProtocol.getWorkNo();
			BasDevp basDevp = basDevpService.selectById(staProtocol.getSiteId());
			if (basDevp == null) {
			continue;//站点信息不存在
			}
			List<WrkMast> wrkMasts = wrkMastMapper.selectInStep4();
			for (WrkMast wrkMast : wrkMasts) {
			//获取源站
			BasDevp sourceBasDevp = basDevpService.selectById(wrkMast.getSourceStaNo());
			if (sourceBasDevp == null) {
			continue;//站点不存在
			}

			// 判断是否满足入库条件，自动、有物、四向穿梭车可取信号
			if (!(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isShuttleTakeEnable())) {
			continue;
			}
			//获取目标站
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(sourceBasDevp.getLiftNo(), Utils.getLev(wrkMast.getLocNo()));
			if (liftStaProtocol == null) {
			continue;//站点不存在
			}

			WrkMast wrkMast = wrkMastMapper.selectRackInStep4(workNo, staProtocol.getSiteId());
			if (wrkMast == null) {
			continue;
			}
			// 判断是否满足入库条件，自动、空闲、有物
			if (!(liftStaProtocol.getModel() && !liftStaProtocol.getBusy() && liftStaProtocol.getHasTray())) {
			continue;
			}

			boolean step1 = this.shuttleInExecuteStep1(wrkMast, basDevp);//小车搬入库中
			if (!step1) {
			continue;
			}

			boolean step1 = this.shuttleInExecuteStep1(wrkMast, liftStaProtocol);//小车搬入库中
			if (!step1) {
			continue;
			}
			}

			}

			// /**
			// * 入库 ===>> 四向穿梭车入库作业下发
			// */
			// public synchronized void shuttleInExecute() {
			// // 根据输送线plc遍历
			// for (DevpSlave devp : slaveProperties.getDevp()) {
			// // 遍历入库站
			// for (DevpSlave.StaRack staRack : devp.getRackInStn()) {
			// // 获取入库站信息
			// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			// StaProtocol staProtocol = devpThread.getStation().get(staRack.getStaNo());
			// if (staProtocol == null) {
			// continue;
			// } else {
			// staProtocol = staProtocol.clone();
			// }
			// Short workNo = staProtocol.getWorkNo();
			// BasDevp basDevp = basDevpService.selectById(staProtocol.getSiteId());
			// if (basDevp == null) {
			// continue;//站点信息不存在
			// }
			//
			// // 判断是否满足入库条件，自动、有物、四向穿梭车可取信号
			// if (!(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isShuttleTakeEnable())) {
			// continue;
			// }
			//
			// WrkMast wrkMast = wrkMastMapper.selectRackInStep4(workNo, staProtocol.getSiteId());
			// if (wrkMast == null) {
			// continue;
			// }
			//
			// boolean step1 = this.shuttleInExecuteStep1(wrkMast, basDevp);//小车搬入库中
			// if (!step1) {
			// continue;
			// }
			//
			// }
			// }
			//
			// }

			/**
			* 入库-小车搬入库中
			* 如需主方法执行continue，请返回false
			* ps:返回值true并不代表该方法执行成功，返回值仅做标记用于主方法是否执行continue
			*/
			public boolean shuttleInExecuteStep1(WrkMast wrkMast, BasDevp basDevp) {
			public boolean shuttleInExecuteStep1(WrkMast wrkMast, LiftStaProtocol liftStaProtocol) {
			if (wrkMast.getWrkSts() == 4) {
			if (wrkMast.getShuttleNo() == null) {//没有绑定小车，进行调度
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), basDevp.getLocNo());//调度小车到货物所在输送站点进行取货
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), liftStaProtocol.getLocNo());//调度小车到货物所在输送站点进行取货
			return false;
			}

			@@ -726,15 +778,21 @@
			return false;//小车已被独占，禁止再派发任务
			}

			//判断小车是否存在移动任务
			WrkMast hasMoveWorking = wrkMastMapper.selectShuttleHasMoveWorking(wrkMast.getShuttleNo());
			if (hasMoveWorking != null) {
			return false;//存在移动任务，禁止执行入库任务
			}

			//判断小车是否到达输送站点库位
			if (!shuttleProtocol.getCurrentLocNo().equals(basDevp.getLocNo())) {
			if (!shuttleProtocol.getCurrentLocNo().equals(liftStaProtocol.getLocNo())) {
			//小车不在输送站点位置
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), basDevp.getLocNo(), wrkMast.getShuttleNo());//调度小车到货物所在输送站点进行取货
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), liftStaProtocol.getLocNo(), wrkMast.getShuttleNo());//调度小车到货物所在输送站点进行取货
			return false;
			}

			//小车已抵达输送站点位置，进行搬运货物
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), basDevp.getLocNo(), wrkMast.getLocNo());
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), wrkMast.getLocNo());
			if (result == null) {//路径计算失败
			return false;
			}
			@@ -781,6 +839,38 @@
			public boolean shuttleOutExecuteStep1(WrkMast wrkMast) {
			//21.生成出库任务 => 22.小车搬运中
			if (wrkMast.getWrkSts() == 21) {
			EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
			wrapper.eq("type_no", wrkMast.getIoType());//路径类型
			wrapper.eq("stn_no", wrkMast.getStaNo());//出库站点编号
			StaDesc staDesc = staDescService.selectOne(wrapper);
			if (staDesc == null) {
			return false;//出库路径不存在
			}

			//获取出库站点
			BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNo());
			if (basDevp == null) {
			return false;//出库站点不存在
			}

			if (!basDevp.getAutoing().equals("Y")) {
			return false;//不是自动状态
			}

			if (!basDevp.getOutEnable().equals("Y")) {
			return false;//出库站点不可出
			}

			//获取源站
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(basDevp.getLiftNo(), Utils.getLev(wrkMast.getSourceLocNo()));
			if (liftStaProtocol == null) {
			return false;//找不到站点
			}

			if (!(liftStaProtocol.getModel() && !liftStaProtocol.getBusy() && !liftStaProtocol.getHasTray())) {
			return false;//站点必须自动、空闲、没有托盘
			}

			if (wrkMast.getShuttleNo() == null) {//没有绑定小车，进行调度
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo());//调度小车到货物所在库位进行取货
			return false;
			@@ -803,21 +893,15 @@
			return false;//小车已被独占，禁止再派发任务
			}

			//获取目标站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getSourceLocNo()), wrkMast.getLiftNo());
			if (targetBasDevp == null) {
			return false;//缺少站点信息
			}

			//判断小车是否到达货物库位
			if (!shuttleProtocol.getCurrentLocNo().equals(wrkMast.getSourceLocNo())) {
			//小车不在输送站点位置
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getShuttleNo());//调度小车到货物所在输送站点进行取货
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getShuttleNo());//调度小车到货物所在库位进行取货
			return false;
			}

			//小车已抵达货物位置，进行搬运货物
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), wrkMast.getSourceLocNo(), targetBasDevp.getLocNo());
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), liftStaProtocol.getLocNo());//将货物搬运至提升机输送站点
			if (result == null) {//出库路径计算失败
			return false;
			}
			@@ -856,6 +940,8 @@
			}

			//四向穿梭车状态为等待确认、小车处于空闲状态


			if (shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.WAITING.id //任务完成等待确认
			&& shuttleProtocol.getTaskNo() != 0
			&& shuttleProtocol.getFree() == ShuttleStatusType.IDLE.id
			@@ -866,27 +952,34 @@
			switch (wrkMast.getWrkSts().intValue()) {
			case 5://5.小车搬运中 ==> 9.入库完成
			wrkMast.setWrkSts(9L);
			if (shuttleProtocol.getToken() == wrkMast.getWrkNo()) {
			shuttleProtocol.setTaskNo(0);
			if (shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			//释放小车令牌
			shuttleProtocol.setToken(0);
			}
			break;
			case 22://22.小车搬运中 ==> 23.小车搬运完成
			wrkMast.setWrkSts(23L);
			if (shuttleProtocol.getToken() == wrkMast.getWrkNo()) {
			shuttleProtocol.setTaskNo(0);
			if (shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			//释放小车令牌
			shuttleProtocol.setToken(0);
			}
			break;
			case 102://102.小车到提升机中 ==> 103.小车到提升机完成
			case 102://102.小车移动至站点 ==> 103.小车移动至站点完成
			wrkMast.setWrkSts(103L);
			break;
			case 106://106.小车迁出提升机中 ==> 107.小车迁出提升机完成
			wrkMast.setWrkSts(107L);
			case 104://104.小车迁入提升机中 ==> 105.小车迁入提升机完成
			wrkMast.setWrkSts(105L);
			shuttleProtocol.setTaskNo(0);//清理工作号
			break;
			case 108://108.小车移动中 ==> 109.小车移动完成
			case 108://108.小车迁出提升机中 ==> 109.小车迁出提升机完成
			wrkMast.setWrkSts(109L);
			if (shuttleProtocol.getToken() == wrkMast.getWrkNo()) {
			break;
			case 110://110.小车移动中 ==> 111.小车移动完成
			wrkMast.setWrkSts(111L);
			shuttleProtocol.setTaskNo(0);
			if (shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			//释放小车令牌
			shuttleProtocol.setToken(0);
			}
			@@ -895,6 +988,17 @@
			}

			if (wrkMastMapper.updateById(wrkMast) > 0) {
			if (wrkMast.getWrkSts() == 111) {
			// 保存工作主档历史档
			if (wrkMastLocMapper.save(wrkMast.getWrkNo()) <= 0) {
			log.info("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
			}
			// 删除工作主档
			if (!wrkMastService.deleteById(wrkMast)) {
			log.info("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
			}
			}

			//设置四向穿梭车为空闲状态
			shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
			//源库位清零
			@@ -906,6 +1010,24 @@
			News.info("四向穿梭车已确认且任务完成状态,复位。四向穿梭车号={}", shuttleProtocol.getShuttleNo());
			} else {
			News.error("四向穿梭车已确认且任务完成状态,复位失败，但未找到工作档。四向穿梭车号={}，工作号={}", shuttleProtocol.getShuttleNo(), shuttleProtocol.getTaskNo());
			}
			}else {
			ShuttleAssignCommand assignCommand = shuttleProtocol.getAssignCommand();
			if (!assignCommand.getAuto()) {
			//手动模式
			//工作号清零
			shuttleProtocol.setTaskNo(0);
			//设置四向穿梭车为空闲状态
			shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
			//源库位清零
			shuttleProtocol.setSourceLocNo(null);
			//目标库位清零
			shuttleProtocol.setLocNo(null);
			//任务指令清零
			shuttleProtocol.setAssignCommand(null);
			//清零令牌
			shuttleProtocol.setToken(0);
			News.info("四向穿梭车已确认且任务完成状态,复位。四向穿梭车号={}", shuttleProtocol.getShuttleNo());
			}
			}

			@@ -929,6 +1051,11 @@
			}

			if (!liftProtocol.isIdle()) {
			continue;
			}

			//判断提升机令牌是否被占用
			if (liftProtocol.getToken() != 0) {
			continue;
			}

			@@ -970,7 +1097,17 @@

			//2.设备上走 ==> 3.提升机搬运中
			if (wrkMast.getWrkSts() == 2) {
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast.getLiftNo());
			//获取源站
			BasDevp sourceBasDevp = basDevpService.selectById(wrkMast.getSourceStaNo());
			if (sourceBasDevp == null) {
			return false;//找不到站点
			}

			if (!sourceBasDevp.getInEnable().equals("Y")) {
			return false;//站点不可入
			}

			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, sourceBasDevp.getLiftNo());
			if (liftThread == null) {
			return false;
			}
			@@ -978,30 +1115,52 @@
			if (liftProtocol == null) {
			return false;
			}
			if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
			if (!liftProtocol.isIdle()) {
			return false;
			}
			//判断提升机令牌是否未被占领
			if (liftProtocol.getToken() != 0) {
			return false;//提升机已被独占，禁止再派发任务
			}

			//判断提升机内是否有小车
			if (liftProtocol.getHasCar()) {
			return false;//有小车，禁止派发
			}

			//判断提升机内是否有托盘
			if (liftProtocol.getHasTray()) {
			return false;//有托盘，禁止派发
			}

			//判断提升机是否有其他任务
			WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftThread.getSlave().getId());
			if (liftWrkMast != null) {
			return false;//当前提升机存在未完成任务，等待下一次轮询
			}

			//获取源站对应的输送站点
			BasDevp sourceBasDevp = basDevpService.selectById(wrkMast.getSourceStaNo());
			//获取目标站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectById(wrkMast.getStaNo());
			if (sourceBasDevp == null \|\| targetBasDevp == null) {
			return false;//缺少站点信息
			//获取源站对应的牛眼提升机站点编号(起点编号)
			Integer startSta = Integer.parseInt(sourceBasDevp.getQrCodeValue());
			//获取提升机站点
			LiftStaProtocol targetStaProtocol = NyLiftUtils.getLiftStaByLev(liftThread.getSlave().getId(), Utils.getLev(wrkMast.getLocNo()));
			if (targetStaProtocol == null) {
			return false;//站点不存在
			}

			//获取提升机命令
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, sourceBasDevp.getDevNo(), targetBasDevp.getDevNo(), wrkMast.getWrkNo());
			if (targetStaProtocol.getHasTray()) {
			return false;//提升机站点有托盘，禁止派发
			}

			Integer targetSta = targetStaProtocol.getStaNo();

			//获取提升机命令
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, startSta, targetSta, wrkMast.getWrkNo());
			if (wrkMast.getIoType() == 53) {
			//拣料再回库，重新分配设备工作号
			Random random = new Random();
			int deviceWrk = Math.abs((liftCommand.getTaskNo().intValue() + random.nextInt(9999)));//获取设备工作号
			liftCommand.setTaskNo((short) deviceWrk);
			}
			ArrayList<NyLiftCommand> commands = new ArrayList<>();
			commands.add(liftCommand);

			@@ -1037,7 +1196,39 @@

			//23.小车搬运完成 ==> 24.提升机搬运中
			if (wrkMast.getWrkSts() == 23) {
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast.getLiftNo());
			NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
			if (shuttleThread == null) {
			return false;
			}

			//获取出库站点(目标站)
			BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNo());
			if (basDevp == null) {
			return false;//出库站点不存在
			}

			//获取源站对应的牛眼提升机站点编号(起点编号)
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(basDevp.getLiftNo(), Utils.getLev(wrkMast.getSourceLocNo()));
			if (liftStaProtocol == null) {
			return false;//找不到站点
			}
			Integer startSta = liftStaProtocol.getStaNo();

			NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (shuttleProtocol.getCurrentLocNo().equals(liftStaProtocol.getLocNo())) {
			//小车还在输送站点
			//调度小车避让
			boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkMast.getSourceLocNo()), wrkMast.getShuttleNo(), shuttleThread);
			if (!result) {
			return false;
			}
			}

			if (!basDevp.getOutEnable().equals("Y")) {
			return false;//出库站点不可出
			}

			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basDevp.getLiftNo());
			if (liftThread == null) {
			return false;
			}
			@@ -1045,7 +1236,8 @@
			if (liftProtocol == null) {
			return false;
			}
			if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {

			if (!liftProtocol.isIdle()) {
			return false;
			}
			//判断提升机令牌是否未被占领
			@@ -1058,16 +1250,16 @@
			return false;//当前提升机存在未完成任务，等待下一次轮询
			}

			//获取源站对应的输送站点
			BasDevp sourceBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getSourceLocNo()), liftProtocol.getLiftNo().intValue());
			//获取目标站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectById(wrkMast.getSourceStaNo());
			if (sourceBasDevp == null \|\| targetBasDevp == null) {
			return false;//缺少站点信息
			//获目标站源站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectById(wrkMast.getStaNo());
			if (targetBasDevp == null) {
			return false;//站点不存在
			}
			//获取牛眼提升机站点编号(目标编号)
			Integer targetSta = Integer.parseInt(targetBasDevp.getQrCodeValue());

			//获取提升机命令
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, sourceBasDevp.getDevNo(), targetBasDevp.getDevNo(), wrkMast.getWrkNo());
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftThread.getSlave().getId(), NyLiftTaskModelType.MOVE_TRAY.id, startSta, targetSta, wrkMast.getWrkNo());

			ArrayList<NyLiftCommand> commands = new ArrayList<>();
			commands.add(liftCommand);
			@@ -1110,15 +1302,20 @@
			&& liftProtocol.getTaskNo() != 0
			&& !liftProtocol.getBusy()
			) {
			BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString());
			int taskNo = liftProtocol.getTaskNo().intValue();
			if (basLiftOpt != null) {
			taskNo = basLiftOpt.getWrkNo();
			}

			//将任务档标记为完成
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo324104(liftProtocol.getTaskNo().intValue());
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo324104(taskNo);
			if (wrkMast != null) {
			switch (wrkMast.getWrkSts().intValue()) {
			case 3://3.提升机搬运中 ==> 4.提升机搬运完成
			wrkMast.setWrkSts(4L);
			wrkMast.setLiftNo(null);//释放提升机
			if (liftProtocol.getToken() == wrkMast.getWrkNo()) {
			if (liftProtocol.getToken().equals(wrkMast.getWrkNo())) {
			//释放提升机令牌
			liftProtocol.setToken(0);
			}
			@@ -1127,14 +1324,21 @@
			wrkMast.setWrkSts(25L);
			if (wrkMast.getIoType() == 11) {//库位移转
			wrkMast.setWrkSts(4L);//4.提升机搬运完成
			}else {
			if (wrkMast.getMk() == null \|\| !wrkMast.getMk().equals("Y")) {
			//不需要用到机械臂，直接转29.出库完成
			wrkMast.setWrkSts(29L);
			}
			}
			if (liftProtocol.getToken() == wrkMast.getWrkNo()) {

			if (liftProtocol.getToken().equals(wrkMast.getWrkNo())) {
			//释放提升机令牌
			liftProtocol.setToken(0);
			}

			break;
			case 104://104.提升机搬运中 ==> 105.提升机搬运完成
			wrkMast.setWrkSts(105L);
			case 106://106.提升机搬运中 ==> 107.提升机搬运完成
			wrkMast.setWrkSts(107L);
			break;
			default:
			}
			@@ -1148,8 +1352,19 @@
			} else {
			News.error("提升机已确认且任务完成状态,复位失败，但未找到工作档。提升机号={}，工作号={}", liftProtocol.getLiftNo(), liftProtocol.getTaskNo());
			}
			}else {
			LiftAssignCommand assignCommand = liftProtocol.getAssignCommand();
			if (assignCommand != null) {
			if (!assignCommand.getAuto()) {
			//手动操作
			//设置提升机为空闲状态
			liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
			//任务指令清零
			liftProtocol.setAssignCommand(null);
			News.info("提升机已确认手动操作。提升机号={}", liftProtocol.getLiftNo());
			}
			}
			}

			}
			}
			}
			@@ -1168,7 +1383,7 @@
			//查询库位移转工作档
			List<WrkMast> wrkMasts1 = wrkMastMapper.selectLocToLocWrkMast();
			for (WrkMast wrkMast : wrkMasts1) {
			if (wrkMast.getSourceLocNo().equals(wrkMast.getLocNo())) {
			if (Utils.getLev(wrkMast.getSourceLocNo()) == Utils.getLev(wrkMast.getLocNo())) {
			boolean step1 = this.locToLocExecuteStep1(wrkMast);//同楼层库位移转
			if (!step1) {
			continue;
			@@ -1185,7 +1400,7 @@
			continue;
			}

			boolean step4 = this.locToLocExecuteStep4(wrkMast);//调度车辆取货并运送到出库口
			boolean step4 = this.locToLocExecuteStep4(wrkMast);//调度车辆取货并运送到目标库位
			if (!step4) {
			continue;
			}
			@@ -1228,7 +1443,7 @@
			}

			//小车已抵达源库位，进行搬运货物
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), wrkMast.getSourceLocNo(), wrkMast.getLocNo());
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getLocNo());
			if (result == null) {//路径计算失败
			return false;
			}
			@@ -1287,13 +1502,17 @@
			}

			//获取穿梭车最近且空闲的提升机输送站点
			BasDevp liftSta = shuttleDispatchUtils.getRecentLiftSta(shuttleThread.getSlave().getId());
			LiftStaProtocol liftSta = shuttleDispatchUtils.getRecentLiftSta(shuttleThread.getSlave().getId(), Utils.getLev(wrkMast.getLocNo()));
			if (liftSta == null) {
			return false;//没有可用且空闲的输送站点
			}
			//源站
			Integer sourceStaNo = liftSta.getStaNo();
			//提升机号*100+目标楼层=目标站点
			Integer staNo = liftSta.getLiftNo() * 100 + Utils.getLev(wrkMast.getLocNo());//目标站

			//小车已抵达源库位，将货物搬运到输送站点
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), wrkMast.getSourceLocNo(), liftSta.getLocNo());
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), liftSta.getLocNo());
			if (result == null) {//路径计算失败
			return false;
			}
			@@ -1308,7 +1527,8 @@
			assignCommand.setNodes(result.getNodes());//路径节点

			wrkMast.setWrkSts(22L);//21.生成出库任务 => 22.小车搬运中
			wrkMast.setLiftNo(liftSta.getLiftNo());//设置提升机号
			wrkMast.setSourceStaNo(sourceStaNo);//源站
			wrkMast.setStaNo(staNo);//目标站
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			@@ -1328,14 +1548,47 @@
			private boolean locToLocExecuteStep3(WrkMast wrkMast) {
			Date now = new Date();
			if (wrkMast.getWrkSts() == 23) {//23.小车搬运完成
			//源站
			Integer sourceStaNo = wrkMast.getSourceStaNo();
			//目标站
			Integer staNo = wrkMast.getStaNo();
			if (sourceStaNo == null \|\| staNo == null) {
			return false;//源站或目标站为空
			}

			int liftNo = staNo / 100;//获取提升机号

			//获取提升机线程
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast.getLiftNo());
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftNo);
			if (liftThread == null) {
			return false;
			}
			LiftProtocol liftProtocol = liftThread.getLiftProtocol();
			if (liftProtocol == null) {
			return false;
			}

			//获取源站对应的输送站点
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(liftNo, Utils.getLev(wrkMast.getSourceLocNo()));
			if (liftStaProtocol == null) {
			return false;//找不到站点
			}

			if (!(liftStaProtocol.getModel() && !liftStaProtocol.getBusy() && liftStaProtocol.getHasTray())) {
			return false;//站点必须自动、空闲、有托盘
			}
			NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
			if (shuttleThread == null) {
			return false;
			}
			NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (shuttleProtocol.getCurrentLocNo().equals(liftStaProtocol.getLocNo())) {
			//小车还在输送站点
			//调度小车避让
			boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkMast.getSourceLocNo()), wrkMast.getShuttleNo(), shuttleThread);
			if (!result) {
			return false;
			}
			}

			if (!liftProtocol.isIdle()) {
			@@ -1348,16 +1601,8 @@
			return false;
			}

			//获取源站对应的输送站点
			BasDevp sourceBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getSourceLocNo()), liftProtocol.getLiftNo().intValue());
			//获取目标站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getLocNo()), liftProtocol.getLiftNo().intValue());
			if (sourceBasDevp == null \|\| targetBasDevp == null) {
			return false;//缺少站点信息
			}

			//获取提升机命令
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, sourceBasDevp.getDevNo(), targetBasDevp.getDevNo(), wrkMast.getWrkNo());
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, sourceStaNo, staNo, wrkMast.getWrkNo());

			ArrayList<NyLiftCommand> commands = new ArrayList<>();
			commands.add(liftCommand);
			@@ -1383,20 +1628,24 @@
			}

			/**
			* 跨楼层库位移转-调度车辆取货并运送到目标枯萎
			* 跨楼层库位移转-调度车辆取货并运送到目标库位
			* 如需主方法执行continue，请返回false
			* ps:返回值true并不代表该方法执行成功，返回值仅做标记用于主方法是否执行continue
			*/
			private boolean locToLocExecuteStep4(WrkMast wrkMast) {
			if (wrkMast.getWrkSts() == 4) {//4.提升机搬运完成
			//获取目标站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getLocNo()), wrkMast.getLiftNo());
			if (targetBasDevp == null) {
			return false;//缺少站点信息
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(wrkMast.getLiftNo(), Utils.getLev(wrkMast.getLocNo()));
			if (liftStaProtocol == null) {
			return false;//找不到站点
			}

			if (!(liftStaProtocol.getModel() && !liftStaProtocol.getBusy() && liftStaProtocol.getHasTray())) {
			return false;//站点必须自动、空闲、有托盘
			}

			if (wrkMast.getShuttleNo() == null) {
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), targetBasDevp.getLocNo());//调度小车到目标输送站点进行取货
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), liftStaProtocol.getLocNo());//调度小车到目标输送站点进行取货
			return false;
			}

			@@ -1414,14 +1663,14 @@
			}

			//判断小车是否到达目标输送站点
			if (!shuttleProtocol.getCurrentLocNo().equals(targetBasDevp.getLocNo())) {
			if (!shuttleProtocol.getCurrentLocNo().equals(liftStaProtocol.getLocNo())) {
			//小车不在目标输送站点
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), targetBasDevp.getLocNo(), wrkMast.getShuttleNo());//调度小车到目标输送站点进行取货
			shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), liftStaProtocol.getLocNo(), wrkMast.getShuttleNo());//调度小车到目标输送站点进行取货
			return false;
			}

			//小车已抵达目标输送站点，将货物搬运到目标库位
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), targetBasDevp.getLocNo(), wrkMast.getLocNo());
			NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), liftStaProtocol.getLocNo(), wrkMast.getLocNo());
			if (result == null) {//路径计算失败
			return false;
			}
			@@ -1436,6 +1685,7 @@
			assignCommand.setNodes(result.getNodes());//路径节点

			wrkMast.setWrkSts(5L);//4.提升机搬运完成 => 5.小车搬运中
			wrkMast.setLiftNo(null);//释放提升机
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			@@ -1453,6 +1703,7 @@
			public void recErr() {
			try {
			this.recShuttleErr();
			this.recLiftErr();
			} catch (Exception e) {
			News.error("recErr fail", e);
			}
			@@ -1507,7 +1758,8 @@
			null, // 添加人员
			now, // 修改时间
			null, // 修改人员
			"任务中异常" // 备注
			"任务中异常", // 备注
			JSON.toJSONString(shuttleProtocol) // 系统状态数据
			);
			if (!basShuttleErrLogService.insert(basShuttleErrLog)) {
			News.error("四向穿梭车plc异常记录失败 ===>> [id:{}] [error:{}]", shuttleSlave.getId(), errName);
			@@ -1576,6 +1828,91 @@
			}
			}

			/**
			* 提升机异常信息记录
			*/
			private void recLiftErr() {
			Date now = new Date();
			for (LiftSlave liftSlave : slaveProperties.getLift()) {
			// 获取提升机信息
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
			if (liftThread == null) {
			continue;
			}
			LiftProtocol liftProtocol = liftThread.getLiftProtocol();
			if (liftProtocol == null) {
			continue;
			}

			if (liftProtocol.getTaskNo() != 0) {
			//有任务
			BasLiftErrLog latest = basLiftErrLogService.findLatestByTaskNo(liftSlave.getId(), liftProtocol.getTaskNo().intValue());
			// 有异常
			if (latest == null) {
			if (liftProtocol.getDeviceError() != null && liftProtocol.getDeviceError()) {
			WrkMast wrkMast = wrkMastMapper.selectById(liftProtocol.getTaskNo());
			if (wrkMast == null) {
			continue;
			}

			String errName = "";
			if (liftProtocol.getFrontOverrun()) {
			errName = "前超限";
			} else if (liftProtocol.getBackOverrun()) {
			errName = "后超限";
			} else if (liftProtocol.getLeftOverrun()) {
			errName = "左超限";
			} else if (liftProtocol.getRightOverrun()) {
			errName = "右超限";
			} else if (liftProtocol.getOverHeight()) {
			errName = "超高";
			} else if (liftProtocol.getOverWeight()) {
			errName = "超重";
			}

			BasLiftErrLog basLiftErrLog = new BasLiftErrLog(
			null, // 编号
			wrkMast.getWrkNo(), // 工作号
			now, // 发生时间
			null, // 结束时间
			wrkMast.getWrkSts(), // 工作状态
			wrkMast.getIoType(), // 入出库类型
			liftSlave.getId(), // 提升机
			null, // plc
			wrkMast.getLocNo(), // 目标库位
			wrkMast.getStaNo(), // 目标站
			wrkMast.getSourceStaNo(), // 源站
			wrkMast.getSourceLocNo(), // 源库位
			wrkMast.getBarcode(), // 条码
			null, // 异常码
			errName, // 异常
			1, // 异常情况
			now, // 添加时间
			null, // 添加人员
			now, // 修改时间
			null, // 修改人员
			"任务中异常", // 备注
			JSON.toJSONString(liftProtocol) // 系统状态数据
			);
			if (!basLiftErrLogService.insert(basLiftErrLog)) {
			News.error("提升机plc异常记录失败 ===>> [id:{}] [error:{}]", liftSlave.getId(), errName);
			}
			}
			} else {
			// 异常修复
			if (liftProtocol.getDeviceError() == null \|\| !liftProtocol.getDeviceError()) {
			latest.setEndTime(now);
			latest.setUpdateTime(now);
			latest.setStatus(2);
			if (!basLiftErrLogService.updateById(latest)) {
			News.error("提升机plc异常记录修复失败 ===>> [id:{}] [errLogId:{}]", liftSlave.getId(), latest.getId());
			}
			}
			}
			}
			}
			}

			// -------------------------------------------------------------------------------

			/**
			@@ -1614,6 +1951,13 @@
			}
			}

			if (!Cools.isEmpty(barcode)) {
			WrkMast wrkMast = wrkMastMapper.selectByBarcode(barcode);//条码存在工作档
			if (wrkMast != null) {
			continue;
			}
			}

			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, emptyInSta.getLed());

			try {
			@@ -1636,15 +1980,15 @@
			Integer code = jsonObject.getInteger("code");
			if (code.equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(dto.getWorkNo().shortValue());
			staProtocol.setStaNo(dto.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			barcodeThread.setBarcode("");
			// // 更新站点信息且下发plc命令
			// staProtocol.setWorkNo(dto.getWorkNo().shortValue());
			// staProtocol.setStaNo(dto.getStaNo().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// if (!result) {
			// throw new CoolException("更新plc站点信息失败");
			// }
			} else {
			if (ledThread != null) {
			String errorMsg = jsonObject.getString("msg");
			@@ -1662,6 +2006,247 @@
			}


			}
			}
			}

			/**
			* AGV补货 => 机械臂拣料
			*/
			public void agvRestockByRobot() {
			//检测300站是否自动、有物、工作号
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 获取入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(300);
			if (staProtocol == null) {
			continue;
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() != 0) {
			//查询是否有工作档
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
			if (wrkMast == null) {
			continue;
			}

			if (wrkMast.getWrkSts() != 25) {//25.提升机搬运完成
			continue;
			}

			if (wrkMast.getMk() != null && wrkMast.getMk().equals("Y")) {//标记为Y表示需要用到机械臂拣料
			Short targetSta = null;//目标站
			//判断机械臂拣料站是否空闲
			StaProtocol staProtocol303 = devpThread.getStation().get(303);
			StaProtocol staProtocol317 = devpThread.getStation().get(317);
			if (staProtocol303.isAutoing() && !staProtocol303.isLoading()) {
			//自动、无物
			targetSta = (short) 303;
			} else if (staProtocol317.isAutoing() && !staProtocol317.isLoading()) {
			//自动、无物
			targetSta = (short) 317;
			}else {
			continue;//没有空闲站点
			}

			if (wrkMast.getStaNo() != 303 && wrkMast.getStaNo() != 317) {
			//向AGV发起组托请求
			try {
			HashMap<String, Object> param = new HashMap<>();
			param.put("wrkNo", wrkMast.getWrkNo());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/replenishment")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			Integer code = jsonObject.getInteger("code");
			if (code.equals(200)) {//AGV组托成功
			//覆盖工作档目标站
			wrkMast.setStaNo(targetSta.intValue());
			wrkMast.setShuttleNo(null);//释放小车
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//向300站写入目标站
			staProtocol = staProtocol.clone();
			staProtocol.setStaNo(targetSta);//移动到目标站
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			try {
			Thread.sleep(500);
			} catch (Exception e) {
			e.printStackTrace();
			}
			continue;
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}

			// //覆盖工作档目标站
			// wrkMast.setStaNo(targetSta.intValue());
			// wrkMast.setShuttleNo(null);//释放小车
			// if (wrkMastMapper.updateById(wrkMast) > 0) {
			// //向300站写入目标站
			// staProtocol = staProtocol.clone();
			// staProtocol.setStaNo(targetSta);//移动到目标站
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// try {
			// Thread.sleep(500);
			// } catch (Exception e) {
			// e.printStackTrace();
			// }
			// continue;
			// }
			}
			}
			}

			StaProtocol staProtocol303 = devpThread.getStation().get(303);
			StaProtocol staProtocol317 = devpThread.getStation().get(317);
			if (staProtocol303.isAutoing() && staProtocol303.isLoading() && staProtocol303.getWorkNo() != 0) {
			//调度机械臂
			//查询是否有工作档
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol303.getWorkNo().intValue());
			if (wrkMast == null) {
			continue;
			}
			List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
			if (wrkDetls.isEmpty()) {
			continue;
			}

			if (wrkMast.getInvWh() == null) {
			wrkMast.setInvWh("Y");//标记已经下发机械臂任务
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetls.size(), "303");
			}
			}
			}else if (staProtocol317.isAutoing() && staProtocol317.isLoading() && staProtocol317.getWorkNo() != 0) {
			//调度机械臂
			//查询是否有工作档
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol317.getWorkNo().intValue());
			if (wrkMast == null) {
			continue;
			}
			List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
			if (wrkDetls.isEmpty()) {
			continue;
			}
			if (wrkMast.getInvWh() == null) {
			wrkMast.setInvWh("Y");//标记已经下发机械臂任务
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			RobotUtils.sendTask(staProtocol317.getWorkNo().toString(), wrkDetls.size(), "317");
			}
			}
			}
			}
			}

			/**
			* AGV补货(通知AGV取货)
			*/
			public void agvRestockInto() {
			//检测309和312站是否自动、有物
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 获取入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol309 = devpThread.getStation().get(309);
			StaProtocol staProtocol312 = devpThread.getStation().get(312);
			if (staProtocol309 == null \|\| staProtocol312 == null) {
			continue;
			}

			if (staProtocol309.isAutoing() && staProtocol309.isLoading()) {
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 11);//308站条码器
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode)) {
			//通知AGV取货
			agvRestockCall("CS-301-001-01@3", barcode);
			}
			} else if (staProtocol312.isAutoing() && staProtocol312.isLoading()) {
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 12);//311站条码器
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode)) {
			//通知AGV取货
			agvRestockCall("CS-302-001-01@3", barcode);
			}
			}
			}
			}

			//通知AGV取货
			private boolean agvRestockCall(String staNo, String barcode) {
			try {
			HashMap<String, Object> param = new HashMap<>();
			param.put("devNo", staNo);
			param.put("containerCode", barcode);
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/start")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			Integer code = jsonObject.getInteger("code");
			if (code.equals(200)) {//呼叫AGV
			return true;
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			return false;
			}

			// 300站拣料
			public void pick300() {
			//检测300站是否自动、有物、工作号
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 获取入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(300);
			if (staProtocol == null) {
			continue;
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() != 0) {
			//查询是否有工作档
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
			if (wrkMast == null) {
			continue;
			}

			if (wrkMast.getWrkSts() != 29) {//29.出库完成
			continue;
			}

			if (wrkMast.getMk() == null) {
			Integer sourceStaNo = wrkMast.getSourceStaNo();//源站
			Integer staNo = wrkMast.getStaNo();//目标站
			//覆盖工作档目标站
			wrkMast.setStaNo(sourceStaNo);
			wrkMast.setSourceStaNo(staNo);
			wrkMast.setMk("N");
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//向300站写入目标站
			staProtocol = staProtocol.clone();
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());//移动到目标站
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			try {
			Thread.sleep(500);
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			}
			}
			}
			}
			@@ -1852,11 +2437,39 @@
			continue;
			}

			//小车所在楼层
			int lev = Utils.getLev(shuttleProtocol.getCurrentLocNo());
			ShuttleChargeType shuttleCharge = null;

			//搜索小车所在楼层有没有充电桩
			for (ShuttleChargeType chargeType : ShuttleChargeType.values()) {
			if (lev != Utils.getLev(chargeType.locNo)) {
			continue;//小车和充电桩不在同一层
			}

			//小车和充电桩在同一层
			if (wrkChargeService.selectWorkingOfCharge(chargeType.id) == null) {
			shuttleCharge = chargeType;
			break;
			}
			}

			if (shuttleCharge == null) {
			//同楼层没有找到充电桩，找可用充电桩
			//小车同楼层没有充电桩，只要充电桩可用就生成充电任务
			for (ShuttleChargeType chargeType : ShuttleChargeType.values()) {
			if (wrkChargeService.selectWorkingOfCharge(chargeType.id) == null) {
			//判断当前充电桩楼层是否有小车，如有小车，不分配该充电桩
			int chargeLev = Utils.getLev(chargeType.locNo);//充电桩楼层
			boolean checkLevHasShuttle = Utils.checkLevHasShuttle(chargeLev);//检测楼层是否有穿梭车
			if (checkLevHasShuttle) {
			//当前充电桩楼层有穿梭车，不分配该充电桩
			continue;
			}

			shuttleCharge = chargeType;
			break;
			}
			}
			}

			@@ -1879,7 +2492,6 @@
			continue;
			}

			shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING);//充电中
			News.info("保存{}号四向穿梭车充电任务成功!!!", shuttle.getId());
			}
			}
			@@ -1904,6 +2516,10 @@
			}

			if (wrkCharge.getWrkSts() == 51) {
			if (!shuttleProtocol.isIdleNoCharge()) {
			continue;
			}

			if (!shuttleProtocol.getCurrentLocNo().equals(wrkCharge.getLocNo())) {
			//小车不在充电桩位置
			shuttleDispatchUtils.dispatchShuttle(wrkCharge.getWrkNo(), wrkCharge.getLocNo(), shuttle.getId());//调度小车去充电桩
			@@ -1930,7 +2546,17 @@
			}
			} else if (wrkCharge.getWrkSts() == 52) {
			//检测小车是否满电
			if (shuttleProtocol.getPowerPercent() < 100) {

			//获取满电阈值
			int maxPower = 95;
			EntityWrapper<Config> wrapper = new EntityWrapper<>();
			wrapper.eq("code", "chargeMaxValue");
			Config config = configService.selectOne(wrapper);
			if (config != null) {
			maxPower = Integer.parseInt(config.getValue());
			}

			if (shuttleProtocol.getPowerPercent() < maxPower) {
			continue;
			}

			@@ -1946,21 +2572,34 @@
			assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//源库位(小车当前位置)
			assignCommand.setCommands(commands);//运行命令

			//下发任务
			MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
			try {
			Thread.sleep(3000);
			} catch (Exception e) {
			e.printStackTrace();
			}

			wrkCharge.setWrkSts(53L);//52.小车去充电中 => 53.小车充电完成
			wrkCharge.setModiTime(new Date());
			if (wrkChargeMapper.updateById(wrkCharge) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
			shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE.id);
			shuttleProtocol.setTaskNo(0);
			shuttleProtocol.setPakMk(false);
			}
			} else if (wrkCharge.getWrkSts() == 53) {
			boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkCharge.getLocNo()), shuttleThread.getSlave().getId(), shuttleThread);
			if (!result) {
			continue;
			}
			if (shuttleProtocol.getChargState() == 0) {//小车处于未充电状态
			boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkCharge.getLocNo()), shuttleThread.getSlave().getId(), shuttleThread);
			if (!result) {
			continue;
			}

			wrkCharge.setWrkSts(60L);//53.小车充电完成 => 60.充电任务完成
			wrkCharge.setModiTime(new Date());
			wrkChargeMapper.updateById(wrkCharge);
			wrkCharge.setWrkSts(60L);//53.小车充电完成 => 60.充电任务完成
			wrkCharge.setModiTime(new Date());
			if (wrkChargeMapper.updateById(wrkCharge) > 0) {

			}
			}
			}

			}
			@@ -1974,38 +2613,44 @@
			//查询小车移库任务
			List<WrkMast> wrkMasts = wrkMastMapper.selectShuttleMoveWrk();
			for (WrkMast wrkMast : wrkMasts) {
			boolean step1 = this.shuttleMoveExecuteStep1(wrkMast);//小车移动到提升机中
			if (!step1) {
			boolean stepMoveSta = this.shuttleMoveExecuteStepMoveSta(wrkMast);//小车移动到站点
			if (!stepMoveSta) {
			continue;
			}

			boolean step2 = this.shuttleMoveExecuteStep2(wrkMast);//提升机搬运中
			if (!step2) {
			boolean stepIntoLift = this.shuttleMoveExecuteStepIntoLift(wrkMast);//小车迁入提升机
			if (!stepIntoLift) {
			continue;
			}

			boolean step3 = this.shuttleMoveExecuteStep3(wrkMast);//小车迁出提升机中
			if (!step3) {
			boolean stepLiftMove = this.shuttleMoveExecuteStepLiftMove(wrkMast);//提升机搬运中
			if (!stepLiftMove) {
			continue;
			}

			boolean step4 = this.shuttleMoveExecuteStep4(wrkMast);//小车移动到目标库位中
			if (!step4) {
			boolean stepOutLift = this.shuttleMoveExecuteStepOutLift(wrkMast);//小车迁出提升机
			if (!stepOutLift) {
			continue;
			}

			boolean stepMoveLoc = this.shuttleMoveExecuteStepMoveLoc(wrkMast);//小车移动到目标库位中
			if (!stepMoveLoc) {
			continue;
			}

			}
			}

			/**
			* 小车迁移-小车移动到提升机中
			* 小车迁移-小车移动到站点
			* 如需主方法执行continue，请返回false
			* ps:返回值true并不代表该方法执行成功，返回值仅做标记用于主方法是否执行continue
			*/
			private boolean shuttleMoveExecuteStep1(WrkMast wrkMast) {
			//--------------------------------------小车移动到提升机中-----------------------------------------//
			private boolean shuttleMoveExecuteStepMoveSta(WrkMast wrkMast) {
			//--------------------------------------小车移动至站点-----------------------------------------//
			Date now = new Date();

			//小车移动到提升机中 101.生成小车移库任务 ==> 102.小车到提升机中
			//小车移动至站点 101.生成小车移库任务 ==> 102.小车移动至站点中
			if (wrkMast.getWrkSts() == 101) {
			//获取四向穿梭车线程
			NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
			@@ -2018,7 +2663,7 @@
			}

			//小车处于空闲状态
			if (!shuttleProtocol.isIdleNoCharge()) {
			if (!shuttleProtocol.isIdleNoCharge(wrkMast.getWrkNo())) {
			return false;
			}

			@@ -2028,71 +2673,32 @@
			}

			if (Utils.getLev(wrkMast.getLocNo()) == shuttleProtocol.getPoint().getZ()) {
			//目标库位和小车库位处于同一楼层，需要通过提升机调度
			return true;//直接进入108.小车移动中
			//目标库位和小车库位处于同一楼层，不需要通过提升机调度
			wrkMast.setWrkSts(109L);// 109.小车迁出提升机完成 ==> 110.小车移动中
			wrkMast.setModiTime(now);
			shuttleProtocol.setToken(wrkMast.getWrkNo());//独占该小车令牌
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			return true;//直接进入109.小车迁出提升机完成 ==> 110.小车移动中
			}
			return false;
			}

			//计算距离小车最近的提升机站点
			//查询小车所在楼层提升机输送站点
			int recentAllDistance = 9999999;//默认最近距离
			BasDevp recentDevp = null;//最近站点
			List<BasDevp> basDevps = basDevpService.selectHasLiftNoByLev(shuttleProtocol.getPoint().getZ());
			for (BasDevp basDevp : basDevps) {
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basDevp.getLiftNo());
			if (liftThread == null) {
			continue;
			}
			LiftProtocol liftProtocol = liftThread.getLiftProtocol();
			if (liftProtocol == null) {
			continue;
			}
			if (!liftProtocol.isIdle()) {
			continue;
			}

			//计算路径
			List<NavigateNode> calc = NavigateUtils.calc(shuttleProtocol.getCurrentLocNo(), basDevp.getLocNo(), NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleThread.getSlave().getId(), Utils.getLev(shuttleProtocol.getCurrentLocNo())));
			if (calc == null) {
			continue;//计算失败，找下一个站点
			}

			Integer allDistance = NavigateUtils.getOriginPathAllDistance(calc);//根据原始节点结果，计算总行走距离
			if (recentAllDistance > allDistance) {
			recentAllDistance = allDistance;//更新距离
			recentDevp = basDevp;//更新输送站点
			}
			//获取源输送站
			LiftStaProtocol liftSta = NyLiftUtils.getLiftStaByStaNo(wrkMast.getSourceStaNo());
			if (liftSta == null) {
			return false;//找不到站点
			}

			if (recentDevp == null) {
			//没有找到可用输送站点
			return false;//等待下一次轮询
			}

			//获取提升机数据
			BasLift basLift = basLiftService.selectById(recentDevp.getLiftNo());
			if (basLift == null) {
			return false;//没有提升机数据
			}
			if (basLift.getPoint() == null) {
			return false;//没有设置提升机点位坐标
			}
			//判断提升机是否有其他任务
			WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(basLift.getLiftNo());
			//判断提升机是否有其他任务(该任务需要换层必须提前独占提升机)
			WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftSta.getLiftNo());
			if (liftWrkMast != null) {
			return false;//当前提升机存在未完成任务，等待下一次轮询
			}
			NavigateNode liftNode = new NavigateNode(basLift.getPoint().getX(), basLift.getPoint().getY());
			liftNode.setZ(basLift.getPoint().getZ());

			//获取小车到输送站点行走命令
			NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), recentDevp.getLocNo());
			//获取小车进提升机行走命令
			NyShuttleHttpCommand moveCommand = NyHttpUtils.getInOutLiftCommand(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), NavigatePositionConvert.locNoToNode(recentDevp.getLocNo()), liftNode, true);
			if (result.getCommands() == null) {
			return false;//路径计算失败
			}
			NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), liftSta.getLocNo(), NavigationMapType.NORMAL.id);
			List<NyShuttleHttpCommand> commands = result.getCommands();
			commands.add(moveCommand);//添加小车迁入提升机命令

			ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
			assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo()); // 四向穿梭车编号
			@@ -2102,31 +2708,62 @@
			assignCommand.setCommands(commands);
			assignCommand.setNodes(result.getNodes());

			wrkMast.setWrkSts(102L);//小车移动到提升机中 101.生成小车移库任务 ==> 102.小车到提升机中
			wrkMast.setLiftNo(basLift.getLiftNo());//提升机号(锁定提升机防止被其他任务抢占)
			wrkMast.setWrkSts(102L);//小车移动到提升机中 101.生成小车移库任务 ==> 102.小车移动至站点
			wrkMast.setModiTime(now);
			wrkMast.setLiftNo(liftSta.getLiftNo());//提前锁定提升机
			shuttleProtocol.setToken(wrkMast.getWrkNo());//独占该小车令牌
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
			return false;
			}
			return false;
			}
			return true;
			}

			/**
			* 小车迁移-提升机搬运中
			* 小车迁移-小车迁入提升机
			* 如需主方法执行continue，请返回false
			* ps:返回值true并不代表该方法执行成功，返回值仅做标记用于主方法是否执行continue
			*/
			private boolean shuttleMoveExecuteStep2(WrkMast wrkMast) {
			//--------------------------------------提升机搬运中-----------------------------------------//
			private boolean shuttleMoveExecuteStepIntoLift(WrkMast wrkMast) {
			//--------------------------------------小车迁入提升机-----------------------------------------//
			Date now = new Date();

			//提升机搬运中 103.小车到提升机完成 ==> 104.提升机搬运中
			//小车移动到提升机中 103.小车移动至站点完成 ==> 104.小车迁入提升机中
			if (wrkMast.getWrkSts() == 103) {
			//获取源站
			LiftStaProtocol sourceLiftSta = NyLiftUtils.getLiftStaByStaNo(wrkMast.getSourceStaNo());
			if (sourceLiftSta == null) {
			return false;//找不到站点
			}

			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast.getLiftNo());
			//获取目标输送站
			LiftStaProtocol liftSta = NyLiftUtils.getLiftStaByStaNo(wrkMast.getStaNo());
			if (liftSta == null) {
			return false;//找不到站点
			}

			//获取提升机数据
			BasLift basLift = basLiftService.selectById(liftSta.getLiftNo());
			if (basLift == null) {
			return false;//没有提升机数据
			}

			if (basLift.getPoint() == null) {
			return false;//没有设置提升机点位坐标
			}

			//判断提升机是否有其他任务
			WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(basLift.getLiftNo());
			if (liftWrkMast != null) {
			if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//提升机任务和当前任务不相同
			return false;//当前提升机存在未完成任务，等待下一次轮询
			}
			}

			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSta.getLiftNo());
			if (liftThread == null) {
			return false;
			}
			@@ -2134,12 +2771,9 @@
			if (liftProtocol == null) {
			return false;
			}

			if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
			return false;
			}
			//判断提升机令牌是否未被占领
			if (liftProtocol.getToken() != 0) {
			return false;//提升机已被独占，禁止再派发任务
			}

			//获取四向穿梭车线程
			@@ -2153,54 +2787,116 @@
			}

			//小车处于空闲状态
			if (!shuttleProtocol.isIdleNoCharge()) {
			if (!shuttleProtocol.isIdleNoCharge(wrkMast.getWrkNo())) {
			return false;
			}

			//获取源站对应的输送站点
			BasDevp sourceBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getSourceLocNo()), liftProtocol.getLiftNo().intValue());
			//获取目标站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getLocNo()), liftProtocol.getLiftNo().intValue());
			if (sourceBasDevp == null \|\| targetBasDevp == null) {
			return false;//缺少站点信息
			//小车令牌是否被任务独占
			if (!shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			return false;
			}

			//获取提升机命令
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_CAR.id, sourceBasDevp.getDevNo(), targetBasDevp.getDevNo(), wrkMast.getWrkNo());
			//判断提升机楼层
			if (liftProtocol.getLev().intValue() != shuttleProtocol.getPoint().getZ()) {
			//提升机不在小车楼层
			//调度提升机

			ArrayList<NyLiftCommand> commands = new ArrayList<>();
			commands.add(liftCommand);
			if (liftProtocol.getToken() != 0) {
			return false;//提升机令牌被占用
			}

			//提交到线程去工作
			LiftAssignCommand assignCommand = new LiftAssignCommand();
			//获取提升机命令，调度提升机到源站位置
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_CAR.id, sourceLiftSta.getStaNo(), sourceLiftSta.getStaNo(), wrkMast.getWrkNo());

			Random random = new Random();
			int deviceWrk = Math.abs((liftCommand.getTaskNo().intValue() + random.nextInt(9999)));//获取设备工作号
			liftCommand.setTaskNo((short) deviceWrk);//更换随机任务号

			ArrayList<NyLiftCommand> commands = new ArrayList<>();
			commands.add(liftCommand);

			//提交到线程去工作
			LiftAssignCommand assignCommand = new LiftAssignCommand();
			assignCommand.setCommands(commands);
			assignCommand.setLiftNo(liftProtocol.getLiftNo());
			assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
			assignCommand.setTaskMode(NyLiftTaskModelType.MOVE_CAR.id.shortValue());
			assignCommand.setAuto(false);

			wrkMast.setLiftNo(liftThread.getSlave().getId());//锁定提升机防止被占用
			wrkMast.setModiTime(now);
			liftProtocol.setToken(wrkMast.getShuttleNo());//提升机令牌绑定当前小车
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, assignCommand));
			}
			return false;//等待提升机到小车楼层
			}

			if (liftProtocol.getToken() == 0) {//提升机令牌未被占用
			//独占提升机
			liftProtocol.setToken(wrkMast.getShuttleNo());
			return false;//等待下一次执行
			}

			//判断提升机令牌是否为当前小车
			if (!liftProtocol.getToken().equals(wrkMast.getShuttleNo())) {
			return false;//提升机已被独占，禁止再派发任务
			}

			//判断小车是否为当前任务独占
			if (!shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			return false;
			}

			//站点节点
			NavigateNode staNode = NavigatePositionConvert.locNoToNode(sourceLiftSta.getLocNo());

			//提升机节点
			NavigateNode liftNode = new NavigateNode(basLift.getPoint$().getX(), basLift.getPoint$().getY());
			liftNode.setZ(staNode.getZ());

			//获取小车进提升机行走命令
			NyShuttleHttpCommand moveCommand = NyHttpUtils.getInOutLiftCommand(wrkMast.getShuttleNo(), wrkMast.getWrkNo(), staNode, liftNode, true);
			List<NyShuttleHttpCommand> commands = new ArrayList<>();
			commands.add(moveCommand);
			List<NavigateNode> nodes = new ArrayList<>();//行走节点路径
			nodes.add(staNode);
			nodes.add(liftNode);

			ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
			assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo()); // 四向穿梭车编号
			assignCommand.setTaskMode(ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO.id.shortValue());//小车移库任务
			assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());//任务号
			assignCommand.setAuto(true);//自动模式
			assignCommand.setCommands(commands);
			assignCommand.setLiftNo(liftProtocol.getLiftNo());
			assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
			assignCommand.setTaskMode(NyLiftTaskModelType.MOVE_CAR.id.shortValue());
			assignCommand.setNodes(nodes);

			wrkMast.setWrkSts(104L);//提升机搬运中 103.小车到提升机完成 ==> 104.提升机搬运中
			wrkMast.setLiftNo(liftThread.getSlave().getId());//锁定提升机防止被占用
			wrkMast.setWrkSts(104L);//小车移动到提升机中 103.小车移动至站点完成 ==> 104.小车迁入提升机中
			wrkMast.setModiTime(now);
			liftProtocol.setToken(wrkMast.getWrkNo());//独占提升机令牌
			wrkMast.setLiftNo(liftThread.getSlave().getId());//锁定提升机防止被占用
			liftProtocol.setToken(wrkMast.getShuttleNo());//提升机令牌绑定当前小车
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, assignCommand));
			MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
			return false;
			}

			return false;
			}

			return true;
			}

			/**
			* 小车迁移-小车迁出提升机中
			* 小车迁移-提升机搬运中
			* 如需主方法执行continue，请返回false
			* ps:返回值true并不代表该方法执行成功，返回值仅做标记用于主方法是否执行continue
			*/
			private boolean shuttleMoveExecuteStep3(WrkMast wrkMast) {
			//--------------------------------------小车迁出提升机中-----------------------------------------//
			private boolean shuttleMoveExecuteStepLiftMove(WrkMast wrkMast) {
			//--------------------------------------提升机搬运中-----------------------------------------//
			Date now = new Date();

			//小车迁出提升机中 105.提升机搬运完成 ==> 106.小车迁出提升机中
			//提升机搬运中 105.小车迁入提升机完成 ==> 106.提升机搬运中
			if (wrkMast.getWrkSts() == 105) {

			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast.getLiftNo());
			@@ -2214,10 +2910,22 @@
			if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
			return false;
			}
			//判断提升机是否有其他任务
			WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftThread.getSlave().getId());
			if (liftWrkMast != null) {
			if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//提升机任务和当前任务不相同
			return false;//当前提升机存在未完成任务，等待下一次轮询
			}
			}

			//判断提升机令牌是否为当前任务
			if (liftProtocol.getToken() != wrkMast.getWrkNo()) {
			return false;
			//判断提升机令牌是否为当前小车
			if (!liftProtocol.getToken().equals(wrkMast.getShuttleNo())) {
			return false;//提升机令牌和当前小车不一致，禁止派发
			}

			//判断提升机内是否有小车
			if (!liftProtocol.getHasCar()) {
			return false;//提升机内无小车
			}

			//获取四向穿梭车线程
			@@ -2235,61 +2943,53 @@
			return false;
			}

			//判断小车令牌是否为当前任务
			if (shuttleProtocol.getToken() != wrkMast.getWrkNo()) {
			//判断小车是否为当前任务独占
			if (!shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			return false;
			}

			//获取目标站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getLocNo()), liftProtocol.getLiftNo().intValue());
			if (targetBasDevp == null) {
			//获取源站
			LiftStaProtocol sourceLiftSta = NyLiftUtils.getLiftStaByStaNo(wrkMast.getSourceStaNo());
			//获取目标站
			LiftStaProtocol liftSta = NyLiftUtils.getLiftStaByStaNo(wrkMast.getStaNo());
			if (sourceLiftSta == null \|\| liftSta == null) {
			return false;//缺少站点信息
			}

			//获取提升机数据
			BasLift basLift = basLiftService.selectById(targetBasDevp.getLiftNo());
			if (basLift == null) {
			return false;//没有提升机数据
			}
			if (basLift.getPoint() == null) {
			return false;//没有设置提升机点位坐标
			}
			NavigateNode liftNode = new NavigateNode(basLift.getPoint().getX(), basLift.getPoint().getY());
			liftNode.setZ(basLift.getPoint().getZ());
			//获取提升机命令
			NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_CAR.id, sourceLiftSta.getStaNo(), liftSta.getStaNo(), wrkMast.getWrkNo());

			List<NyShuttleHttpCommand> commands = new ArrayList<>();
			//获取小车出提升机行走命令
			NyShuttleHttpCommand moveCommand = NyHttpUtils.getInOutLiftCommand(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), liftNode, NavigatePositionConvert.locNoToNode(targetBasDevp.getLocNo()), false);
			commands.add(moveCommand);//添加小车迁出提升机命令
			ArrayList<NyLiftCommand> commands = new ArrayList<>();
			commands.add(liftCommand);

			ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
			assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo()); // 四向穿梭车编号
			assignCommand.setTaskMode(ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO.id.shortValue());//小车移库任务
			assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());//任务号
			assignCommand.setAuto(true);//自动模式
			//提交到线程去工作
			LiftAssignCommand assignCommand = new LiftAssignCommand();
			assignCommand.setCommands(commands);
			assignCommand.setNodes(null);
			assignCommand.setLiftNo(liftProtocol.getLiftNo());
			assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
			assignCommand.setTaskMode(NyLiftTaskModelType.MOVE_CAR.id.shortValue());

			wrkMast.setWrkSts(106L);//小车迁出提升机中 105.提升机搬运完成 ==> 106.小车迁出提升机中
			wrkMast.setWrkSts(106L);//提升机搬运中 105.小车迁入提升机完成 ==> 106.提升机搬运中
			wrkMast.setLiftNo(liftThread.getSlave().getId());//锁定提升机防止被占用
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
			MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, assignCommand));
			}

			}
			return true;
			}

			/**
			* 小车迁移-小车移动到目标库位中
			* 小车迁移-小车迁出提升机
			* 如需主方法执行continue，请返回false
			* ps:返回值true并不代表该方法执行成功，返回值仅做标记用于主方法是否执行continue
			*/
			private boolean shuttleMoveExecuteStep4(WrkMast wrkMast) {
			//--------------------------------------小车移动到目标库位中-----------------------------------------//
			private boolean shuttleMoveExecuteStepOutLift(WrkMast wrkMast) {
			//--------------------------------------小车迁出提升机-----------------------------------------//
			Date now = new Date();

			//小车移动到目标库位中 107.小车迁出提升机完成 ==> 108.小车移动中
			//小车移动到提升机中 107.提升机搬运完成 ==> 108.小车迁出提升机中
			if (wrkMast.getWrkSts() == 107) {

			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast.getLiftNo());
			@@ -2300,6 +3000,22 @@
			if (liftProtocol == null) {
			return false;
			}
			if (!liftProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
			return false;
			}

			//判断提升机是否有其他任务
			WrkMast liftWrkMast = wrkMastMapper.selectLiftWrkMast(liftThread.getSlave().getId());
			if (liftWrkMast != null) {
			if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//提升机任务和当前任务不相同
			return false;//当前提升机存在未完成任务，等待下一次轮询
			}
			}

			//判断提升机令牌是否为当前小车
			if (!liftProtocol.getToken().equals(wrkMast.getShuttleNo())) {
			return false;//提升机令牌和当前小车不一致，禁止派发
			}

			//获取四向穿梭车线程
			NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
			@@ -2316,31 +3032,136 @@
			return false;
			}

			//判断小车令牌是否为当前任务
			if (shuttleProtocol.getToken() != wrkMast.getWrkNo()) {
			//判断小车是否为当前任务独占
			if (!shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			return false;
			}

			//获取目标站对应的输送站点
			BasDevp targetBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getLocNo()), wrkMast.getLiftNo());
			if (targetBasDevp == null) {
			return false;//缺少站点信息
			//获取目标站
			LiftStaProtocol liftSta = NyLiftUtils.getLiftStaByStaNo(wrkMast.getStaNo());
			if (liftSta == null) {
			return false;//找不到站点
			}

			//获取提升机数据
			BasLift basLift = basLiftService.selectById(targetBasDevp.getLiftNo());
			BasLift basLift = basLiftService.selectById(liftProtocol.getLiftNo().intValue());
			if (basLift == null) {
			return false;//没有提升机数据
			}
			if (basLift.getPoint() == null) {
			return false;//没有设置提升机点位坐标
			}
			NavigateNode liftNode = new NavigateNode(basLift.getPoint().getX(), basLift.getPoint().getY());
			liftNode.setZ(basLift.getPoint().getZ());
			NavigateNode liftNode = new NavigateNode(basLift.getPoint$().getX(), basLift.getPoint$().getY());
			liftNode.setZ(liftSta.getLev());

			//获取小车从输送站到目标库位命令
			NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), targetBasDevp.getLocNo(), wrkMast.getLocNo());
			if (result.getCommands() == null) {
			List<NyShuttleHttpCommand> commands = new ArrayList<>();
			//获取小车更新楼层命令
			NyShuttleHttpCommand updateZCommand = NyHttpUtils.getUpdateZCommand(shuttleThread.getSlave().getId(), liftProtocol.getLev().intValue(), wrkMast.getWrkNo());
			commands.add(updateZCommand);

			//获取小车出提升机行走命令
			NyShuttleHttpCommand moveCommand = NyHttpUtils.getInOutLiftCommand(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), liftNode, NavigatePositionConvert.locNoToNode(liftSta.getLocNo()), false);
			commands.add(moveCommand);//添加小车迁出提升机命令

			ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
			assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo()); // 四向穿梭车编号
			assignCommand.setTaskMode(ShuttleTaskModeType.SHUTTLE_MOVE_LOC_NO.id.shortValue());//小车移库任务
			assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());//任务号
			assignCommand.setAuto(true);//自动模式
			assignCommand.setCommands(commands);
			assignCommand.setNodes(null);

			wrkMast.setWrkSts(108L);//小车迁出提升机中 107.提升机搬运完成 ==> 108.小车迁出提升机中
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
			return false;
			}
			return false;
			}
			return true;
			}

			/**
			* 小车迁移-小车移动到目标库位中
			* 如需主方法执行continue，请返回false
			* ps:返回值true并不代表该方法执行成功，返回值仅做标记用于主方法是否执行continue
			*/
			private boolean shuttleMoveExecuteStepMoveLoc(WrkMast wrkMast) {
			//--------------------------------------小车移动到目标库位中-----------------------------------------//
			Date now = new Date();

			//小车移动到目标库位中 109.小车迁出提升机完成 ==> 110.小车移动中
			if (wrkMast.getWrkSts() == 109) {

			//获取四向穿梭车线程
			NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
			if (shuttleThread == null) {
			return false;
			}
			NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
			if (shuttleProtocol == null) {
			return false;
			}

			//小车处于空闲状态
			if (!shuttleProtocol.isIdleNoCharge(wrkMast.getWrkNo())) {
			return false;
			}

			//判断小车令牌是否为当前任务
			if (shuttleProtocol.getToken() != 0 && !shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			return false;
			}

			// //获取目标站对应的输送站点
			// BasDevp targetBasDevp = basDevpService.selectByLevAndLiftNo(Utils.getLev(wrkMast.getLocNo()), wrkMast.getLiftNo());
			// if (targetBasDevp == null) {
			// return false;//缺少站点信息
			// }
			//
			// //获取提升机数据
			// BasLift basLift = basLiftService.selectById(targetBasDevp.getLiftNo());
			// if (basLift == null) {
			// return false;//没有提升机数据
			// }
			// if (basLift.getPoint() == null) {
			// return false;//没有设置提升机点位坐标
			// }
			// NavigateNode liftNode = new NavigateNode(basLift.getPoint$().getX(), basLift.getPoint$().getY());
			// liftNode.setZ(basLift.getPoint$().getZ());

			//小车已经在目标库位，直接认定小车移动任务完成
			if (shuttleProtocol.getCurrentLocNo().equals(wrkMast.getLocNo())) {
			if (shuttleProtocol.getToken().equals(wrkMast.getWrkNo())) {
			//释放小车令牌
			shuttleProtocol.setToken(0);
			}
			wrkMast.setWrkSts(111L);//111.小车移动完成
			wrkMast.setLiftNo(null);//释放提升机
			wrkMast.setModiTime(now);
			wrkMastMapper.updateById(wrkMast);

			shuttleProtocol.setShuttleNo((short) 0);//释放小车
			shuttleProtocol.setToken(0);//释放小车

			if (wrkMast.getWrkSts() == 111) {
			// 保存工作主档历史档
			if (wrkMastLocMapper.save(wrkMast.getWrkNo()) <= 0) {
			log.info("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
			}
			// 删除工作主档
			if (!wrkMastService.deleteById(wrkMast)) {
			log.info("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
			}
			}
			return false;
			}

			//获取小车到目标库位命令
			NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleThread.getSlave().getId(), wrkMast.getWrkNo(), shuttleProtocol.getCurrentLocNo(), wrkMast.getLocNo(), NavigationMapType.NORMAL.id);
			if (result == null) {
			return false;//路径计算失败
			}
			List<NyShuttleHttpCommand> commands = result.getCommands();
			@@ -2352,11 +3173,27 @@
			assignCommand.setAuto(true);//自动模式
			assignCommand.setCommands(commands);
			assignCommand.setNodes(result.getNodes());
			assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//源库位
			assignCommand.setLocNo(wrkMast.getLocNo());//目标库位

			wrkMast.setWrkSts(108L);//小车移动到目标库位中 107.小车迁出提升机完成 ==> 108.小车移动中
			if (wrkMast.getLiftNo() != null) {
			LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast.getLiftNo());
			if (liftThread == null) {
			return false;
			}
			LiftProtocol liftProtocol = liftThread.getLiftProtocol();
			if (liftProtocol == null) {
			return false;
			}
			if (liftProtocol.getToken().equals(shuttleProtocol.getShuttleNo().intValue())) {
			liftProtocol.setToken(0);//释放提升机令牌
			}
			}

			wrkMast.setWrkSts(110L);//小车移动到目标库位中 109.小车迁出提升机完成 ==> 110.小车移动中
			wrkMast.setLiftNo(null);//释放提升机
			wrkMast.setModiTime(now);
			liftProtocol.setToken(0);//释放提升机令牌

			if (wrkMastMapper.updateById(wrkMast) > 0) {
			//下发任务
			MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));