zy-wcs.git - Gitblit

			@@ -32,6 +32,8 @@
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.thread.BarcodeThread;
			import com.zy.core.thread.SiemensDevpThread;
			import com.zy.system.entity.Config;
			import com.zy.system.service.ConfigService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			@@ -39,6 +41,7 @@
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.interceptor.TransactionAspectSupport;

			import javax.annotation.Resource;
			import java.io.IOException;
			import java.util.Date;
			import java.util.List;
			@@ -182,6 +185,7 @@
			storageEscalationParam.setBarcode(BoxNo);
			storageEscalationParam.setMatIdList(staProtocol.getMatIdList());
			storageEscalationParam.setFullPlt(staProtocol.isFullPlt() ? 1 : 0);
			storageEscalationParam.setMpHigh((short) (staProtocol.getSiteId() < 200 ? 1 :staProtocol.isHigh() ? 2 : staProtocol.isLow() ? 1 : 0)); // 高度，侧面码盘的高度低1，高2
			log.info("组托入库={}", storageEscalationParam);
			TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
			if (taskWrk == null) {
			@@ -247,12 +251,17 @@
			log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
			staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
			staProtocol.setBarcode(taskWrk.getBarcode());
			if (!Cools.isEmpty(taskWrk.getType())) {
			staProtocol.setHeight(taskWrk.getType());
			}
			boolean offer = false;
			try {
			offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
			staProtocol.setMp(taskWrk.getMp());
			staProtocol.setLx(taskWrk.getLx());
			staProtocol.setLev(taskWrk.getLev());
			MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
			} catch (Exception e) {
			log.error("下发输送线任务失败：异常:" + e);
			log.error("下发输送线任务失败：异常:offer:" + offer);
			@@ -263,7 +272,8 @@
			taskWrk.setWrkSts(14);
			taskWrk.setCompleteTime(new Date());
			taskWrkService.updateById(taskWrk);

			// 侧面出库完成上报执行状态
			toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
			} else {
			log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
			}
			@@ -292,7 +302,8 @@
			taskWrk.setWrkSts(14);
			taskWrk.setCompleteTime(new Date());
			taskWrkService.updateById(taskWrk);

			// 正面出库完成上报执行状态
			toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
			} else {
			log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
			}
			@@ -328,25 +339,40 @@

			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
			&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0 && wrkMastMapper.selectWorking(crn.getId()) == null) {
			boolean success;
			// 如果最近一次是入库模式
			if (crnProtocol.getLastIo().equals("I")) {
			if (basCrnp.getInEnable().equals("Y")) {
			this.crnStnToLoc(crn, crnProtocol); // 入库
			crnProtocol.setLastIo("O");
			} else if (basCrnp.getOutEnable().equals("Y")) {
			this.locToCrnStn(crn, crnProtocol); // 出库
			crnProtocol.setLastIo("I");
			success = this.crnStnToLoc(crn, crnProtocol); // 入库
			if(success) {
			crnProtocol.setLastIo("O");
			continue;
			}
			}
			if (basCrnp.getOutEnable().equals("Y")) {
			success = this.locToCrnStn(crn, crnProtocol); // 出库
			if(success) {
			crnProtocol.setLastIo("I");
			continue;
			}
			}
			}
			// 如果最近一次是出库模式
			else if (crnProtocol.getLastIo().equals("O")) {
			if (basCrnp.getOutEnable().equals("Y")) {
			this.locToCrnStn(crn, crnProtocol); // 出库
			crnProtocol.setLastIo("I");
			} else if (basCrnp.getInEnable().equals("Y")) {
			this.crnStnToLoc(crn, crnProtocol); // 入库
			crnProtocol.setLastIo("O");
			success = this.locToCrnStn(crn, crnProtocol); // 出库
			if(success) {
			crnProtocol.setLastIo("I");
			continue;
			}
			}
			if (basCrnp.getInEnable().equals("Y")) {
			success = this.crnStnToLoc(crn, crnProtocol); // 入库
			if(success) {
			crnProtocol.setLastIo("O");
			continue;
			}
			}
			}
			// 库位移转
			@@ -359,7 +385,7 @@
			/**
			* 入库 ===>> 堆垛机站到库位
			*/
			public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol) throws IOException {
			public boolean crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol) throws IOException {
			for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
			for (StaDesc staDesc : staDescs) {
			@@ -445,6 +471,7 @@
			// 上报执行状态
			toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
			taskWrkService.updateById(taskWrk);
			return true;
			} catch (Exception e) {
			log.error("修改工作档状态 2.设备上走 => 3.吊车入库中失败！！，工作号={}", taskWrk.getWrkNo());
			log.error("修改工作档状态 2.设备上走 => 3.吊车入库中失败！！，异常：" + e);
			@@ -452,17 +479,27 @@
			}
			}
			}
			return false;
			}
			@Resource
			private ConfigService configService;

			/**
			* 出库 ===>> 库位到堆垛机站
			* 2022-06-09 TQS修改，查询工作档LIST，遍历下发，防止第一个任务堵塞出库
			*/
			public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
			public boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
			List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(slave.getId(), null);
			if (taskWrksInitial.size() == 0) {
			return;
			return false;
			}
			// 控制是否允许连续出库，不判断出库站点状态
			boolean crnAvailableOut = false;
			Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","removeCrnAvailableOut"));
			if (config != null && config.getStatus() == 1) {
			crnAvailableOut = true;
			}

			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", slave.getId()).eq("crn_stn", crnStn.getStaNo()));
			for (StaDesc staDesc : staDescs) {
			@@ -493,6 +530,8 @@
			.eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
			if (!Cools.isEmpty(locMast1)) {
			log.info(locMast.getLocNo() + "出深库位，浅库位有货");
			taskWrk.setMemo("浅库位有货");
			taskWrkService.updateById(taskWrk);
			continue;
			}
			} else if (flag == 2) {
			@@ -502,6 +541,8 @@
			.eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
			if (!Cools.isEmpty(locMast1)) {
			log.info(locMast.getLocNo() + "出深库位，浅库位有货");
			taskWrk.setMemo("浅库位有货");
			taskWrkService.updateById(taskWrk);
			continue;
			}
			}
			@@ -522,10 +563,14 @@
			log.error("出库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			break;
			}
			// 只有205和210允许连续出库
			if (staProtocol.getSiteId() != 205 && staProtocol.getSiteId() != 210) {
			crnAvailableOut = false;
			}

			// 判断堆垛机出库站状态
			if (staProtocol.isAutoing() && (outloading \|\| !staProtocol.isLoading()) && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
			&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
			if (staProtocol.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
			&& (crnAvailableOut \|\| !staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable())) {
			// 命令下发区 --------------------------------------------------------------------------

			// 堆垛机控制过滤
			@@ -535,7 +580,7 @@

			// 已经存在吊车执行任务时，则过滤
			if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
			break;
			return false;
			}
			CrnCommand command = new CrnCommand();
			command.setCrnNo(taskWrk.getCrnNo()); // 堆垛机编号
			@@ -570,6 +615,7 @@
			}
			// 上报执行状态
			toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
			return true;
			} catch (Exception e) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，异常：" + e);
			@@ -579,6 +625,7 @@
			}
			}
			}
			return false;
			}

			/**