zy-wcs.git - Gitblit

			@@ -10,6 +10,7 @@
			import com.zy.asrs.mapper.WrkMastMapper;
			import com.zy.asrs.service.*;
			import com.zy.common.model.StartupDto;
			import com.zy.common.service.CommonService;
			import com.zy.core.cache.MessageQueue;
			import com.zy.core.cache.SlaveConnection;
			import com.zy.core.enums.*;
			@@ -90,7 +91,7 @@
			continue;
			}
			// 获取入库通知档
			List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("barcode", barcode));
			List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
			if (waitPakins.isEmpty()) {
			log.warn("无此入库条码数据。条码号={}", barcode);
			continue;
			@@ -152,6 +153,7 @@
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			staProtocol.setPakMk(false);

			}

			@@ -245,12 +247,12 @@
			*/
			@Async
			public void crnStnToOutStn() {
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历拣料入库口
			for (DevpSlave.Sta outSta : devp.getOutSta()) {
			for (CrnSlave crnSlave : slaveProperties.getCrn()) {
			// 遍历堆垛机出库站
			for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
			// 获取堆垛机出库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(outSta.getStaNo());
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
			if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getStaNo() == null)) {
			// 查询工作档
			WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(staProtocol.getSiteId());
			@@ -268,32 +270,32 @@
			// 移动中
			continue;
			}
			// 更新工作档状态为14失败 todo:luxiaotao
			// 判断堆垛机状态等待确认
			if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
			&& crnProtocol.statusType == CrnStatusType.IDLE
			&& crnProtocol.statusType == CrnStatusType.WAITING
			&& crnProtocol.forkPosType == CrnForkPosType.HOME) {

			// 命令下发区 --------------------------------------------------------------------------

			// 1.复位堆垛机
			crnThread.setResetFlag(true);

			// 2.下发站点信息
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
			throw new CoolException("更新plc站点信息失败");
			}

			// 更新工作档状态为14失败
			wrkMast.setWrkSts(14L);
			wrkMast.setCrnEndTime(new Date());
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			throw new CoolException("更新工作档的工作状态为14失败，工作号"+wrkMast.getWrkNo());
			}

			}

			// 命令下发区 --------------------------------------------------------------------------

			// 1.复位堆垛机更新堆垛机信息且下发plc命令 todo:luxiaotao
			crnProtocol.setStatus(CrnStatusType.IDLE);
			crnProtocol.setTaskNo((short)0);
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(4, crnProtocol))) {
			throw new CoolException("更新堆垛机信息失败");
			}

			// 2.下发站点信息
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			if (!MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol))) {
			throw new CoolException("更新plc站点信息失败");
			}
			}
			}
			}
			@@ -542,18 +544,29 @@
			// 出库 + 拣料/盘点/并板出库中：12.吊车出库中 ==> 14.出库完成
			} else if (wrkMast.getWrkSts() == 12) {
			wrkMast.setWrkSts(14L);
			} else {
			continue;
			}
			Date now = new Date();
			wrkMast.setCrnEndTime(now);
			wrkMast.setModiTime(now);
			// 修改成功后复位堆垛机
			if (wrkMastMapper.updateById(wrkMast) > 0) {
			// 命令下发区 -------------------------------------------------------------------------
			// 堆垛机复位
			if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(3, new CrnCommand()))) {
			log.error("堆垛机复位命令下发失败，工作号={}", wrkMast.getWrkNo());
			}
			// // 命令下发区 -------------------------------------------------------------------------
			// if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
			// // 堆垛机复位
			// if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(3, new CrnCommand()))) {
			// log.error("堆垛机复位命令下发失败，工作号={}", wrkMast.getWrkNo());
			// }
			// }
			crnThread.setResetFlag(true);
			}

			// 完成通知档
			if (wrkMastMapper.updateWaitPakInStep2(wrkMast.getBarcode()) == 0) {
			log.error("入库通知档修改结束状态失败，workNo=[{}]", wrkMast.getWrkNo());
			}

			}
			}
			}
			@@ -580,7 +593,7 @@
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			StaProtocol staProtocol = devpThread.getStation().get(emptyInSta.getStaNo());
			// 站点条件判断
			if (staProtocol.isAutoing() && staProtocol.isLoading() && !staProtocol.isInreq1()
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			&& staProtocol.isEmptyMk() && staProtocol.getWorkNo() == 0 && staProtocol.isPakMk()) {
			// 工作号
			int workNo = commonService.getWorkNo(0);
			@@ -630,6 +643,7 @@
			throw new CoolException("更新plc站点信息失败");
			}

			staProtocol.setPakMk(false);
			}