zy-wcs.git - Gitblit

			@@ -156,8 +156,10 @@
			errMsg = "扫码失败";
			back = true;
			}

			// 退回
			if (back) {
			log.info("errmsg: " + errMsg);
			// News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));

			@@ -250,7 +252,8 @@
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
			//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(2, staProtocol));
			log.error("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
			@@ -482,7 +485,7 @@

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo((short) 161);
			staProtocol.setStaNo(Short.valueOf(wrkMast.getStaNo().toString()));
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发5："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
			@@ -621,7 +624,7 @@
			try {
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo());
			staProtocol.setStaNo((short)161);
			staProtocol.setStaNo(Short.valueOf(dto.getStaNo().toString()));
			devpThread.setPakMk(staProtocol.getSiteId(), false);

			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			@@ -721,7 +724,7 @@
			wrkMast.setCrnEndTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) != 0) {
			// 复位堆垛机
			log.error("出库任务完成下发堆垛机复位", wrkMast.getWrkNo());
			log.error("出库任务完成下发堆垛机复位,{}", wrkMast.getWrkNo());
			crnThread.setResetFlag(true);
			} else {
			News.error(""+mark+" - 1"+" - 更新工作档的工作状态为14失败！！！ [工作号:{}]", wrkMast.getWrkNo());
			@@ -973,9 +976,9 @@
			crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 源库位排
			crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			crnCommand.setDestinationPosX((short)(locMast.getRow1()+slave.getOffset())); // 目标库位排
			crnCommand.setDestinationPosY((short)(locMast.getBay1()+slave.getOffset())); // 目标库位列
			crnCommand.setDestinationPosZ((short)(locMast.getLev1()+slave.getOffset())); // 目标库位层
			crnCommand.setTraySize(locMast.getLocType1() == 2);
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			News.error(""+mark+" - 1"+" - 16"+" - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			@@ -1132,9 +1135,9 @@
			crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
			// crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 源库位排
			crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 源库位层
			crnCommand.setSourcePosX((short)(sourceSta.getRow1()+slave.getOffset())); // 源库位排
			crnCommand.setSourcePosY((short)(sourceSta.getBay1()+slave.getOffset())); // 源库位列
			crnCommand.setSourcePosZ((short)(sourceSta.getLev1()+slave.getOffset())); // 源库位层
			crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			@@ -1368,7 +1371,7 @@
			}
			// 状态：等待确认并且任务完成位 = 1
			if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
			News.warnNoLog(""+mark+" - 0"+" - 开始执行对工作档的完成操作");
			News.warnNoLog(""+mark+" - 0"+" - 开始执行对工作档的完成操作，任务号:"+crnProtocol.getTaskNo());

			// 获取入库待确认工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
			@@ -1579,7 +1582,8 @@

			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(dto.getWorkNo());
			staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
			staProtocol.setStaNo(dto.getStaNo().shortValue());
			//staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("输送线下发6："+dto.getWorkNo()+","+staProtocol.getSiteId());
			@@ -1767,13 +1771,13 @@
			// 获取叉车站点
			StaProtocol staProtocol = devpThread.getStation().get(staNo);
			if (staProtocol == null) { continue; }
			if (staProtocol.getWorkNo() != 0) {
			if (staProtocol.getWorkNo() != 0 \|\| staProtocol.isErr()) {
			reset = false;
			break;
			}
			}
			// 获取led线程
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
			// led显示默认内容
			if (reset) {
			if (ledThread == null) {
			@@ -2332,12 +2336,15 @@
			* 小车地图更新更新锁
			* */
			public synchronized boolean rgvMapUpdate(BasRgvMap basRgvMapCurrent,Integer staStart,Integer staEnd,String sign){
			log.info("小车地图更新！[标记：{}];[BasRgvMap：{}];[staStart：{}];[staEnd：{}];",sign,JSON.toJSONString(basRgvMapCurrent),staStart,staEnd);

			// List<Integer> integers = RouteUtils.RouteMapCurrentFar(basRgvMapCurrent.getNowRoute(),staStart,staEnd, basRgvMapCurrent.getLockStartRoute());
			//更新当前小车锁
			try{
			Integer farCurrentStaNo = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getNowRoute(), staStart, staEnd, basRgvMapCurrent.getLockStartRoute());//获取最远站点
			log.info("小车地图更新！获取最远站点;[farCurrentStaNo：{}]",farCurrentStaNo);
			Integer fallMerge = RouteUtils.RouteIndexFarMas(basRgvMapCurrent.getRgvNo(), farCurrentStaNo); //获取合并干涉项
			log.info("小车地图更新！获取合并干涉项;[fallMerge：{}]",fallMerge);
			basRgvMapCurrent.setLockEndRoute(fallMerge);
			Integer i = basRgvMapMapper.updateById(basRgvMapCurrent);
			// if (i>0){
			@@ -2346,9 +2353,14 @@

			//更新另一台小车地图
			Integer rgvNoOther = basRgvMapCurrent.getRgvNoOther(basRgvMapCurrent.getRgvNo());
			log.info("小车地图更新！另一台小车号;[rgvNoOther：{}]",rgvNoOther);

			BasRgvMap basRgvMapOther = basRgvMapMapper.selectById(rgvNoOther);
			log.info("小车地图更新！另一台小车;[basRgvMapOther：{}]",JSON.toJSONString(basRgvMapOther));

			List<Integer> integers = RouteUtils.RouteMapCurrentFar(fallMerge, basRgvMapCurrent.getLockStartRoute());
			Integer lockEndRoute = RouteUtils.RouteMapOtherFarStnNo(integers, basRgvMapCurrent.getLockStartRoute());//另一台小车可活动最远位置
			log.info("小车地图更新！另一台小车可活动最远位置;[lockEndRoute：{}]",lockEndRoute);
			basRgvMapOther.setEndRoute(lockEndRoute);
			Integer i1 = basRgvMapMapper.updateById(basRgvMapOther);
			// if (i1>0){
			@@ -2356,7 +2368,7 @@
			// }
			return true;
			}catch (Exception e){
			log.error("小车地图更新出错！");
			log.error("小车地图更新出错！异常原因："+e);
			return false;
			}
			}
			@@ -2574,8 +2586,15 @@
			basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); //更新小车当前位置站点号
			List<WrkMastSta> wrkMastStaList = wrkMastStaMapper.selectNoInterfereList(route, route);
			for (WrkMastSta wrkMastSta : wrkMastStaList){
			if (wrkMastSta.getType()!=0 \|\| wrkMastSta.getWrkType()!=3){//1:满版 3：取放
			if (wrkMastSta.getType()!=0 \|\| wrkMastSta.getWrkType()!=3 \|\| wrkMastSta.getWrkSts()!=0){//1:满版 3：取放
			continue;
			}
			//判断工作结束位置状态
			BasDevp devNo = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", wrkMastSta.getStaEnd()));
			if (!Cools.isEmpty(devNo)){
			if (devNo.getAutoing().equals("Y") && !devNo.getWrkNo().equals(0) && !devNo.getLoading().equals("N")){
			continue;
			}
			}
			boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //命令下发
			wrkEnable = true;
			@@ -2594,9 +2613,11 @@
			break;
			}else {
			log.error("3864行，货物搬运任务：工作号{}所属任务下发后地图同步失败",wrkMastSta.getWrkNo());
			Thread.sleep(500);
			}
			} else {
			log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
			Thread.sleep(500);
			}
			break;
			}