zy-wcs.git - Gitblit

			@@ -170,7 +170,7 @@
			continue;
			}
			staProtocol.setWorkNo(wrkNo);
			News.info("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg, wrkNo);
			News.info("{}PLC入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg, wrkNo);
			wrkNo++;
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			@@ -188,7 +188,7 @@
			News.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);

			staProtocol.setWorkNo(wrkNo);
			News.info("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg, wrkNo);
			News.info("{}barcode入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg, wrkNo);
			wrkNo++;
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			@@ -199,32 +199,33 @@
			// 判断重复工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
			if (wrkMast != null) {
			int wrkNo1 = basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo()));
			if (wrkNo1 != 0) {
			News.error(barcode + "条码已存在状态为（ 2.设备上走）的数据,请查看WCS输送线界面,工作号={}", wrkMast.getWrkNo());
			if (ledThread != null) {
			News.error(methodName + ":扫码失败，请重试");
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, barcode + "条码已存在状态为（ 2.设备上走）的任务,工作号=" + wrkMast.getWrkNo()));
			}
			continue;
			}
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo(RouteUtils.SouStaEnd(null, wrkMast.getSourceStaNo()));
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.info("输送线下发(存在设备上走的工作档，直接下发！))：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());

			ledThread.errorReset();
			log.info("组托请求后LED错误清除");

			if (!result) {
			News.error(methodName + ":更新plc站点信息失败");
			log.error("输送线下发(存在设备上走的工作档，直接下发！)==>更新plc站点信息失败");

			// throw new CoolException("更新plc站点信息失败");
			continue;
			}
			// int wrkNo1 = basDevpService.selectCount(new EntityWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo()));
			// if (wrkNo1 != 0){
			// if (ledThread != null) {
			// News.error(methodName + ":扫码失败，请重试");
			// }
			//
			// }
			News.error(barcode + "条码已存在状态为（ 2.设备上走）的数据,请查看WCS输送线界面,工作号={}", wrkMast.getWrkNo());
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, barcode + "条码已存在状态为（ 2.设备上走）的任务,工作号=" + wrkMast.getWrkNo()));
			continue;
			// barcodeThread.setBarcode("");
			// staProtocol.setWorkNo(wrkMast.getWrkNo());
			// staProtocol.setStaNo(RouteUtils.SouStaEnd(null,wrkMast.getSourceStaNo()));
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// log.info("输送线下发(存在设备上走的工作档，直接下发！))："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
			//
			// ledThread.errorReset();
			// log.info("组托请求后LED错误清除");
			//
			// if (!result) {
			// News.error(methodName + ":更新plc站点信息失败");
			// log.error("输送线下发(存在设备上走的工作档，直接下发！)==>更新plc站点信息失败");
			//
			//// throw new CoolException("更新plc站点信息失败");
			// continue;
			// }

			}
			WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
			@@ -242,6 +243,7 @@
			param.setSourceStaNo(inSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setTimeout(30,TimeUnit.SECONDS)
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			.setJson(JSON.toJSONString(param))
			@@ -268,24 +270,27 @@
			}
			} else {
			if (jsonObject.getString("msg").equals("工作档已存在")) {
			//工作档已存在再次进去
			wrkMast = wrkMastMapper.selectPakInStepBarcode(barcode);
			if (wrkMast != null) {
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			//staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发2：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
			ledThread.errorReset();
			log.error("组托请求后LED错误清除");
			if (!result) {
			News.error(methodName + ":更新plc站点信息失败");

			throw new CoolException("更新plc站点信息失败");
			}
			}
			//工作档已存在再次进去
			// wrkMast = wrkMastMapper.selectPakInStepBarcode(barcode);
			// if (wrkMast != null) {
			// barcodeThread.setBarcode("");
			// staProtocol.setWorkNo(9999);
			// //staProtocol.setWorkNo(wrkMast.getWrkNo());
			// //staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
			// staProtocol.setStaNo(inSta.getBackSta().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// log.error("输送线下发2：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
			// ledThread.errorReset();
			// log.error("组托请求后LED错误清除");
			// if (!result) {
			// News.error(methodName + ":更新plc站点信息失败");
			//
			// throw new CoolException("更新plc站点信息失败");
			// }
			// }

			continue;
			}
			staProtocol.setWorkNo(wrkNo);
			@@ -398,6 +403,79 @@
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			// 获取拣料入库站信息
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());

			StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());

			// 尺寸检测异常
			boolean back = false;
			String errMsg = "";
			if (staProtocol.isFrontErr()) {
			errMsg = "前超限";
			back = true;
			}
			if (!back && staProtocol.isBackErr()) {
			errMsg = "后超限";
			back = true;
			}
			if (!back && staProtocol.isHighErr()) {
			errMsg = "高超限";
			back = true;
			}
			if (!back && staProtocol.isLeftErr()) {
			errMsg = "左超限";
			back = true;
			}
			if (!back && staProtocol.isRightErr()) {
			errMsg = "右超限";
			back = true;
			}
			if (!back && staProtocol.isWeightErr()) {
			errMsg = "超重";
			back = true;
			}
			if (!back && staProtocol.isBarcodeErr()) {
			errMsg = "扫码失败";
			back = true;
			}

			// 退回
			if (back) {
			log.info("errmsg: " + errMsg);
			// News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
			MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(5, errMsg));
			if (!staProtocol.isLoading()) {
			continue;
			}
			if (!staProtocol.isPakMk()) {
			continue;
			}
			staProtocol.setWorkNo(wrkNo);
			News.info("{}入库回退：{}，任务号：{}", pickSta.getStaNo(), errMsg, wrkNo);
			wrkNo++;
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发1：" + 9999 + "," + pickSta.getBackSta());
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());

			// led 异常显示
			if (ledThread != null) {
			MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(5, errMsg));
			}
			continue;
			}
			if (!Cools.isEmpty(barcode)) {
			News.infoNoLog("" + mark + " - 1" + " - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			continue;
			}
			} else {
			continue;
			}


			if (!Cools.isEmpty(barcode)) {
			// News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
			if ("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			@@ -407,9 +485,7 @@
			continue;
			}

			// 获取拣料入库站信息
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());

			if (staProtocol == null) {
			continue;
			} else {