zy-wcs.git - Gitblit

			@@ -49,6 +49,7 @@
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.interceptor.TransactionAspectSupport;

			import java.io.IOException;
			import java.util.*;
			import java.util.concurrent.TimeUnit;
			import java.util.stream.Collectors;
			@@ -125,16 +126,90 @@
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
			StaProtocol staProtocolIn = devpThread.getStation().get(inSta.getStaNo() -1);
			if (staProtocolIn == null) {
			continue;
			} else {
			staProtocolIn = staProtocolIn.clone();
			}
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if(staProtocolIn.getStamp() == 1) {
			WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
			.eq("barcode", barcode)
			.in("io_type", 107, 103, 57));
			if (!Cools.isEmpty(checkPick)) {
			continue;
			}
			try {
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			SearchLocParam param = new SearchLocParam();
			locTypeDto.setLocType1((short) 1);
			param.setBarcode(barcode);
			param.setIoType(1);
			param.setSourceStaNo(inSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			param.setWeight(staProtocol.getWeight());
			String response = new HttpHandler.Builder()
			.setTimeout(30, TimeUnit.SECONDS)
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(dto.getWorkNo());
			//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(3, staProtocol));
			log.error("输送线下发2：" + dto.getWorkNo() + "," + dto.getStaNo());

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

			if (!result) {
			News.error(methodName + ":更新plc站点信息失败");

			throw new CoolException("更新plc站点信息失败");
			}
			} else {
			if (jsonObject.getString("msg").equals("工作档已存在")) {
			continue;
			}
			staProtocol.setWorkNo(wrkNo);
			wrkNo++;
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发2：" + staProtocol.getWorkNo() + "," + staProtocol.getStaNo());

			// if (ledThread != null) {
			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);
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}

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

			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			// 尺寸检测异常
			boolean back = false;
			String errMsg = "";
			@@ -226,7 +301,7 @@
			//
			// }
			News.error(barcode + "条码已存在状态为（ 2.设备上走）的数据,请查看WCS输送线界面,工作号={}", wrkMast.getWrkNo());
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, barcode + "条码已存在状态为（ 2.设备上走）的任务,工作号=" + wrkMast.getWrkNo()));
			// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, barcode + "条码已存在状态为（ 2.设备上走）的任务,工作号=" + wrkMast.getWrkNo()));
			continue;
			// barcodeThread.setBarcode("");
			// staProtocol.setWorkNo(wrkMast.getWrkNo());
			@@ -291,27 +366,6 @@
			}
			} else {
			if (jsonObject.getString("msg").equals("工作档已存在")) {

			//工作档已存在再次进去
			// 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);