zy-wcs.git - Gitblit

			@@ -35,6 +35,7 @@
			import com.zy.core.properties.SlaveProperties;
			import com.zy.core.thread.BarcodeThread;
			import com.zy.core.thread.LedThread;
			import com.zy.core.thread.SiemensCrnThread;
			import com.zy.core.thread.SiemensDevpThread;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -109,6 +110,7 @@
			continue;
			}
			String barcode = barcodeThread.getBarcode();
			// barcode="ILY0127 0001";
			if(!Cools.isEmpty(barcode)) {
			log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
			if("NG".endsWith(barcode) \|\| "NoRead".equals(barcode)) {
			@@ -163,14 +165,16 @@
			// }

			try {

			String pack=barcode.substring(6);//pack码
			barcode=barcode.substring(0,6);//托盘码
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			locTypeDto.setLocType1((short)1);
			SearchLocParam param = new SearchLocParam();
			param.setBarcode(barcode);
			param.setIoType(1);
			param.setSourceStaNo(inSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			param.setPackNo(pack);
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/loc/v1")
			@@ -189,7 +193,21 @@
			if (!result) {
			throw new CoolException("更新plc站点信息失败");
			}
			} else {
			} else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))){
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo((short)9998);
			staProtocol.setStaNo((short)101);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}else {
			StartupDto dto = jsonObject.getObject("data", StartupDto.class);
			barcodeThread.setBarcode("");
			staProtocol.setWorkNo((short)9998);
			staProtocol.setStaNo((short)101);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
			}

			@@ -470,7 +488,7 @@
			} else {
			staProtocol = staProtocol.clone();
			}
			if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getStaNo() == null)) {
			if (staProtocol.isAutoing() && (staProtocol.isLoading()\|\|staProtocol.getSiteId()==109) && (staProtocol.getWorkNo() == 0 \|\| staProtocol.getStaNo() == null)) {
			// 查询工作档
			WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(staProtocol.getSiteId());
			if (wrkMast == null) {
			@@ -731,7 +749,8 @@
			crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 源库位层
			crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层
			crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 目标库位层\
			crnCommand.setBarcode(wrkMast.getBarcode());
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			@@ -874,6 +893,7 @@
			crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 目标库位排
			crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 目标库位列
			crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 目标库位层
			crnCommand.setBarcode(wrkMast.getBarcode());
			if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
			log.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
			} else {
			@@ -1414,7 +1434,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);
			}
			@@ -1559,7 +1579,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);
			@@ -1676,7 +1696,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());
			@@ -1978,81 +1998,202 @@
			}

			/**
			* 根据PLC按钮测试信号，发送启动申请到测试系统
			* 根据PLC按钮测试、完成、暂停信号，更新testMast表中status值，交由WMS系统处理
			*/
			@Transactional
			public void startTest() {
			public void packTest() {
			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;
			for (int i = 0; i < 48; i++){
			int olsStatus = 0;//testMast表原来status数据状态
			int newStatus = 0;//testMast表待修改的status数据状态
			short newSingle = 0; //PLC地址待修改的新值
			switch (devpThread.startSignal[i][0]){//根据信号查找testMast表中对应状态条件,olsStatus，newStatus根据实际流程调整
			case 0://初始状态，入库
			olsStatus = 1;//待测
			newStatus = 1;//待测
			newSingle = 1;//库存有资料，寄存器地址，0===>>1
			break;
			case 1:
			channel = devpThread.startSignal2;
			case 2://启动复核信号
			olsStatus = 1;//待测
			newStatus = 2;//复核中
			newSingle = 3;//测试复核，寄存器地址，2===>>3
			break;
			case 2:
			channel = devpThread.startSignal3;
			case 3://测试完成
			olsStatus = 4;//测试完成
			newStatus = 4;//测试完成
			newSingle = 4;//测试完成，寄存器地址，3===>>4
			break;
			case 3:
			channel = devpThread.startSignal4;
			case 5://NG测试信号
			case 6://完成测试信号
			case 22://完成测试信号
			olsStatus = 4;//测试完成
			newStatus = 5;//已移库
			newSingle = 0;//启动移库，寄存器地址清零，5/6===>>0
			break;
			case 7://暂停信号
			olsStatus = 99;//plc给出暂停信号
			newStatus = 0;//WCS收到暂停信号后，更新testMast
			newSingle = 8;//暂停测试，寄存器地址，7===>>8
			break;
			case 9://紧急出库确认充电线已经拔出
			olsStatus = 99;//plc给出暂停信号
			newStatus = 0;//WCS收到暂停信号后，更新testMast
			newSingle = 8;//暂停测试，寄存器地址，9===>>8
			break;
			case 10://解除暂停信号
			olsStatus = 0;//plc给出暂停信号
			newStatus = 1;//WCS收到暂停信号后，更新testMast
			newSingle = 0;//暂停测试，寄存器地址，10===>>0/11
			break;
			case 12://紧急出库确认充电线已经拔出
			newSingle = 11;//暂停测试，寄存器地址，12===>>11
			break;
			case 13://入库前判断充电线是否放好
			newSingle = 14;//禁用库位，寄存器地址，13===>>14
			break;
			case 15://充电线放好
			newSingle = 0;//复位，寄存器地址，12===>>0
			break;
			default:
			log.error("读取测试库位信号出错");
			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));

			TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
			.eq("channel",(i+1)).eq("status",olsStatus));//查找原来的状态
			LocMast locMast=null;
			boolean sign=false;
			switch (devpThread.startSignal[i][0]){
			case 0:
			case 3:
			if (!Cools.isEmpty(testMast)){
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
			if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
			sign=true;
			}
			}
			break;
			case 5:
			case 6:
			if (!Cools.isEmpty(testMast)){
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
			if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
			if (devpThread.startSignal[i][0]==5 && locMast.getPackStatus()==4){
			sign=true;
			}else if (devpThread.startSignal[i][0]==6 && locMast.getPackStatus()==3){
			sign=true;
			}else {
			log.error("测试完成移库时按下完成按钮与测试结果不一致===>>[channel:{}", i+1);
			}
			}else {
			log.error("测试完成移库时未查询到测试档案===>>[channel:{}", i+1);
			}
			}
			break;
			case 2:
			if (!Cools.isEmpty(testMast)){
			testMast.setStatus(newStatus);
			testMast.setModiTime(new Date());
			if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
			throw new CoolException("更新产品测试状态失败");
			}else {
			sign=true;
			}
			}else {
			log.error("启动测试时未查询到测试档案===>>[channel:{}", i+1);
			}
			break;
			case 7:
			SearchLocParam param = new SearchLocParam();
			param.setBarcode(i+1+"");
			String response = new HttpHandler.Builder()
			.setUri(testUrl)
			.setPath("/testUrlPath")
			.setJson(JSON.toJSONString(testDto))
			.setUri(wmsUrl)
			.setPath("/mobile/test/suspend/auth")
			.setJson(JSON.toJSONString(param))
			.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("更新产品测试状态失败");
			testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("channel",(i+1)));
			testMast.setStatus(newStatus);
			testMast.setModiTime(new Date());
			if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
			log.error("更新产品测试状态失败");
			}
			// //更新库位状态，锁定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));
			sign=true;
			} else {
			log.error("请求接口失败！！！url：{},request：{},response：{}", testUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(testDto), response);
			log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/mobile/test/suspend/auth", JSON.toJSONString(param), response);
			}

			break;
			case 9:
			case 12:
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
			if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F") \|\| locMast.getLocSts().equals("D")){
			locMast.setPackStatus(8); //8.紧急出库
			if (locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)))){
			log.info("库位：{}，紧急出库！",locMast.getLocNo());
			}
			}else {
			log.error("库位不是在库状态，无需紧急出库！");
			}
			sign=true;
			break;
			case 10:
			if (!Cools.isEmpty(testMast)){
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
			if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F") ){
			if ( locMast.getFireStatus().equals(1)){
			newSingle=11;
			}else {
			testMast.setStatus(newStatus);
			testMast.setModiTime(new Date());
			if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
			throw new CoolException("更新产品测试状态失败");
			}else {
			sign=true;
			}
			}
			}
			}
			sign=true;
			break;
			case 13:
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
			if (locMast.getLocSts().equals("O")){
			locMast.setLocSts("X");
			locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)));
			}
			sign=true;
			break;
			case 15:
			locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
			if (locMast.getLocSts().equals("X")){
			locMast.setLocSts("O");
			locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)));
			}
			sign=true;
			break;
			default:
			log.error("读取测试库位信号出错");
			continue;
			}
			if (sign){
			boolean result = messageQueueOffer(i,newSingle,SlaveType.Devp, devp.getId());
			if(!result){
			log.error("更新测试信号失败===>>[channel:{},locNo:{},barcode:{}]", i+1, testMast.getLocNo(), testMast.getBarcode());
			} else {
			devpThread.startSignal[i][0] = newSingle;
			}
			}

			}

			}

			}

			} catch (Exception e) {
			log.error("启动测试 ===>> 启动测试失败", e);
			e.printStackTrace();
			@@ -2060,4 +2201,42 @@
			}
			}

			public boolean messageQueueOffer(int i ,short newSingle,SlaveType devp,Integer id){
			//复位PLC信号，借用输送站点实体类
			StaProtocol staProtocol = new StaProtocol();
			staProtocol.setSiteId(i*2);//寄存器地址
			staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,8==>0
			return MessageQueue.offer(devp, id, new Task(3, staProtocol));
			}

			/**
			* 将火警报警信号写入到堆垛机PLC中
			*/
			@Transactional
			public void fierCrn() {
			try {
			for (CrnSlave crn :slaveProperties.getCrn()) {
			// 获取堆垛机信息
			CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
			CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
			if (!Cools.isEmpty(locMast)){
			//报警信号写入1
			if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, (short)1))) {
			log.error("火警 ===>> 给堆垛机发送报警信号失败");
			}
			} else {
			//报警信号没有后，复位地址
			if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, (short)0))) {
			log.error("火警 ===>> 给堆垛机清零复位报警信号失败");
			}
			}
			}
			} catch (Exception e) {
			log.error("火警 ===>> 给堆垛机发送警报失败", e);
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			}
			}

			}