zy-wcs.git - Gitblit

			@@ -970,11 +970,11 @@
			}

			// 置顶任务
			wrkMast.setIoPri((double) 9999);
			wrkMast.setIoPri((double) 9998);
			wrkMastMapper.updateById(wrkMast);

			// 判断是否为穿梭库
			if (!locMastService.isShuttle(wrkMast.getLocNo())) {
			if (!locMastService.isShuttle(wrkMast.getSourceLocNo())) {

			// 双深库位且浅库位有货，则需先对浅库位进行库位移转
			if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
			@@ -987,7 +987,7 @@
			log.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
			} else {
			if(waitWrkMast.getWrkSts() == 11) {
			waitWrkMast.setIoPri(20D);
			waitWrkMast.setIoPri(wrkMast.getIoPri() + 1);
			waitWrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(waitWrkMast) == 0) {
			log.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
			@@ -1106,6 +1106,9 @@
			wrkMast.setSteNo(steNo);
			wrkMast.setCrnStrTime(now);
			wrkMast.setModiTime(now);
			LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
			Integer outCrnNo = locMastService.getOutCrnNo(locMast);
			wrkMast.setCrnNo(outCrnNo);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 14.小车搬出库失败！！，工作号={}", wrkMast.getWrkNo());
			}
			@@ -1327,7 +1330,14 @@
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { continue; }
			if (!steProtocol.isIdle()) { continue; }
			if (steProtocol.getRow() == 1) { continue; }
			String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
			// 如果在同一个库位组
			if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
			&& steProtocol.getBay().intValue() == Utils.getBay(locNo)
			&& steProtocol.getLev().intValue() == Utils.getLev(locNo)) {
			return steThread;
			}
			LocMast locMast = locMastService.selectById(locNo);
			int lev = locMast.getLev1();
			int bay = locMast.getBay1();
			@@ -1853,6 +1863,9 @@
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
			Integer outCrnNo = locMastService.getOutCrnNo(locMast);
			wrkMast.setCrnNo(outCrnNo);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 堆垛机复位
			@@ -2534,7 +2547,7 @@
			SteChargeType first = SteChargeType.FIRST;
			locNo = first.locNo;
			if (basSteService.hasCarOfLocNo(locNo) == null
			&& wrkChargeService.selectWorkingOfCharge(first.ssbm) != null) {
			&& wrkChargeService.selectWorkingOfCharge(first.ssbm) == null) {
			steCharge = first;
			break;
			}
			@@ -2543,7 +2556,7 @@
			SteChargeType second = SteChargeType.SECOND;
			locNo = second.locNo;
			if (basSteService.hasCarOfLocNo(locNo) == null
			&& wrkChargeService.selectWorkingOfCharge(second.ssbm) != null) {
			&& wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
			steCharge = second;
			break;
			}
			@@ -2552,7 +2565,7 @@
			SteChargeType third = SteChargeType.THIRD;
			locNo = third.locNo;
			if (basSteService.hasCarOfLocNo(locNo) == null
			&& wrkChargeService.selectWorkingOfCharge(third.ssbm) != null) {
			&& wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
			steCharge = third;
			break;
			}
			@@ -2578,6 +2591,40 @@
			if (!wrkChargeService.insert(wrkCharge)) {
			log.error("保存{}号穿梭车充电任务失败!!!", ste.getId());
			continue;
			}

			// 小车处于通道
			List<String> channel = slaveProperties.getChannel();
			for (String channelLocNo : channel) {
			if (steProtocol.getRow().intValue() == Utils.getRow(channelLocNo)
			&& steProtocol.getBay().intValue() == Utils.getBay(channelLocNo)
			&& steProtocol.getLev().intValue() == Utils.getLev(channelLocNo)) {
			Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
			if (null != otherSte) {
			log.warn("{}号小车充电阻断，原因：通道存在{}号穿梭车！", wrkCharge.getSteNo(), otherSte);
			} else {
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.GO_ORIGIN); // 去右端

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 21.准备充电 ===> 25.小车走行
			wrkCharge.setWrkSts(25L);
			Date now = new Date();
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 21.准备充电 ===> 25.小车走行失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			}
			}

			// 处于充电库位组
			@@ -2788,22 +2835,31 @@
			if (Cools.isEmpty(steProtocol, basSte)) {
			continue;
			}
			// 1号充电桩
			if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
			if (steProtocol.getCharge() < 99) {
			continue;
			}
			// 2号充电桩
			if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
			if (steProtocol.getMode() == 0) {
			continue;
			}
			// 3号充电桩
			if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
			if (!steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
			continue;
			}
			// 小车是否处于充电状态
			if (steProtocol.getChargeStatus() == 1) {
			continue;
			}
			// // 1号充电桩
			// if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
			// continue;
			// }
			// // 2号充电桩
			// if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
			// continue;
			// }
			// // 3号充电桩
			// if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
			// continue;
			// }
			// // 小车是否处于充电状态
			// if (steProtocol.getChargeStatus() == 1) {
			// continue;
			// }
			// case 1 : 自动充电开馈电 ×
			// case 2 : 自动充电开满电 ✔
			// case 3 : 自动充电关馈电 ✔
			@@ -2873,7 +2929,7 @@
			crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 源库位排
			crnCommand.setSourcePosX(steProtocol.getRow()); // 源库位排
			crnCommand.setSourcePosY(steProtocol.getBay()); // 源库位列
			crnCommand.setSourcePosZ(steProtocol.getLev()); // 源库位层
			crnCommand.setDestinationPosX(Utils.getGroupRow(channelLoc.getLocNo(), false).shortValue()); // 目标库位排