zy-wcs.git - Gitblit

			@@ -241,6 +241,22 @@
			String errorMsg = barcode + "托盘识别异常，请先进行组托！";
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
			}
			} else if (code == 1000){
			if (inSta.getStaNo().equals(103)){
			staProtocol.setWorkNo((short)9999);
			staProtocol.setStaNo((short)203);
			}else {
			staProtocol.setWorkNo((short)9999);
			staProtocol.setStaNo((short)103);
			}
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

			// led 异常显示
			if (ledThread != null) {
			String errorMsg = barcode + "需要换入库站。目标站："+staProtocol.getStaNo();
			MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			@@ -336,8 +352,6 @@
			staNo = 103;
			if (basDevps1.size()!=0 && basDevps2.size()!=0){
			continue;
			} else if (basDevps1.size()!=0){
			staNo = 203;
			}

			List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType((int)staNo);
			@@ -360,8 +374,6 @@
			staNo = 203;
			if (basDevps1.size()!=0 && basDevps2.size()!=0){
			continue;
			} else if (basDevps2.size()!=0){
			staNo = 103;
			}

			// if (basDevps2.size()!=0){
			@@ -391,9 +403,17 @@
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(staNo);
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			if (staProtocol.getStaNo().equals(300)){
			BasDevp basDevp = basDevpMapper.selectByDevNo(300);
			basDevp.setWrkNo1(wrkMast.getWrkNo());
			basDevpService.selectById(basDevp);
			News.info("300站去入库站任务下发，更新站点表，[任务号:{}，站点号:{}]", wrkMast.getWrkNo().shortValue(), staNo);
			}
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			} else {
			News.info("300站去入库站任务已下发，[任务号:{}，站点号:{}]", wrkMast.getWrkNo().shortValue(), staNo);
			}
			}
			}
			@@ -492,6 +512,15 @@
			.eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
			StaDesc staDesc = staDescService.selectOne(wrapper);
			if (Cools.isEmpty(staDesc)) {
			// led 异常显示
			String errorMsg = "";
			LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
			if (wrkMast.getIoType() == 103) {
			errorMsg = "当前拣料任务请移动至203站";
			} else {
			errorMsg = "当前拣料任务请移动至103站";
			}
			if (ledThread != null) {MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));}
			News.error("入库路径不存在！type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
			continue;
			}
			@@ -561,6 +590,11 @@
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			if (staProtocol.getStaNo().equals(300)){
			BasDevp basDevp = basDevpMapper.selectByDevNo(300);
			basDevp.setWrkNo1(wrkMast.getWrkNo());
			basDevpService.selectById(basDevp);
			}
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			News.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			@@ -940,10 +974,16 @@
			continue;
			}

			// 入库深库位是否有非F、D、X库位进行校验
			// 入库深库位是否有非F、D、X库位进行校验（ Q、P、R、S）
			if (wrkMastMapper.selectShallowLoc(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)),Integer.parseInt(wrkMast.getLocNo().substring(2, 5)),Integer.parseInt(wrkMast.getLocNo().substring(5, 7)))!=null){
			continue;
			//检查入库库位是否是在堆垛机边库位
			ArrayList<Integer> outLoc = new ArrayList<>();
			outLoc.add(3);outLoc.add(4);outLoc.add(11);outLoc.add(12);outLoc.add(18);outLoc.add(19);
			if (!outLoc.contains(Integer.parseInt(wrkMast.getLocNo().substring(0, 2)))) {
			continue;
			}
			}


			//加强判断，只要存在移库任务，说明出库任务未完全结束，不执行入库任务
			WrkMast one = wrkMastMapper.selectLocMoveData(slave.getId());
			@@ -993,18 +1033,22 @@
			}

			}
			} else if (shallowLoc.getLocSts().equals("Q") \|\| shallowLoc.getLocSts().equals("S")) {
			News.error("库位出库到堆垛机站 ===>> 浅库位库位状态为入库预约！出库库位={},浅库位号={}", shallowLoc.getLocNo());
			// } else if (shallowLoc.getLocSts().equals("Q") \|\| shallowLoc.getLocSts().equals("S")) {
			// News.error("库位出库到堆垛机站 ===>> 浅库位库位状态为入库预约！出库库位={},浅库位号={}", shallowLoc.getLocNo());
			// flag = true;
			// break;
			} else if (shallowLoc.getLocSts().equals("R") \|\| shallowLoc.getLocSts().equals("P")) {
			News.error("库位出库到堆垛机站 ===>> 库位状态在库，但是浅库位已存在工作档任务！出库库位={},浅库位号={}", shallowLoc.getLocNo());
			flag = true;
			break;
			}

			//20230307 ADD，再加一次判断，当浅库位状态不为O时，不执行当前出库任务
			if (shallowLoc != null && !shallowLoc.getLocSts().equals("O")) {
			News.error("做了浅库位阻塞处理后反复判断，浅库位状态不为O ===>> 浅库位库位状态为入库预约！出库库位={},浅库位号={}", wrkMast.getSourceLocNo(), shallowLoc.getLocNo());
			flag = true;
			break;
			}
			// //20230307 ADD，再加一次判断，当浅库位状态不为O时，不执行当前出库任务
			// if (shallowLoc != null && !shallowLoc.getLocSts().equals("O")) {
			// News.error("做了浅库位阻塞处理后反复判断，浅库位状态不为O ===>> 浅库位库位状态为入库预约！出库库位={},浅库位号={}", wrkMast.getSourceLocNo(), shallowLoc.getLocNo());
			// flag = true;
			// break;
			// }
			}
			}
			}
			@@ -1194,6 +1238,10 @@
			}
			// 堆垛机搬运小车
			if (wrkMast.getWrkSts() == 3L) {
			if (Cools.isEmpty(wrkMast.getSteNo()) \|\| wrkMast.getSteNo()==0){
			News.error("工作号={}即将开始搬运小车但是工作档没有小车号",wrkMast.getWrkNo());
			return false;
			}
			this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
			}
			}
			@@ -1316,12 +1364,25 @@
			News.error("库位异常");
			}else {
			if (waitWrkMast.getIoType() != 11 \|\| waitWrkMast.getWrkSts() != 17){
			waitWrkMast.setIoPri((double)9999);
			if(waitWrkMast.getIoPri()<=9980.0){
			waitWrkMast.setIoPri(waitWrkMast.getIoPri()+10.0);
			}else {
			waitWrkMast.setIoPri(9999d);
			}
			if (wrkMast.getIoPri()>20.0){
			wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
			}else {
			wrkMast.setIoPri(13.0d);
			}
			if (wrkMastMapper.updateById(wrkMast)==0){
			News.error("调整优先级失败");
			}
			if (wrkMastMapper.updateById(waitWrkMast)==0){
			News.error("调整优先级失败");
			}else if (waitWrkMast.getWrkSts() != 17){
			flag = true;
			}

			break;
			}
			}
			@@ -1553,6 +1614,10 @@
			}
			// 堆垛机搬运小车
			if (wrkMast.getWrkSts() == 12L) {
			if (Cools.isEmpty(wrkMast.getSteNo()) \|\| wrkMast.getSteNo()==0) {
			News.error("工作号={}即将开始搬运小车但是工作档没有小车号",wrkMast.getWrkNo());
			return false;
			}
			this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
			}
			}
			@@ -2451,6 +2516,10 @@
			}
			// 堆垛机搬运小车
			if (wrkMast.getWrkSts() == 12L) {
			if (Cools.isEmpty(wrkMast.getSteNo()) \|\| wrkMast.getSteNo()==0) {
			News.error("工作号={}即将开始搬运小车但是工作档没有小车号",wrkMast.getWrkNo());
			return;
			}
			this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
			}
			}
			@@ -3395,6 +3464,10 @@
			switch (wrkMast.getWrkSts().intValue()) {
			case 2:
			// 修改工作档状态 2.设备上走 => 3.小车待搬
			if (Cools.isEmpty(wrkMast.getSteNo()) \|\| wrkMast.getSteNo()==0){
			News.error("修改工作档状态 2.设备上走 => 3.小车待搬失败！！，工作号={} 原因：工作号没小车", wrkMast.getWrkNo());
			break;
			}
			wrkMast.setWrkSts(3L);
			wrkMast.setModiTime(now);
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			@@ -3873,15 +3946,24 @@
			ledCommand.setBarcode(wrkMast.getBarcode());
			if (wrkMast.getIoType() != 110) {
			List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());

			wrkDetls.forEach(wrkDetl -> {
			Double total = 0.0;
			EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
			LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
			if (Cools.isEmpty(locDetl)) {
			total = wrkDetl.getAnfme();
			} else {
			total = locDetl.getAnfme();
			}
			if (wrkMast.getIoType() == 101) {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
			}
			if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() \|\| 0 == wrkDetl.getInspect())) {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
			}
			if (wrkMast.getIoType() == 107) {
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getAnfme()));
			ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
			}
			});
			}
			@@ -4323,15 +4405,21 @@
			\|\| Utils.getBay(one.getLocNo()) != Utils.getBay(shallowLoc.getLocNo())
			\|\| Utils.getLev(one.getLocNo()) != Utils.getLev(shallowLoc.getLocNo())){

			Integer steNo = this.hasCarOfIdle(one.getLocNo());
			Integer steNo = this.hasCar(one.getLocNo());
			if (steNo != null) {
			//有小车
			continue;
			}

			//检测当前库位内侧其他库位是否为D、F、X
			if (Utils.checkInsideLocIsDFX(one.getLocNo())) {
			//内侧其他库位不是D、F、X。不能选取该库位
			// //检测当前库位内侧其他库位是否为D、F、X
			// if (Utils.checkInsideLocIsDFX(one.getLocNo())) {
			// //内侧其他库位不是D、F、X。不能选取该库位
			// continue;
			// }

			//检测当前库位内侧其他库位是否为D、F、X、O
			if (Utils.checkInsideLocIsDFXO(one.getLocNo())) {
			//内侧其他库位不是D、F、X、O。不能选取该库位
			continue;
			}

			@@ -4342,7 +4430,8 @@

			if (null == loc) {
			News.error("深库位出库 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			throw new CoolException("深库位出库 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			// return;
			// throw new CoolException("深库位出库 --- 浅库位阻塞异常！待移转浅库位：" + shallowLoc.getLocNo());
			}

			// 获取工作号