zy-wcs.git - Gitblit

			@@ -6,7 +6,6 @@
			import com.baomidou.mybatisplus.mapper.Wrapper;
			import com.core.common.Cools;
			import com.core.exception.CoolException;
			import com.zy.common.model.LocTypeDto;
			import com.zy.common.model.MatDto;
			import com.zy.common.model.SearchLocParam;
			import com.zy.common.model.StartupDto;
			@@ -93,7 +92,55 @@
			@Value("${wms.url}")
			private String wmsUrl;

			public Integer wrkNo = 9997;
			public Integer wrkNo = 9999;

			public synchronized void devFlow() {
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp,1);
			StaProtocol staProtocol = devpThread.getStation().get(104);
			if (staProtocol == null) {
			return;
			} else {
			staProtocol = staProtocol.clone();
			}
			if(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0) {
			WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 1).orderBy("io_time"));
			if(wrkMast != null) {
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
			if (result) {
			// log.info("入库输送线命令下发成功："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
			News.info("入库输送线命令下发成功："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
			wrkMast.setWrkSts(2L);
			wrkMast.setModiTime(new Date());
			wrkMastService.updateById(wrkMast);
			}else {
			// log.error("入库输送线命令下发失败："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
			News.error("入库输送线命令下发失败："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
			}
			}
			}
			}

			public synchronized void flowEnd() {
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp,1);
			StaProtocol staProtocol = devpThread.getStation().get(106);
			if (staProtocol == null) {
			return;
			} else {
			staProtocol = staProtocol.clone();
			}
			if(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() != 0) {
			WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
			if(wrkMast != null && Cools.isEmpty(wrkMast.getMk())) {
			// log.info("货物流动到位106："+wrkMast.getWrkNo());
			News.info("货物流动到位106："+wrkMast.getWrkNo());
			wrkMast.setMk("Y");
			wrkMast.setModiTime(new Date());
			wrkMastService.updateById(wrkMast);
			}
			}
			}

			/**
			* 组托
			@@ -123,27 +170,27 @@
			// 尺寸检测异常
			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()) {
			// 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 (staProtocol.isWeightErr()) {
			errMsg = "超重";
			back = true;
			}
			@@ -152,7 +199,7 @@
			back = true;
			}
			// 退回
			if (back && (staProtocol.getWorkNo() == 9999 \|\| staProtocol.getWorkNo() == 9998) && staProtocol.isInEnable() && staProtocol.isLoading() && staProtocol.isPakMk()) {
			if (back && staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isPakMk()) {
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
			staProtocol.setWorkNo(wrkNo);
			News.info("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
			@@ -168,7 +215,7 @@
			&& staProtocol.isLoading()
			&& staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk()
			&& staProtocol.isPakMk() && staProtocol.getWorkNo() == 9999) {
			&& staProtocol.isPakMk() && staProtocol.getWorkNo() == 9998) { // 9997空托，9998满托/捡料，9999回退
			if(Cools.isEmpty(barcode) \|\| "NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "00000000".equals(barcode)) {
			News.info("{}条码扫描错误：{}",barcodeThread.getSlave().getId(),barcode);
			continue;
			@@ -185,12 +232,13 @@
			continue;
			}
			try {
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			// LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			SearchLocParam param = new SearchLocParam();
			param.setBarcode(barcode);
			param.setIoType(1);
			param.setSourceStaNo(inSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			param.setLocType1((short)1);
			// param.setLocType2(locTypeDto.getLocType2());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			@@ -265,7 +313,8 @@
			staProtocol = staProtocol.clone();
			}

			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9999) {
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk() && staProtocol.isPakMk() && staProtocol.getWorkNo() == 9998) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行");
			WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
			if (wrkMast == null) {
			@@ -280,13 +329,13 @@
			// 获取目标站
			Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
			.eq("type_no", wrkMast.getIoType() - 50)
			.eq("stn_no", pickSta.getStaNo()) // 作业站点 = 拣料出库的目标站
			.eq("stn_no", pickSta.getStaNo() + 1) // 作业站点 = 拣料出库的目标站
			.eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
			StaDesc staDesc = staDescService.selectOne(wrapper);
			if (Cools.isEmpty(staDesc)) {
			News.error(""+mark+" - 2"+" - 入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
			staProtocol.setWorkNo(wrkNo);
			staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1));
			staProtocol.setStaNo((short)103);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发4："+wrkNo+","+(pickSta.getStaNo().shortValue()-(short)1));
			@@ -317,7 +366,7 @@
			wrkMast.setIoTime(now);
			wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
			wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
			wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
			wrkMast.setSourceStaNo(wrkMast.getStaNo()+1); // 源站
			wrkMast.setStaNo(staNo); // 目标站
			wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
			wrkMast.setSourceLocNo(""); // 源库位清空
			@@ -597,6 +646,9 @@
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 源库位排
			crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 源库位列
			if(crnStn.getBay() == 1 && locMast.getBay1() >= 15) { // 入库长库位则取货位置为0列
			crnCommand.setSourcePosY((short) 0);
			}
			crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			@@ -741,6 +793,9 @@
			crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 目标库位列
			if(crnStn.getBay() == 1 && sourceSta.getBay1() >= 15) { // 长库位出库放货列为0
			crnCommand.setDestinationPosY((short) 0);
			}
			crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			crnCommand.setTraySize(sourceSta.getLocType1() == 2); //库位类型
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			@@ -1022,6 +1077,19 @@
			} else {
			staProtocol = staProtocol.clone();
			}
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, emptyInSta.getBarcode());
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode)) {
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			continue;
			}
			} else {
			continue;
			}

			LedThread ledThread = null;
			if (!Cools.isEmpty(emptyInSta.getLed())) {
			@@ -1038,17 +1106,19 @@
			&& staProtocol.isInEnable()
			&& staProtocol.isEmptyMk()
			&& staProtocol.isPakMk()
			&& staProtocol.getWorkNo() == 9998 // 9997 回退 9998 空 9999 满
			&& staProtocol.getWorkNo() == 9997
			) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行：空栈板初始化入库,叉车入库站放货");

			try {
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			// LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			SearchLocParam param = new SearchLocParam();
			param.setIoType(10);
			param.setSourceStaNo(emptyInSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			param.setBarcode(barcode);
			param.setLocType1((short)1);
			// param.setLocType2(locTypeDto.getLocType2());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			@@ -1056,6 +1126,7 @@
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			log.info("空托入库请求wms原始返回:" + jsonObject);
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);

			@@ -1067,7 +1138,7 @@
			log.error("输送线下发6："+dto.getWorkNo()+","+staProtocol.getSiteId());
			if (!result) {
			News.errorNoLog(""+mark+" - 1"+" - 更新plc站点信息失败");
			throw new CoolException("更新plc站点信息失败");
			throw new CoolException("SiemensDevp - 5");
			}

			if (ledThread != null) {
			@@ -1087,7 +1158,7 @@
			} else {
			staProtocol.setWorkNo(wrkNo);
			staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			devpThread.setPakMk(emptyInSta.getBackSta(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			News.errorNoLog(""+mark+" - 2"+" - 更新plc站点信息失败");
			@@ -1613,8 +1684,8 @@
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(crn.getId()); // 堆垛机编号
			crnCommand.setTaskNo((short) 9999); // 工作号
			crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式: 回原点
			crnCommand.setSourcePosX((short) (crn.getId() == 1 ? 3 : 6)); // 源库位排
			crnCommand.setTaskMode((short)8); // 任务模式: 回原点
			crnCommand.setSourcePosX((short) 1); // 源库位排
			crnCommand.setSourcePosY((short) 1); // 源库位列
			crnCommand.setSourcePosZ((short) 1); // 源库位层
			crnCommand.setDestinationPosX((short) 0); // 目标库位排