zy-wcs.git - Gitblit

			@@ -197,14 +197,14 @@
			continue;
			}

			if (inSta.getStaNo() == 1005) {
			if (inSta.getStaNo() == 1002 \|\| inSta.getStaNo() == 1007) {
			//检测是否有出库任务
			List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
			.in("io_type", 101, 103, 107)
			.in("sta_no", 1003, 1007)
			.in("sta_no", 1003, 1004)
			);
			if (!wrkMasts.isEmpty()) {
			News.error("" + mark + " - 4" + " - 1003站入库，检测存在出库任务，等待出库任务执行完成,托盘码={}", barcode);
			News.error("" + mark + " - 4" + " - 入库，检测存在出库任务，等待出库任务执行完成,托盘码={}", barcode);
			continue;
			}
			}
			@@ -414,15 +414,6 @@
			continue;
			}

			// 拣、盘、并作业站转换
			// int stnNo = 0;
			// if (wrkMast.getStaNo() == 109) {
			// stnNo = 127;
			// } else if (wrkMast.getStaNo() == 113) {
			// stnNo = 128;
			// } else {
			// log.error("{}号任务数据异常！", wrkMast.getWrkNo());
			// }
			// 获取目标站
			Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
			.eq("type_no", wrkMast.getIoType() - 50)
			@@ -446,62 +437,41 @@
			}

			try {
			// 保存工作明细档历史档
			if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
			throw new CoolException("保存工作明细档历史档失败");
			}
			// 保存工作主档历史档
			if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
			throw new CoolException("保存工作主档历史档失败");
			}
			LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

			Date now = new Date();
			// 堆垛机站点(目标站)
			Integer staNo = staDesc.getCrnStn();
			// 更新工作档数据状态
			wrkMast.setIoTime(now);
			wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
			wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
			wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
			wrkMast.setStaNo(staNo); // 目标站
			wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
			wrkMast.setSourceLocNo(""); // 源库位清空
			wrkMast.setModiTime(now);
			wrkMast.setUpdMk("");//允许再次移库
			if (wrkMastMapper.updateById(wrkMast) == 0) {
			throw new CoolException("更新工作档数据状态失败");
			}
			// 更新明细档io_time (历史档关联使用）
			wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
			// 修改库位状态 Q.拣料/盘点/并板再入库
			LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
			locMast.setLocSts("Q");
			locMast.setModiTime(new Date());
			if (!locMastService.updateById(locMast)) {
			throw new CoolException("修改库位状态失败");
			SearchLocParam param = new SearchLocParam();
			param.setBarcode(wrkMast.getBarcode());
			param.setSourceStaNo(pickSta.getStaNo());
			param.setLocType1(locTypeDto.getLocType1());
			String response = new HttpHandler.Builder()
			.setUri(wmsUrl)
			.setPath("/rpc/pakin/pick/loc/v1")
			.setJson(JSON.toJSONString(param))
			.build()
			.doPost();
			JSONObject jsonObject = JSON.parseObject(response);
			if (jsonObject.getInteger("code").equals(200)) {
			LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			staProtocol.setPalletSize(locMast.getLocType2());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			News.error("" + mark + " - 3" + " - 发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			}
			} else {
			News.error("" + mark + " - 5" + " - 请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/pick/loc/v1", JSON.toJSONString(param), response);
			}
			} catch (Exception e) {
			e.printStackTrace();
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
			continue;
			}

			LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
			// 更新站点信息且下发plc命令
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			staProtocol.setPalletSize(locMast.getLocType2());
			devpThread.setPakMk(staProtocol.getSiteId(), false);
			boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
			if (!result) {
			News.error("" + mark + " - 3" + " - 发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
			}

			} else {
			News.errorNoLog("" + mark + " - 6" + " - 站点信息不符合入库条件！！！" + " 自动信号：" + staProtocol.isLoading() + "、可入信号：" + staProtocol.isInEnable()
			+ "、空板信号：" + staProtocol.isEmptyMk());
			}

			}

			}
			@@ -708,9 +678,14 @@
			LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
			.eq("loc_no", wrkMast.getSourceLocNo()));

			short staNo = wrkMast.getStaNo().shortValue();
			if (wrkMast.getStaNo() == 1004) {
			staNo = 2003;
			}

			// 下发站点信息
			staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
			staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
			staProtocol.setStaNo(staNo);
			staProtocol.setPalletSize(locMast.getLocType2());
			if (!MessageQueue.offer(SlaveType.Devp, devpId, new Task(2, staProtocol))) {
			continue;
			@@ -1044,7 +1019,7 @@
			News.warn("" + mark + " - 1" + " - 12" + " - // F、D 库位={},库位状态={}", shallowLoc.getLocNo(), shallowLoc.getLocSts());
			// 此标记避免多次执行移库任务
			if (Cools.isEmpty(wrkMast.getUpdMk()) \|\| "N".equals(wrkMast.getUpdMk())) {
			if (moveLocForDeepLoc(slave, shallowLoc, mark)) {
			if (moveLocForDeepLoc(slave, crnProtocol, shallowLoc, mark)) {
			wrkMast.setUpdMk("Y");
			wrkMast.setIoPri(14D);
			wrkMastMapper.updateById(wrkMast);
			@@ -1132,6 +1107,13 @@
			devpCheckTaskStackOver = Integer.parseInt(config2.getValue());
			}

			int outNumber = 13;
			Config config3 = configService.selectOne(new EntityWrapper<Config>()
			.eq("code", "fullBoardOutboundNumber"));
			if (config3 != null) {
			outNumber = Integer.parseInt(config3.getValue());
			}


			Integer devpWorkingCount = commonService.queryDevpWorkingCount();
			if (devpWorkingCount > devpTaskStackOver) {
			@@ -1169,11 +1151,12 @@
			staProtocol = staProtocol.clone();
			}

			if (wrkMast.getStaNo() == 1003 \|\| wrkMast.getStaNo() == 1007) {
			if (wrkMast.getStaNo() == 1003 \|\| wrkMast.getStaNo() == 1007 \|\| wrkMast.getStaNo() == 1004) {
			//检测是否有入库任务
			List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
			.in("io_type", 1, 53, 57)
			.in("source_sta_no", 1005)
			.notIn("wrk_sts", 3, 4, 5)
			.in("source_sta_no", 1002, 1007)
			);
			if (!inWrkMasts.isEmpty()) {
			News.error("" + mark + " - 2" + " - 检测存在入库任务，等待入库任务执行完成再出库，工作号={}" + wrkMast.getWrkNo());
			@@ -1201,6 +1184,14 @@
			News.error("" + mark + " - 2" + " - 检测存在1062站点，存在两笔工作中的任务，工作号={}" + wrkMast.getWrkNo());
			continue;
			}
			}
			}else if (wrkMast.getIoType() == 101) {
			List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
			.in("wrk_sts", 12, 14)
			);
			if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= outNumber) {
			News.error("" + mark + " - 4" + " - 检测到全板出库的任务已经到达上线，工作号={}" + wrkMast.getWrkNo());
			continue;
			}
			}

			@@ -1301,7 +1292,7 @@
			// if (Cools.isEmpty(wrkMast.getUpdMk()) \|\| "N".equals(wrkMast.getUpdMk())
			// \|\| Cools.isEmpty(waitWrkMast)) {
			if (Cools.isEmpty(waitWrkMast)) {
			if (moveLocForDeepLoc(slave, shallowLoc, mark)) {
			if (moveLocForDeepLoc(slave, crnProtocol, shallowLoc, mark)) {
			wrkMast.setUpdMk("Y");
			// wrkMast.setIoPri(14D);
			wrkMastMapper.updateById(wrkMast);
			@@ -2017,6 +2008,16 @@
			continue;
			}

			//检测是否有入库任务
			List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
			.in("io_type", 1, 53, 57)
			.in("source_sta_no", 1002, 1007)
			);
			if (!inWrkMasts.isEmpty()) {
			News.error("" + mark + " - 2" + " - 检测存在入库任务，等待入库任务执行完成再入空托，工作号={}");
			continue;
			}

			int workNo = commonService.getWorkNo(3);
			// 生成工作档
			WrkMast wrkMast1 = new WrkMast();
			@@ -2202,7 +2203,7 @@
			));

			}else {
			List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectTodayByWrkNo(wrkMast.getWrkNo());
			List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectTodayByWrkNo(wrkNo);
			if(!wrkDetlLogs.isEmpty()) {
			WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);

			@@ -2216,7 +2217,7 @@
			}

			List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
			.eq("loc_no", wrkMast.getSourceLocNo()));
			.eq("loc_no", sourceLocNo));
			double totalAnfme = 0D;
			double totalWeight = 0D;
			for (LocDetl locDetl : locDetls) {
			@@ -2429,8 +2430,7 @@
			* 因双深库位阻塞，对浅库位进行移转（立即执行版)
			* tip：同步
			*/
			private synchronized boolean moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc, Integer mark) {

			private synchronized boolean moveLocForDeepLoc(CrnSlave crn, CrnProtocol crnProtocol, LocMast shallowLoc, Integer mark) {
			try {
			News.warnNoLog("" + mark + "moveLocForDeepLoc" + " - 0" + " - 开始执行:因双深库位阻塞，对浅库位进行移转（立即执行版)");
			List<Integer> rows = locMastService.queryDistinctRow(crn.getId());
			@@ -2438,8 +2438,13 @@
			for (Integer row : rows) {
			if (Utils.isDeepLoc(slaveProperties, row)) {
			loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());

			if (loc != null) {
			if (crn.getId() == 1) {
			if (Utils.getLaneByLocNo(loc.getLocNo()) != crnProtocol.getCrnLane()) {
			continue;
			}
			}

			if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
			String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
			LocMast shallowLoc1 = locMastService.selectById(shallowLocNo);
			@@ -2459,6 +2464,12 @@
			loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());

			if (null != loc) {//对应深库位非在库状态,不能移库
			if (crn.getId() == 1) {
			if (Utils.getLaneByLocNo(loc.getLocNo()) != crnProtocol.getCrnLane()) {
			continue;
			}
			}

			String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
			LocMast deepLoc1 = locMastService.selectById(deepLoc);
			if (!deepLoc1.getLocSts().equals("F") && !deepLoc1.getLocSts().equals("D")) {