zy-wcs.git - Gitblit

			@@ -112,7 +112,7 @@
			private boolean crn3;


			public void generateStoreWrkFile() throws IOException, InterruptedException {
			public synchronized void generateStoreWrkFile() {
			try {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			@@ -161,28 +161,32 @@
			back = true;
			}
			// 判断是否满足入库条件
			if (staProtocol.isAutoing() && staProtocol.isLoading()
			&& staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk() && workNo >= 9790
			&& staProtocol.isPakMk()) {
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk() && workNo >= 9000 && staProtocol.isPakMk()) {
			// if(true){
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
			if (barcodeThread == null) {
			continue;
			}
			String BoxNo = barcodeThread.getBarcode();
			if (Cools.isEmpty(BoxNo)) {
			log.error("{}号条码扫描失败，值：{}",inSta.getBarcode(),BoxNo);
			continue;
			}
			TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo));
			if (!Cools.isEmpty(taskWrk1)) {
			log.info("托盘码：" + BoxNo + "任务档存在");
			if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
			if (Cools.isEmpty(staDesc)) {
			return;
			} else {
			continue;
			}
			}
			continue;
			// if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
			// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			// .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
			// if (Cools.isEmpty(staDesc)) {
			// return;
			// } else {
			// continue;
			// }
			// }
			}
			if (back) {
			storageEscalationParam.setWCSStatus(1);
			@@ -191,26 +195,37 @@
			storageEscalationParam.setBarcode(BoxNo);
			log.info("组托入库={}", storageEscalationParam);
			TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
			if (taskWrk == null) {
			log.error("入库请求wms创建任务工作档为空：{}",storageEscalationParam);
			continue;
			}
			if (back) {
			log.info("托盘退回==>{}，{}", BoxNo, errMsg);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			} else {
			if (!Cools.isEmpty(taskWrk)) {
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
			staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			//添加上报日志
			toWmsService.addReportLog(taskWrk);
			} else {
			log.info("创建工作档失败==>{}", taskWrk.getTaskNo());
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			}
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
			staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			//添加上报日志
			// toWmsService.addReportLog(taskWrk);
			// if (!Cools.isEmpty(taskWrk)) {
			// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			// .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
			// staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			// staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
			// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// //添加上报日志
			// toWmsService.addReportLog(taskWrk);
			// } else {
			// log.info("创建工作档失败==>{}", taskWrk.getTaskNo());
			// staProtocol.setStaNo(inSta.getBackSta().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// }

			}

			@@ -231,8 +246,8 @@
			for (CrnSlave crnSlave : slaveProperties.getCrn()) {
			// 遍历堆垛机出库站
			for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
			for (StaDesc staDesc : staDescs) {
			// List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
			// for (StaDesc staDesc : staDescs) {
			try {
			// 获取堆垛机出库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			@@ -244,34 +259,42 @@
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getStaNo() == 0)) {
			// 查询工作档
			TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
			TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo()-1));
			if (taskWrk == null) {
			continue;
			}
			log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
			staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			staProtocol.setStaNo(staDesc.getStnNo().shortValue());
			boolean offer = false;
			try {
			offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
			} catch (Exception e) {
			log.error("下发输送线任务失败：异常:" + e);
			log.error("下发输送线任务失败：异常:offer:" + offer);
			}
			if (offer) {
			log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
			taskWrk.setStatus(5);
			taskWrk.setWrkSts(14);
			taskWrkService.updateById(taskWrk);
			// 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档
			// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, taskWrk.getCrnNo());
			// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			// log.info(crnProtocol.statusType+""+crnProtocol.getForkPosType());
			// if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(taskWrk.getWrkNo().shortValue())
			// && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED
			// && crnProtocol.forkPosType == CrnForkPosType.HOME) {
			log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
			staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
			boolean offer = false;
			try {
			offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
			} catch (Exception e) {
			log.error("下发输送线任务失败：异常:" + e);
			log.error("下发输送线任务失败：异常:offer:" + offer);
			}
			if (offer) {
			log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
			taskWrk.setStatus(5);
			taskWrk.setWrkSts(14);
			taskWrkService.updateById(taskWrk);

			} else {
			log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
			}
			} else {
			log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
			}
			// }
			}
			} catch (Exception e) {
			log.error("出库到出库站异常:异常信息：" + e);
			}
			}
			// }

			}
			}
			@@ -398,6 +421,8 @@
			throw new CoolException("堆垛机命令生成失败");
			} else {
			try {
			// 上报执行状态
			toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
			taskWrkService.updateById(taskWrk);
			} catch (Exception e) {
			log.error("修改工作档状态 2.设备上走 => 3.吊车入库中失败！！，工作号={}", taskWrk.getWrkNo());
			@@ -522,6 +547,8 @@
			if (taskWrkMapper.updateById(taskWrk) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			}
			// 上报执行状态
			toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
			} catch (Exception e) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，异常：" + e);