zy-wcs.git - Gitblit

			@@ -395,7 +395,7 @@
			}
			// 判断堆垛机状态等待确认
			if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
			&& crnProtocol.getTaskFinish() == 1 // todo:luxiaotao 等待确认
			&& crnProtocol.statusType == CrnStatusType.WAITING
			&& crnProtocol.forkPosType == CrnForkPosType.HOME) {

			// 命令下发区 --------------------------------------------------------------------------
			@@ -427,8 +427,7 @@
			/**
			* 入出库 ===>> 堆垛机入出库作业下发
			*/
			@Async
			public void crnIoExecute(){
			public synchronized void crnIoExecute(){
			for (CrnSlave crn : slaveProperties.getCrn()) {
			// 获取堆垛机信息
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
			@@ -462,9 +461,6 @@
			}
			}
			}
			try {
			Thread.sleep(500L);
			} catch (InterruptedException ignore) {}
			// 库位移转
			this.locToLoc(crn, crnProtocol);
			}
			@@ -473,7 +469,7 @@
			/**
			* 入库 ===>> 堆垛机站到库位
			*/
			public synchronized void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
			boolean flag = false;
			// 获取堆垛机入库站信息
			@@ -567,7 +563,7 @@
			/**
			* 出库 ===>> 库位到堆垛机站
			*/
			public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			// 获取工作状态为11（生成出库ID）的出库工作档
			WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
			@@ -674,7 +670,7 @@
			/**
			* 库位移转
			*/
			public synchronized void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
			// 获取工作档信息
			WrkMast wrkMast = wrkMastMapper.selectLocMove(slave.getId());
			if (null == wrkMast) {
			@@ -750,8 +746,7 @@
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			if (crnProtocol == null) { continue; }
			// 状态：等待确认并且任务完成位 = 1
			if (crnProtocol.getTaskFinish() == 1 // todo:luxiaotao 等待确认
			&& crnProtocol.getTaskNo() != 0) {
			if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
			// 获取入库待确认工作档
			WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
			if (wrkMast == null) {
			@@ -797,13 +792,13 @@
			BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
			// 有异常
			if (latest == null) {
			if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {
			if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
			WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
			if (wrkMast == null) {
			continue;
			}
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm1()):crnError.getErrName();
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
			BasErrLog basErrLog = new BasErrLog(
			null, // 编号
			wrkMast.getWrkNo(), // 工作号
			@@ -818,7 +813,7 @@
			wrkMast.getSourceStaNo(), // 源站
			wrkMast.getSourceLocNo(), // 源库位
			wrkMast.getBarcode(), // 条码
			crnProtocol.getAlarm1(), // 异常码
			(int) crnProtocol.getAlarm(), // 异常码
			errName, // 异常
			1, // 异常情况
			now, // 添加时间
			@@ -833,7 +828,7 @@
			}
			} else {
			// 异常修复
			if (crnProtocol.getAlarm1() == null \|\| crnProtocol.getAlarm1() == 0) {
			if (crnProtocol.getAlarm() == null \|\| crnProtocol.getAlarm() == 0) {
			latest.setEndTime(now);
			latest.setUpdateTime(now);
			latest.setStatus(2);
			@@ -846,11 +841,11 @@
			} else {
			BasErrLog latest = basErrLogService.findLatest(crn.getId());
			// 有异常
			if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm1() > 0) {
			if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
			// 记录新异常
			if (latest == null \|\| (latest.getErrCode() != crnProtocol.getAlarm1().intValue())) {
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm1()):crnError.getErrName();
			if (latest == null \|\| (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
			BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
			String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
			BasErrLog basErrLog = new BasErrLog(
			null, // 编号
			null, // 工作号
			@@ -865,7 +860,7 @@
			null, // 源站
			null, // 源库位
			null, // 条码
			crnProtocol.getAlarm1(), // 异常码
			(int)crnProtocol.getAlarm(), // 异常码
			errName, // 异常
			1, // 异常情况
			now, // 添加时间
			@@ -917,7 +912,7 @@
			}
			// 站点条件判断
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			&& staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getWorkNo() == 9999 \|\| staProtocol.getWorkNo() == 9990) && staProtocol.isPakMk()) {
			&& staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getWorkNo() == 9999 \|\| staProtocol.getWorkNo() == 9990 \|\| staProtocol.getWorkNo() == 9997) && staProtocol.isPakMk()) {
			// 检索库位
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
			StartupDto startupDto = commonService.getLocNo(1, 10, emptyInSta.getStaNo(), null, locTypeDto, 0);