zy-wcs.git - Gitblit

			@@ -1149,27 +1149,30 @@
			SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
			SteProtocol steProtocol = steThread.getSteProtocol();
			if (steProtocol == null) { return; }
			if (steProtocol.isIdle()) {

			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findWaiting(steProtocol.getRow().intValue())); // 任务模式: 去近点等待堆垛机叉取
			if (!basSteService.updatePakMk(steNo, "Y")) {
			log.error("修改穿梭车作业状态失败！！，穿梭车={}", steNo);
			return;
			}

			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(steNo); // 穿梭车编号
			steCommand.setTaskNo(wrkCharge.getWrkNo()); // 工作号
			steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol.getRow())); // 任务模式: 去近点等待堆垛机叉取

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态绑定穿梭车
			wrkCharge.setSteNo(steNo);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
			steCommand.setBay(steProtocol.getBay());
			steCommand.setLev(steProtocol.getLev());

			if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", steNo, JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态绑定穿梭车
			wrkCharge.setSteNo(steNo);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态绑定穿梭车失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			@@ -1359,11 +1362,11 @@
			continue;
			} else {
			// 小车搬至指定库位完成
			if (wrkCharge.getWrkSts() == 4) {
			// 4.迁入小车 ===>> 6.小车待入
			wrkCharge.setWrkSts(6L);
			if (wrkCharge.getWrkSts() == 23) {
			// 23.吊车搬运 ===>> 24.小车到达
			wrkCharge.setWrkSts(24L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 4.迁入小车 ===>> 6.小车待入失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改充电任务状态 23.吊车搬运 ===>> 24.小车到达失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			// 堆垛机复位
			crnThread.setResetFlag(true);
			@@ -1624,7 +1627,7 @@
			/**
			* 执行对工作档的完成操作
			*/
			public void carGenerateStore() {
			public synchronized void carGenerateStore() {
			Date now = new Date();
			for (SteSlave ste : slaveProperties.getSte()) {
			// 获取穿梭车信息
			@@ -1643,19 +1646,19 @@
			if (wrkCharge == null) {
			continue;
			} else {
			if (wrkCharge.getWrkSts() == 11) {
			// 11.生成出库ID ===>> 12.小车待搬
			wrkCharge.setWrkSts(12L);
			if (wrkCharge.getWrkSts() == 21) {
			// 21.准备充电 ===>> 22.小车待搬
			wrkCharge.setWrkSts(22L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 11.生成出库ID ===>> 12.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改充电任务状态 21.准备充电 ===>> 22.小车待搬失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			} else if (wrkCharge.getWrkSts() == 8) {
			// 8.小车搬入库 ===>> 9.入库完成
			wrkCharge.setWrkSts(9L);
			} else if (wrkCharge.getWrkSts() == 25) {
			// 25.小车去充电 ===>> 26.等待充电
			wrkCharge.setWrkSts(26L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 8.小车搬入库 ===>> 9.入库完成失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改充电任务状态 25.小车去充电 ===>> 26.等待充电失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			@@ -2054,41 +2057,56 @@
			BasSte basSte = basSteService.selectById(ste.getId());
			if (Cools.isEmpty(steProtocol, basSte)) { continue; }
			try {
			if (!steProtocol.statusType.equals(SteStatusType.IDLE)) {
			// 在线空闲无作业标记不在充电
			if (steProtocol.getMode() == 0
			\|\| !steProtocol.statusType.equals(SteStatusType.IDLE)
			\|\| basSte.getPakMk().equals("Y")
			// \|\| steProtocol.getChargeStatus() == 1
			) {
			continue;
			}
			if (!steProtocol.isEnable()) {
			continue;
			}
			if (steProtocol.getCharge() > Float.parseFloat(basSte.getChargeLine())) {
			continue;
			}
			WrkCharge wrkCharge = wrkChargeService.selectById(steProtocol.getTaskNo());
			WrkCharge wrkCharge = wrkChargeService.selectWorking(steProtocol.getSteNo().intValue());

			if (wrkCharge == null) {
			String idleLoc = basSte.getIdleLoc();
			wrkCharge = new WrkCharge();
			wrkCharge.setSteNo(ste.getId());
			wrkCharge.setWrkNo(commonService.getChargeWorkNo(4));
			wrkCharge.setWrkSts(11L);
			wrkCharge.setWrkSts(21L); // 21.准备充电
			wrkCharge.setCrnNo(basSte.getCrnNo());
			wrkCharge.setIoPri((double) 10);
			wrkCharge.setLocNo(idleLoc);
			if (wrkChargeService.insert(wrkCharge)) {
			if (!wrkChargeService.insert(wrkCharge)) {
			log.error("保存{}号穿梭车充电任务失败!!!", ste.getId());
			continue;
			}

			// 处于充电库位组
			if (Utils.getGroupRow(idleLoc).equals(Utils.getGroupRow(steProtocol.getRow().intValue())) && steProtocol.getBay() == Utils.getBay(idleLoc) && steProtocol.getLev() == Utils.getLev(idleLoc)) {
			// 修改工作档状态 11.生成出库ID => 6.小车待入
			wrkCharge.setWrkSts(6L);
			// 修改工作档状态 21.准备充电 => 24.小车到达
			wrkCharge.setWrkSts(24L);
			wrkCharge.setModiTime(new Date());
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态 11.生成出库ID => 6.小车待入失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改充电任务状态 21.准备充电 => 24.小车到达失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			} else {
			this.letCarBeWaiting(wrkCharge, ste.getId());
			}

			} else {
			// 12.小车待搬
			if (wrkCharge.getWrkSts() == 12) {
			// filter
			if (wrkCharge.getWrkSts() < 26 && steProtocol.getChargeStatus() == 1) {
			continue;
			}

			// 22.小车待搬
			if (wrkCharge.getWrkSts() == 22) {
			// 搬小车至充电库位
			LocMast locMast = locMastService.selectById(basSte.getIdleLoc());

			@@ -2109,19 +2127,20 @@
			} else {
			// 修改穿梭车运行中排列层
			steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo()), locMast.getBay1(), locMast.getLev1());
			// 修改工作档状态 12.小车待搬 => 4.迁入小车
			// 修改工作档状态 22.小车待搬 => 23.吊车搬运
			Date now = new Date();
			wrkCharge.setWrkSts(4L);
			wrkCharge.setWrkSts(23L);
			wrkCharge.setCrnStrTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态 12.小车待搬 => 4.迁入小车失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改工作档状态 22.小车待搬 => 23.吊车搬运失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}

			} else if (wrkCharge.getWrkSts() == 6L) {
			} else if (wrkCharge.getWrkSts() == 24L) {
			// 小车行驶至充电位
			if (steProtocol.isIdle()) {
			if (steProtocol.statusType.equals(SteStatusType.IDLE) && steProtocol.getPakMk().equals("N")) {
			if (steProtocol.getChargeStatus() == 1) { continue; }
			// 命令下发区 --------------------------------------------------------------------------
			SteCommand steCommand = new SteCommand();
			steCommand.setSteNo(wrkCharge.getSteNo()); // 穿梭车编号
			@@ -2130,26 +2149,29 @@
			if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
			log.error("穿梭车命令下发失败，穿梭车号={}，任务数据={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
			} else {
			// 修改工作档状态 6.小车待入 ===> 8.小车搬入库
			wrkCharge.setWrkSts(8L);
			// 修改工作档状态 24.小车到达 ===> 25.小车去充电
			wrkCharge.setWrkSts(25L);
			Date now = new Date();
			wrkCharge.setCrnEndTime(now);
			wrkCharge.setModiTime(now);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改工作档状态 6.小车待入 ===> 8.小车搬入库失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改充电任务状态 24.小车到达 ===> 25.小车去充电失败！！，工作号={}", wrkCharge.getWrkNo());
			}
			}
			}
			} else if (wrkCharge.getWrkSts() == 9L) {
			} else if (wrkCharge.getWrkSts() == 26) {
			if (steProtocol.getChargeStatus() == 0) { continue; }
			// 给输送线下发充电任务
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
			SteChargeType steChargeType = SteChargeType.get(wrkCharge.getLocNo());
			if (null != steChargeType) {
			if (devpThread.charge(steChargeType.ssbm - 1, true)) {
			// 修改工作档状态 9.入库完成 ===> 10.库存更新完成
			wrkCharge.setWrkSts(10L);
			// 修改工作档状态 26.等待充电 ===> 28.完成充电
			wrkCharge.setWrkSts(28L);
			if (!wrkChargeService.updateById(wrkCharge)) {
			log.error("修改充电任务状态 9.入库完成 ===> 10.库存更新完成失败！！，工作号={}", wrkCharge.getWrkNo());
			log.error("修改充电任务状态 26.等待充电 ===> 28.完成充电失败！！，工作号={}", wrkCharge.getWrkNo());
			} else {
			steThread.setResetFlag(true);
			}
			}
			} else {