zy-wcs.git - Gitblit

			@@ -104,12 +104,6 @@

			@Value("${loc-move.enable}")
			private boolean enable;
			@Value("${loc-move.crn1}")
			private boolean crn1;
			@Value("${loc-move.crn2}")
			private boolean crn2;
			@Value("${loc-move.crn3}")
			private boolean crn3;


			public synchronized void generateStoreWrkFile() {
			@@ -118,9 +112,6 @@
			for (DevpSlave devp : slaveProperties.getDevp()) {
			// 遍历入库口
			for (DevpSlave.Sta inSta : devp.getInSta()) {
			if (inSta.getStaNo() != 114) {
			continue;
			}
			StorageEscalationParam storageEscalationParam = new StorageEscalationParam();
			storageEscalationParam.setStationCode(inSta.getStaNo());
			// 获取入库站信息
			@@ -166,7 +157,6 @@
			// 判断是否满足入库条件
			if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
			&& !staProtocol.isEmptyMk() && workNo >= 9000 && staProtocol.isPakMk()) {
			// if(true){
			// 获取条码扫描仪信息
			BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
			if (barcodeThread == null) {
			@@ -181,21 +171,13 @@
			if (!Cools.isEmpty(taskWrk1)) {
			log.info("托盘码：" + BoxNo + "任务档存在");
			continue;
			// if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
			// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			// .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
			// if (Cools.isEmpty(staDesc)) {
			// return;
			// } else {
			// continue;
			// }
			// }
			}
			if (back) {
			storageEscalationParam.setWCSStatus(1);
			storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
			}
			storageEscalationParam.setBarcode(BoxNo);
			storageEscalationParam.setMatIdList(staProtocol.getMatIdList());
			log.info("组托入库={}", storageEscalationParam);
			TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
			if (taskWrk == null) {
			@@ -203,33 +185,21 @@
			continue;
			}
			if (back) {
			log.info("托盘退回==>{}，{}", BoxNo, errMsg);
			staProtocol.setStaNo(inSta.getBackSta().shortValue());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			log.info("组托入库托盘退回命令推送输送线队列成功==>{}，{}", BoxNo, errMsg);
			} else {
			StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			.eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
			if (staDesc == null) {
			log.error("组托入库路径不存在，wrkNo={},crn={},stn_no={}",taskWrk.getWrkNo(),taskWrk.getCrnNo(),staProtocol.getSiteId());
			continue;
			}
			staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
			MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			//添加上报日志
			// toWmsService.addReportLog(taskWrk);
			// if (!Cools.isEmpty(taskWrk)) {
			// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
			// .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
			// staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			// staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
			// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// //添加上报日志
			// toWmsService.addReportLog(taskWrk);
			// } else {
			// log.info("创建工作档失败==>{}", taskWrk.getTaskNo());
			// staProtocol.setStaNo(inSta.getBackSta().shortValue());
			// devpThread.setPakMk(staProtocol.getSiteId(), false);
			// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			// }

			log.info("组托入库命令推送输送线队列成功:{}",staProtocol);
			}

			}
			@@ -249,8 +219,6 @@
			for (CrnSlave crnSlave : slaveProperties.getCrn()) {
			// 遍历堆垛机出库站
			for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
			// List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
			// for (StaDesc staDesc : staDescs) {
			try {
			// 获取堆垛机出库站信息
			DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
			@@ -266,13 +234,6 @@
			if (taskWrk == null) {
			continue;
			}
			// 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档
			// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, taskWrk.getCrnNo());
			// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
			// log.info(crnProtocol.statusType+""+crnProtocol.getForkPosType());
			// if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(taskWrk.getWrkNo().shortValue())
			// && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED
			// && crnProtocol.forkPosType == CrnForkPosType.HOME) {
			log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
			staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
			staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
			@@ -287,6 +248,7 @@
			log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
			taskWrk.setStatus(5);
			taskWrk.setWrkSts(14);
			taskWrk.setCompleteTime(new Date());
			taskWrkService.updateById(taskWrk);

			} else {
			@@ -386,6 +348,15 @@
			continue;
			}

			LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
			if(!locMast.getLocSts().equals("O") && taskWrk.getWrkSts() == 2) {
			log.error("入库WMS分配库位{}有误，库位状态为{}",locMast.getLocNo(),locMast.getLocSts());
			taskWrk.setWrkSts(5);
			taskWrk.setMemo("WMS分配库位有误");
			taskWrkService.updateById(taskWrk);
			continue;
			}

			// 堆垛机控制过滤
			if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) \|\| crnProtocol.getTaskNo() != 0) {
			continue;
			@@ -399,11 +370,12 @@
			// int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//获取入库工作号
			// taskWrk.setWrkNo(workNo);//工作号
			taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//派发状态
			taskWrk.setAssignTime(new Date());//派发时间
			taskWrk.setExecuteTime(new Date());
			// taskWrk.setAssignTime(new Date());//派发时间
			taskWrk.setWrkSts(3);//工作状态 3.吊车入库
			taskWrk.setCrnNo(staDesc.getCrnNo());//堆垛机号
			taskWrk.setModiTime(new Date());
			taskWrk.setModiUser(9988L);
			// taskWrk.setModiTime(new Date());
			// taskWrk.setModiUser(9988L);

			// 命令下发区 --------------------------------------------------------------------------
			CrnCommand crnCommand = new CrnCommand();
			@@ -462,24 +434,24 @@

			LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
			//判断其库位是否为深库位，如果为深库位找其浅库位是都有货
			boolean flag = false;
			int flag = 0;
			if (locMast.getRow1() == 1 \|\| locMast.getRow1() == 5 \|\| locMast.getRow1() == 9) {
			flag = true;
			flag = 1;
			} else if (locMast.getRow1() == 4 \|\| locMast.getRow1() == 8 \|\| locMast.getRow1() == 12) {
			flag = true;
			flag = 2;
			}
			if (flag) {
			if (flag == 1) {
			LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("row1", (locMast.getRow1() - 1))
			.eq("row1", (locMast.getRow1() + 1))
			.eq("bay1", locMast.getBay1())
			.eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
			if (!Cools.isEmpty(locMast1)) {
			log.info(locMast.getLocNo() + "出深库位，浅库位有货");
			continue;
			}
			} else {
			} else if (flag == 2){
			LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("row1", (locMast.getRow1() + 1))
			.eq("row1", (locMast.getRow1() - 1))
			.eq("bay1", locMast.getBay1())
			.eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
			if (!Cools.isEmpty(locMast1)) {
			@@ -546,7 +518,7 @@
			Date now = new Date();
			taskWrk.setWrkSts(12);
			taskWrk.setStatus(2);
			taskWrk.setModiTime(now);
			taskWrk.setExecuteTime(now);
			if (taskWrkMapper.updateById(taskWrk) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			}
			@@ -619,6 +591,7 @@
			Date now = new Date();
			taskWrk.setWrkSts(12);
			taskWrk.setStatus(2);
			taskWrk.setExecuteTime(now);
			taskWrk.setModiTime(now);
			if (taskWrkMapper.updateById(taskWrk) == 0) {
			log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中失败！！，工作号={}", taskWrk.getWrkNo());
			@@ -699,6 +672,7 @@
			locMast1.setModiUser(9999L);
			locMastService.updateById(locMast1);
			}
			taskWrk.setCompleteTime(new Date());
			taskWrkService.updateById(taskWrk);
			}