zy-wcs.git - Gitblit

			@@ -450,27 +450,27 @@
			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;
			}
			//*******************同库位组校验*******************
			// //*******************同库位组校验*******************
			// 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) {
			@@ -478,35 +478,51 @@
			continue;
			}

			String sourceLocNo = wrkMast.getSourceLocNo().trim();
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//获取回库提升机目标站
			if (liftStaProtocol == null) {
			continue;
			}
			try {
			LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());//源库位
			SearchLocParam param = new SearchLocParam();
			param.setWrkNo(wrkMast.getWrkNo());
			param.setBarcode(wrkMast.getBarcode());
			param.setIoType(wrkMast.getIoType());
			param.setSourceStaNo(pickSta.getStaNo());
			param.setLocType1(locMast.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v2")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			Integer code = jsonObject.getInteger("code");
			if (code.equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			// 更新工作档数据状态
			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;
			}
			//获取回库提升机目标站
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));
			if (liftStaProtocol == null) {
			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;
			// 更新工作档数据状态
			wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54
			wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
			wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站
			wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站
			wrkMast.setLocNo(dto.getLocNo()); // 目标库位
			wrkMast.setShuttleNo(null); // 穿梭车清空
			wrkMast.setLiftNo(null);// 提升机清空
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			continue;
			}
			} else if (code == 500) {
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}
			}
			@@ -554,27 +570,27 @@
			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;
			}
			//*******************同库位组校验*******************
			// //*******************同库位组校验*******************
			// 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) {
			@@ -582,39 +598,55 @@
			continue;
			}

			String sourceLocNo = wrkMast.getSourceLocNo().trim();
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(sourceLocNo));//获取回库提升机目标站
			if (liftStaProtocol == null) {
			continue;
			}
			try {
			LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());//源库位
			SearchLocParam param = new SearchLocParam();
			param.setWrkNo(wrkMast.getWrkNo());
			param.setBarcode(wrkMast.getBarcode());
			param.setIoType(wrkMast.getIoType());
			param.setSourceStaNo(pickSta.getStaNo());
			param.setLocType1(locMast.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v2")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			Integer code = jsonObject.getInteger("code");
			if (code.equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			// 更新工作档数据状态
			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;
			}
			//获取回库提升机目标站
			LiftStaProtocol liftStaProtocol = NyLiftUtils.getLiftStaByLev(pickSta.getLiftNo(), Utils.getLev(dto.getLocNo()));
			if (liftStaProtocol == null) {
			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;
			}
			// 更新工作档数据状态
			wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54
			wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
			wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 源站
			wrkMast.setStaNo(liftStaProtocol.getStaNo());//目标站
			wrkMast.setLocNo(dto.getLocNo()); // 目标库位
			wrkMast.setShuttleNo(null); // 穿梭车清空
			wrkMast.setLiftNo(null);// 提升机清空
			wrkMast.setModiTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			News.info(wrkMast.getWrkNo() + "更新工作档数据状态失败");
			continue;
			}

			staProtocol.setStaNo(pickSta.getBackSta().shortValue());//写入目标站
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			staProtocol.setStaNo(dto.getSourceStaNo().shortValue());//写入目标站
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			} else if (code == 500) {
			News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}
			}

			@@ -697,7 +729,7 @@
			param.setLocType1(locMast.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			.setPath("/rpc/pakin/loc/v2")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();