zy-wcs.git - Gitblit

			@@ -170,12 +170,12 @@
			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);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发1："+wrkNo+","+inSta.getBackSta());
			log.error("输送线下发1：" + wrkNo + "," + inSta.getBackSta());
			}

			// 判断是否满足入库条件
			@@ -184,16 +184,16 @@
			&& staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk()
			&& staProtocol.isPakMk()) {
			if(Cools.isEmpty(barcode) \|\| "NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "00000000".equals(barcode)) {
			if (Cools.isEmpty(barcode) \|\| "NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "00000000".equals(barcode)) {
			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);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发1："+wrkNo+","+inSta.getBackSta());
			log.error("输送线下发1：" + wrkNo + "," + inSta.getBackSta());
			continue;
			}
			// 判断重复工作档
			@@ -208,23 +208,23 @@
			}
			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;
			}
			// 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>()
			@@ -252,10 +252,11 @@
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
			//staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
			staProtocol.setStaNo(dto.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
			log.error("输送线下发2：" + dto.getWorkNo() + "," + dto.getStaNo());

			ledThread.errorReset();
			log.error("组托请求后LED错误清除");
			@@ -266,6 +267,27 @@
			throw new CoolException("更新plc站点信息失败");
			}
			} 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站点信息失败");
			}
			}
			continue;
			}
			staProtocol.setWorkNo(wrkNo);
			wrkNo++;
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			@@ -273,10 +295,10 @@
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			//
			// if (ledThread != null) {
			String errorMsg = jsonObject.getString("msg");
			if (!Cools.isEmpty(errorMsg)) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
			}
			String errorMsg = jsonObject.getString("msg");
			if (!Cools.isEmpty(errorMsg)) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
			}
			// }
			// News.error(methodName + ":请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}
			@@ -484,7 +506,7 @@

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo((short) 161);
			staProtocol.setStaNo(Short.valueOf(wrkMast.getStaNo().toString()));
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发5："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
			@@ -623,7 +645,7 @@
			try {
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo((short)161);
			staProtocol.setStaNo(Short.valueOf(dto.getStaNo().toString()));
			devpThread.setPakMk(staProtocol.getSiteId(), false);

			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));