zy-wcs.git - Gitblit

			@@ -450,23 +450,74 @@
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			if(!Cools.isEmpty(barcode)) {
			// News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			continue;
			}
			} else {
			continue;
			}

			// 获取拣料入库站信息
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			// 尺寸检测异常
			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 = "扫码失败";
			log.error("物料码扫码失败");
			back = true;
			}
			// 退回
			if (back) {
			News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", pickSta.getStaNo(), errMsg);
			MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errMsg));

			if (!staProtocol.isLoading()){
			continue;
			}
			if (!staProtocol.isPakMk()) {
			continue;
			}
			// led 异常显示
			if (ledThread != null) {
			MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errMsg));
			}
			staProtocol.setWorkNo(wrkNo);
			staProtocol.setErrCode(errMsg);
			News.info("异常判断{}入库回退：{}，任务号：{}", pickSta.getStaNo(), errMsg,wrkNo);
			wrkNo++;
			staProtocol.setStaNo(pickSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			staProtocol.setBarcode(barcode);
			staProtocol.setPakMk(false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			System.out.println(staProtocol);
			log.error("输送线下发1："+wrkNo+","+pickSta.getBackSta());
			}


			// // 入出库模式判断
			// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
			@@ -506,7 +557,7 @@
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			//LED
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			// led 异常显示
			if (ledThread != null) {
			String errorMsg = "此为拣料、并板、盘点再入库.请放在"+pickSta.getBackSta().shortValue()+"站点";
			@@ -2299,6 +2350,9 @@
			case 57:
			ledCommand.setTitle("盘点再入库");
			break;
			case 53:
			ledCommand.setTitle("拣料再入库");
			break;
			case 101:
			ledCommand.setTitle("全板出库");
			break;
			@@ -2879,7 +2933,7 @@
			StaProtocol staProtocol = null;
			if(emptyCount >= 2 && site == 1108){
			continue;
			}else if(emptyCount == 1 && site == 2031){
			}else if(emptyCount > 1 && site == 2031){
			continue;
			}
			//如果站点可出禁用，则不生成空盘出库任务
			@@ -4989,6 +5043,55 @@
			continue;
			}
			if (staProtocol.isAutoing() ) {
			if(staProtocol.getWorkNo()>10000){
			BasAgvMast basAgvMast = new BasAgvMast();
			List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("task_no", staProtocol.getWorkNo()));
			if(!basAgvMastList.isEmpty()){
			continue;
			}

			try {
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			SearchLocParam param = new SearchLocParam();
			param.setBarcode(staProtocol.getWorkNo().toString());
			param.setIoType(1);
			param.setSourceStaNo(outStaAgv.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/agv/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);
			basAgvMast.setFloorNo(1);
			basAgvMast.setTaskNo(staProtocol.getWorkNo());
			basAgvMast.setSourceStaNo(outStaAgv.getStaNo());
			basAgvMast.setLocNo(dto.getLocNo());
			basAgvMast.setBarcode("1");
			basAgvMast.setSourceLocNo("1041");
			basAgvMast.setDevpId(devp.getId());
			basAgvMast.setIoType(2);
			basAgvMastService.insert(basAgvMast);
			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",dto.getLocNo()));
			locMast.setLocSts("S");
			locMastService.updateById(locMast);

			AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
			agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
			agvBindCtnrAndBinParam.setCtnrTyp("1");
			ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV出库容器绑定解绑", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);

			}
			}catch (Exception e){
			News.error(JSON.toJSONString(e.getMessage()));

			}

			}
			WrkMast wrkMast = wrkMastService.selectByWrkNo(staProtocol.getWorkNo());
			if (Cools.isEmpty(wrkMast) \|\| Cools.isEmpty(wrkMast.getTakeNone()) \|\| !wrkMast.getTakeNone().equals("1")){
			continue;
			@@ -5040,8 +5143,10 @@
			basAgvMast.setIoType(2);

			basAgvMastService.insert(basAgvMast);


			AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam(basAgvMast);
			agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getBarcode());
			agvBindCtnrAndBinParam.setCtnrTyp("1");
			ReturnT<String> resultBind = new PostMesDataUtils().postMesDataAgv("AGV容器绑定", AgvConstant.AGV_URL, AgvConstant.AGV_CTNRANDBING, agvBindCtnrAndBinParam);

			wrkMast.setTakeNone("2");
			wrkMastMapper.updateById(wrkMast);
			@@ -5067,6 +5172,8 @@
			// 获取入库站信息
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(outStaAgv.getStaNo());
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 6);

			if (staProtocol == null) {
			continue;
			} else {
			@@ -5078,7 +5185,7 @@
			continue;
			}

			String barcode = staProtocol.getBarcode();
			String barcode = barcodeThread.getBarcode();//2033
			if(!Cools.isEmpty(barcode)) {
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode) \|\| "0".equals(barcode)) {
			// News.info("{}号站点扫描器检测条码信息：{}", outStaAgv.getStaNo(), barcode);
			@@ -5091,7 +5198,7 @@
			if (staProtocol.isAutoing()) {

			// 判断重复工作档
			List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("source_sta_no", outStaAgv.getStaNo()));
			List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("source_sta_no", outStaAgv.getStaNo()).eq("barcode",barcode));
			if (!basAgvMastList.isEmpty()) {
			// News.info("{}号站点存在任务执行中，请等待任务执行完毕：{}", outStaAgv.getStaNo(), barcode);
			continue;
			@@ -5099,9 +5206,17 @@
			if(barcode.equals("0")){
			continue;
			}
			List<LocMast> locMastListFull = locMastService.selectList(new EntityWrapper<LocMast>()
			.eq("loc_sts", "O")
			.ge("row1", 28)
			.le("row1", 31)
			);
			if(locMastListFull.isEmpty()){
			continue;
			}
			List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("barcode", barcode));
			if (!locMastList.isEmpty()) {
			News.info("{}号站点条码信息重复：{}", outStaAgv.getStaNo(), barcode);
			// News.info("{}号站点条码信息重复：{}", outStaAgv.getStaNo(), barcode);
			continue;
			}
			// 任务生成区 --------------------------------------------------------------------------
			@@ -5126,7 +5241,29 @@
			JSONObject jsonObject = JSON.parseObject(response);
			if (jsonObject.getInteger("code").equals(200)) {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);
			basAgvMast.setTaskNo(outStaAgv.getStaNo());
			List<BasAgvMast> list = basAgvMastService.selectList(
			new EntityWrapper<BasAgvMast>()
			.eq("source_sta_no", outStaAgv.getStaNo())
			.in("task_no", 2033, 2031)
			);
			boolean has2033 = false;
			boolean has2034 = false;
			for (BasAgvMast mast : list) {
			if (mast.getTaskNo() == 2033) {
			has2033 = true;
			}
			if (mast.getTaskNo() == 2031) {
			has2034 = true;
			}
			}

			if (has2033 && has2034) {
			return;
			} else if (has2033) {
			basAgvMast.setTaskNo(2031);
			} else {
			basAgvMast.setTaskNo(2033);
			}
			basAgvMast.setSourceStaNo(outStaAgv.getStaNo());
			basAgvMast.setLocNo(dto.getLocNo());
			basAgvMast.setDevpId(devp.getId());
			@@ -5139,8 +5276,10 @@
			News.error(JSON.toJSONString(staProtocol));
			}
			} catch (Exception e) {
			News.error(JSON.toJSONString(e.getMessage()));
			News.error("AGV任务生成异常", e);
			throw new CoolException("AGV任务生成异常");
			}

			}
			}
			}
			@@ -5367,10 +5506,7 @@
			staProtocol = staProtocol.clone();
			}

			if ((!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo()))
			\|\|
			(basAgvMast.getSourceStaNo().equals(2033))){

			if ((!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo())) \|\| basAgvMast.getSourceStaNo().equals(2033)){
			AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
			if(basAgvMast.getFloorNo()==1) {
			// WrkMast wrkMast = wrkMastService.selectByWrkNo(staProtocol.getWorkNo());