zy-wcs.git - Gitblit

			@@ -405,6 +405,126 @@
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历拣料入库口
			for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
			if (pickSta.getStaNo() == 325 \|\| pickSta.getStaNo() == 331 \|\| pickSta.getStaNo() == 333 \|\| pickSta.getStaNo() == 339) {
			continue;
			}

			// 获取拣料入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			if (staProtocol.isAutoing()
			&& staProtocol.isLoading()
			&& staProtocol.isInEnable()
			// && (staProtocol.getWorkNo() > 0)
			&& staProtocol.isPakMk()){

			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if(Cools.isEmpty(barcode)) {
			continue;
			}
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "empty".equals(barcode)) {
			continue;
			}

			WrkMast wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode);
			if (wrkMast == null) {//找不到工作档
			continue;
			}

			if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
			\|\| Cools.isEmpty(wrkMast.getStaNo()) \|\| Cools.isEmpty(wrkMast.getSourceStaNo()) ) {
			continue;
			}

			//*******************同库位组校验*******************
			boolean flag = false;
			String th = "";
			List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
			for (String loc : innerLoc) {
			LocMast locMast = locMastService.selectById(loc);
			if (locMast == null) {
			continue;
			}

			if (!locMast.getLocSts().equals("F")) {
			flag = true;
			th = loc + "库位存在未回库任务";
			break;
			}
			}
			if (flag) {
			News.info(th);
			continue;
			}
			//*******************同库位组校验*******************

			// 保存工作主档历史档
			if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
			News.info(wrkMast.getWrkNo() + "保存工作主档历史档失败");
			continue;
			}

			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.getBackSta()); // 源站
			// 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) {
			News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			continue;
			}
			if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
			News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			continue;
			}

			// 修改库位状态 Q.拣料/盘点/并板再入库
			LocMast locMast = locMastService.selectById(sourceLocNo);
			locMast.setLocSts("Q");
			locMast.setModiTime(new Date());
			if (!locMastService.updateById(locMast)) {
			News.info("修改库位状态失败");
			continue;
			}
			}
			}

			}
			}

			/**
			* 拣料、并板、盘点再入库(325、331、333、339)
			*/
			@Transactional
			public synchronized void stnToCrnStnPick2(){
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历拣料入库口
			for (DevpSlave.Sta pickSta : devp.getPickInSta()) {
			if (!(pickSta.getStaNo() == 325 \|\| pickSta.getStaNo() == 331 \|\| pickSta.getStaNo() == 333 \|\| pickSta.getStaNo() == 339)) {
			continue;
			}

			// 获取拣料入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			@@ -442,18 +562,20 @@

			if (!locMast.getLocSts().equals("F")) {
			flag = true;
			th = loc + "库位存在非空浅库位";
			th = loc + "库位存在未回库任务";
			break;
			}
			}
			if (flag) {
			throw new CoolException(th);
			News.info(th);
			continue;
			}
			//*******************同库位组校验*******************

			// 保存工作主档历史档
			if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
			throw new CoolException(wrkMast.getWrkNo() + "保存工作主档历史档失败");
			News.info(wrkMast.getWrkNo() + "保存工作主档历史档失败");
			continue;
			}

			String sourceLocNo = wrkMast.getSourceLocNo().trim();
			@@ -465,7 +587,7 @@
			// 更新工作档数据状态
			wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
			wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
			wrkMast.setSourceStaNo(pickSta.getStaNo()); // 源站
			wrkMast.setSourceStaNo(pickSta.getBackSta()); // 源站
			// wrkMast.setStaNo(dto.getStaNo()); // 目标站
			// wrkMast.setCrnNo(dto.getCrnNo());
			wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站
			@@ -474,10 +596,12 @@
			wrkMast.setLiftNo(null);// 提升机清空
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			continue;
			}
			if (wrkMastMapper.setSteEmpty(wrkMast.getWrkNo()) == 0) {
			throw new CoolException(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			continue;
			}

			// 修改库位状态 Q.拣料/盘点/并板再入库
			@@ -485,10 +609,10 @@
			locMast.setLocSts("Q");
			locMast.setModiTime(new Date());
			if (!locMastService.updateById(locMast)) {
			throw new CoolException("修改库位状态失败");
			News.info("修改库位状态失败");
			continue;
			}

			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());//写入工作号
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());//写入目标站
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			@@ -1280,6 +1404,28 @@
			if (!sourceBasDevp.getInEnable().equals("Y")) {
			News.info("{}任务，{}源站，没有可入信号", wrkMast.getWrkNo(), sourceBasDevp.getDevNo());
			return false;//站点不可入
			}

			Integer barcodeId = Utils.getBarcodeIdByStaNo(wrkMast.getSourceStaNo());
			if (barcodeId == null) {
			News.info("{}任务，{}源站，找不到可用条码器ID", wrkMast.getWrkNo(), sourceBasDevp.getDevNo());
			return false;//站点不可入
			}

			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
			if (barcodeThread == null) {
			News.info("{}任务，{}源站，条码器{}线程为空", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId);
			return false;//站点不可入
			}
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode)) {
			if(!("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "empty".equals(barcode))) {
			//存在条码值，判断是否和当前工作档一致
			if (!barcode.equals(wrkMast.getBarcode())) {
			News.info("{}任务，条码器{}值{}与工作档条码值不一致，系统跳过执行", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId, barcode);
			return false;//站点不可入
			}
			}
			}

			//判断提升机整个三楼是否都处于入库模式
			@@ -2343,7 +2489,9 @@
			RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetls.size(), "303");
			}
			}
			}else if (staProtocol317.isAutoing() && staProtocol317.isLoading() && staProtocol317.getWorkNo() != 0) {
			}

			if (staProtocol317.isAutoing() && staProtocol317.isLoading() && staProtocol317.getWorkNo() != 0) {
			//调度机械臂
			//查询是否有工作档
			WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol317.getWorkNo().intValue());
			@@ -2871,9 +3019,18 @@
			continue;
			}

			if (shuttleProtocol.getVoltage() < 5630) {
			continue;//电压不够继续充电
			//*************判断是否满充校准*************
			EntityWrapper<Config> wrapper1 = new EntityWrapper<>();
			wrapper.eq("code", "shuttleMaxPowerVerify");
			Config config1 = configService.selectOne(wrapper1);
			if (config1 != null) {
			if (config1.getValue().equals("true")) {
			if (shuttleProtocol.getVoltage() < 5630) {
			continue;//电压不够继续充电
			}
			}
			}
			//*************判断是否满充校准*************

			//小车满电，结束充电任务
			NyShuttleHttpCommand chargeCommand = NyHttpUtils.getChargeCommand(shuttle.getId(), wrkCharge.getWrkNo(), false);