zy-wcs.git - Gitblit

			@@ -9,15 +9,13 @@
			import com.core.exception.CoolException;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.mapper.BasCrnErrorMapper;
			import com.zy.asrs.mapper.TestMastMapper;
			import com.zy.asrs.mapper.WaitPakinMapper;
			import com.zy.asrs.mapper.WrkMastMapper;
			import com.zy.asrs.service.*;
			import com.zy.asrs.utils.Utils;
			import com.zy.asrs.utils.VersionUtils;
			import com.zy.common.model.LocTypeDto;
			import com.zy.common.model.MatDto;
			import com.zy.common.model.SearchLocParam;
			import com.zy.common.model.StartupDto;
			import com.zy.common.model.*;
			import com.zy.common.service.CommonService;
			import com.zy.common.utils.CollectionUtils;
			import com.zy.common.utils.HttpHandler;
			@@ -87,9 +85,14 @@
			private BasErrLogService basErrLogService;
			@Autowired
			private BasCrnErrorMapper basCrnErrorMapper;
			@Autowired
			private TestMastService testMastService;

			@Value("${wms.url}")
			private String wmsUrl;

			@Value("${test.url}")
			private String testUrl;

			/**
			* 组托
			@@ -100,12 +103,14 @@
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历入库口
			for (DevpSlave.Sta inSta : devp.getInSta()) {
			inSta.setStaNo(102);
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
			if (barcodeThread == null) {
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			barcode="ILY0127 0001";
			if(!Cools.isEmpty(barcode)) {
			log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			@@ -162,7 +167,7 @@
			try {

			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			locTypeDto.setLocType1((short)1);
			SearchLocParam param = new SearchLocParam();
			param.setBarcode(barcode);
			param.setIoType(1);
			@@ -530,14 +535,16 @@
			continue;
			}

			//堆垛机回原点任务中
			if(crnThread.isBackHpFlag()){
			continue;
			}
			// //堆垛机回原点任务中
			// if(crnThread.isBackHpFlag()){
			// continue;
			// }

			// 只有当堆垛机空闲并且无任务时才继续执行
			if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
			&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
			// 库位移转
			this.stnToStn(crn, crnProtocol);
			// 如果最近一次是入库模式
			if (crnProtocol.getLastIo().equals("I")) {
			if (basCrnp.getInEnable().equals("Y")) {
			@@ -561,7 +568,7 @@
			}
			// 库位移转
			this.locToLoc(crn, crnProtocol);
			this.crnRebackHp(crnProtocol, crnThread);
			// this.crnRebackHp(crnProtocol, crnThread);

			}
			}
			@@ -601,6 +608,7 @@
			if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) == null) {
			return;
			}

			log.info("堆垛机召回原点==>>" + crnProtocol.getCrnNo() + "号堆垛机有入库任务,召回原点");
			// 命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			@@ -673,7 +681,7 @@

			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			return;
			continue;
			}

			// 双深库位且浅库位有货，则需先对浅库位进行库位移转
			@@ -1408,7 +1416,7 @@
			ledCommand.setStaNo(wrkMast.getStaNo());
			if (wrkMast.getIoType() != 110) {
			List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
			wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatNo(), wrkDetl.getMatName(), wrkDetl.getQty())));
			wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme())));
			}
			commands.add(ledCommand);
			}
			@@ -1499,7 +1507,7 @@
			}
			}
			// 获取led线程
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
			// led显示默认内容
			if (reset && !ledThread.isLedMk()) {
			ledThread.setLedMk(true);
			@@ -1553,7 +1561,7 @@
			WrkDetl wrkDetl = new WrkDetl();
			wrkDetl.setWrkNo(workNo);
			wrkDetl.setIoTime(now);
			wrkDetl.setQty(locDetl.getQty());
			wrkDetl.setAnfme(locDetl.getAnfme());
			VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
			wrkDetl.setAppeTime(now);
			wrkDetl.setModiTime(now);
			@@ -1670,7 +1678,7 @@
			WrkDetl wrkDetl = new WrkDetl();
			wrkDetl.setWrkNo(workNo);
			wrkDetl.setIoTime(new Date());
			wrkDetl.setQty(locDetl.getQty());
			wrkDetl.setAnfme(locDetl.getAnfme());
			VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
			wrkDetl.setAppeTime(new Date());
			wrkDetl.setModiTime(new Date());
			@@ -1885,8 +1893,6 @@
			} catch (Exception e) {
			e.printStackTrace();
			}


			}

			public void outOfDevp() {
			@@ -1902,5 +1908,158 @@
			}
			}

			/**
			* 站到站 ===>> 堆垛机109站到108站
			* 109防爆沙箱站点出库到 108站点
			*/
			public void stnToStn(CrnSlave slave, CrnProtocol crnProtocol){
			for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
			if(crnStn.getStaNo()!=109){ continue; }

			boolean flag = false;
			// 获取堆垛机入库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
			if (staProtocol == null) {
			continue;
			} else {
			staProtocol = staProtocol.clone();
			}
			// 查询站点详细信息
			BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
			if (staDetl == null) {
			log.error("入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
			continue;
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
			&& staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
			flag = true;
			}

			StaProtocol staProtocol1 = devpThread.getStation().get(108);
			if (staProtocol1 == null) {
			continue;
			} else {
			staProtocol1 = staProtocol1.clone();
			}
			if (!staProtocol1.isAutoing() \|\| staProtocol1.isLoading() \|\| staProtocol1.getWorkNo() != 0 \|\| !staProtocol1.isOutEnable()) {
			flag = false;
			}

			if (!flag) {
			continue;
			}

			// 堆垛机控制过滤
			if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) \|\| crnProtocol.getTaskNo() != 0) {
			continue;
			}

			// 已经存在吊车执行任务时，则过滤
			if (wrkMastMapper.selectWorking(slave.getId()) != null) {
			continue;
			}

			// 命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
			crnCommand.setTaskNo((short)9999); // 工作号
			crnCommand.setAckFinish((short) 0); // 任务完成确认位
			crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式: 库位移转
			crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 源库位排
			crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 源库位列
			crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 源库位层
			crnCommand.setDestinationPosX((short)2); // 目标库位排
			crnCommand.setDestinationPosY((short)19); // 目标库位列
			crnCommand.setDestinationPosZ((short)1); // 目标库位层
			if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", 1, JSON.toJSON(crnCommand));
			} else {
			}
			}
			}

			/**
			* 根据PLC按钮测试信号，发送启动申请到测试系统
			*/
			@Transactional
			public void startTest() {
			try {
			// 根据输送线plc遍历
			for (DevpSlave devp : slaveProperties.getDevp()) {
			SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
			if(null != devpThread){
			int channel = 0;
			for (int i = 0; i < 4; i++){
			switch (i){
			case 0:
			channel = devpThread.startSignal1;
			break;
			case 1:
			channel = devpThread.startSignal2;
			break;
			case 2:
			channel = devpThread.startSignal3;
			break;
			case 3:
			channel = devpThread.startSignal4;
			break;
			}
			if (channel == 1){
			TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
			.eq("channel",(i+1)).eq("status",0));
			if(null != testMast){
			Date now = new Date();
			//http请求测试
			TestDto testDto = new TestDto();
			testDto.setLocNo(testMast.getLocNo());
			testDto.setBarcode(testMast.getBarcode());
			testDto.setUserId(testMast.getUserId());
			testDto.setRequestTime(DateUtils.convert(now));
			String response = new HttpHandler.Builder()
			.setUri(testUrl)
			.setPath("/testUrlPath")
			.setJson(JSON.toJSONString(testDto))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			if (jsonObject.getInteger("code").equals(200)) {
			//更新测试表状态
			testMast.setStatus(1);
			testMast.setModiTime(now);
			if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
			.eq("channel",1).eq("status",0))){
			throw new CoolException("更新产品测试状态失败");
			}
			// //更新库位状态，锁定pack状态，禁止入出库作业
			// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",testMast.getLocNo()));
			// if(null != locMast){
			// locMast.setPackStatus(2);//测试中
			// locMast.setModiTime(now);
			// if(!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no",testMast.getLocNo()))){
			// throw new CoolException("产品开始测试，更新目标库位锁定状态失败");
			// }
			// }
			//复位PLC信号
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, i*2));
			} else {
			log.error("请求接口失败！！！url：{},request：{},response：{}", testUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(testDto), response);
			}

			}
			}

			}

			}

			}

			} catch (Exception e) {
			log.error("启动测试 ===>> 启动测试失败", e);
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}

			}