zy-wcs.git - Gitblit

			@@ -993,18 +993,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 +1198,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);
			}
			}
			@@ -1207,6 +1215,7 @@
			* 出库 ===>> 库位到堆垛机站
			*/
			public synchronized boolean locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
			Collections.shuffle(slave.getCrnOutStn());
			for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
			// 获取工作状态为11（生成出库ID）的出库工作档
			WrkMast wrkMast = wrkMastMapper.selectPakOutStep111215(slave.getId(), crnStn.getStaNo());
			@@ -1310,7 +1319,36 @@
			for (String shallowLocNo : shallowLocs) {
			LocMast shallowLoc = locMastService.selectById(shallowLocNo);
			WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
			if (shallowLoc.getLocSts().equals("F") \|\| shallowLoc.getLocSts().equals("D")) {
			if (shallowLoc.getLocSts().equals("P") \|\| shallowLoc.getLocSts().equals("R")) {
			if (Cools.isEmpty(waitWrkMast)){
			News.error("库位异常");
			}else {
			if (waitWrkMast.getIoType() != 11 \|\| waitWrkMast.getWrkSts() != 17){
			if(waitWrkMast.getIoPri()<=9980.0){
			waitWrkMast.setIoPri(waitWrkMast.getIoPri()+10.0);
			}else {
			waitWrkMast.setIoPri(9999d);
			}
			if(wrkMast.getIoPri()>=9000.0){
			wrkMast.setIoPri(9999d);
			}else 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;
			}
			}
			}else if (shallowLoc.getLocSts().equals("F") \|\| shallowLoc.getLocSts().equals("D")) {
			if (null == waitWrkMast) {
			// 生成一笔移库任务工作档、改变浅库位的源库/目标库库位状态
			// 没有作业中的出库任务时，才能生成移库任务
			@@ -1538,6 +1576,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);
			}
			}
			@@ -2436,6 +2478,10 @@
			}
			// 堆垛机搬运小车
			if (wrkMast.getWrkSts() == 12L) {
			if (Cools.isEmpty(wrkMast.getSteNo()) \|\| wrkMast.getSteNo()==0) {
			News.error("工作号={}即将开始搬运小车但是工作档没有小车号",wrkMast.getWrkNo());
			return;
			}
			this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
			}
			}
			@@ -3380,6 +3426,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) {
			@@ -3858,15 +3908,18 @@
			ledCommand.setBarcode(wrkMast.getBarcode());
			if (wrkMast.getIoType() != 110) {
			List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
			EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
			wrkDetls.forEach(wrkDetl -> {

			LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
			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(),locDetl.getAnfme()));
			}
			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(),locDetl.getAnfme()));
			}
			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(),locDetl.getAnfme()));
			}
			});
			}
			@@ -4308,7 +4361,7 @@
			\|\| 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;