YiWuProject.git

			@@ -104,7 +104,9 @@
			.last("limit 1")
			);
			}
			Assert.isTrue(null != relationInfoOne, "相关流程卡未找到对应的组号信息，玻璃流程卡：{}，序号：{}，总层数：{}，层数：{}", flowCardId, glassType, totalLayer, layer);
			if (null == relationInfoOne) {
			throw new RuntimeException("相关流程卡未找到对应的组号信息，玻璃流程卡：" + flowCardId + "，序号：" + glassType + "，总层数：" + totalLayer + "，层数：" + layer);
			}
			Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
			//详情表内获取本组是否已经有玻璃在笼子内（0表示提前占用）
			int taskCount = hollowGlassOutRelationInfoService.count(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
			@@ -304,27 +306,22 @@
			public List<HollowAllFlowCardVO> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query) {
			Date startDate = new Date();
			log.info("开始查询中空流程卡任务信息，开始时间{}", startDate);
			List<HollowBigStorageCageDetails> detailsList = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
			.eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
			.like(StringUtils.isNotBlank(query.getFlowCardId()), HollowBigStorageCageDetails::getFlowCardId, query.getFlowCardId())
			.eq(query.getThickness() != 0, HollowBigStorageCageDetails::getThickness, query.getThickness())
			.orderByAsc(HollowBigStorageCageDetails::getFlowCardId)
			);
			List<FlowCardGlassInfoDTO> detailsList = hollowBigStorageCageDetailsService.queryHollowAllFlowCard(query);

			if (CollectionUtil.isEmpty(detailsList)) {
			log.info("笼内无玻璃");
			return new ArrayList<>();
			}
			Date middleDate = new Date();
			log.info("中空理片笼详情数据已查询完毕，耗时:{}ms", middleDate.getTime() - startDate.getTime());
			Map<String, List<HollowBigStorageCageDetails>> listMap = detailsList.stream().collect(Collectors.groupingBy(HollowBigStorageCageDetails::getFlowCardId));
			Map<String, List<FlowCardGlassInfoDTO>> listMap = detailsList.stream().collect(Collectors.groupingBy(FlowCardGlassInfoDTO::getFlowCardId));
			List<HollowAllFlowCardVO> resultList = new ArrayList<>();
			AtomicInteger pairTotalCount = new AtomicInteger();
			listMap.forEach((e, v) -> {
			HollowAllFlowCardVO hollowAllFlowCardVO = new HollowAllFlowCardVO();
			HollowBigStorageCageDetails cageDetails = v.get(0);
			FlowCardGlassInfoDTO cageDetails = v.get(0);
			//按照流程卡获取对应的产品名称
			OrderDetailsDTO orderDetails = baseMapper.queryProductNameByFlowCardId(cageDetails.getFlowCardId(), query.getProductName(), query.getCustomerName());
			OrderDetailsDTO orderDetails = this.queryProductNameByFlowCardId(cageDetails.getFlowCardId(), query.getProductName(), query.getCustomerName());
			if (null != orderDetails) {
			BeanUtils.copyProperties(orderDetails, hollowAllFlowCardVO);
			hollowAllFlowCardVO.setFlowCardId(e);
			@@ -333,12 +330,8 @@
			} else {
			hollowAllFlowCardVO.setIsThroughSlot(Boolean.FALSE);
			}
			List<FlowCardGlassInfoDTO> flowCardInfoList = hollowBigStorageCageDetailsService.hollowIsAll(e, cageDetails.getTotalLayer(), Boolean.FALSE);
			log.info("获取到的流程卡信息为:{}", flowCardInfoList);
			if (CollectionUtil.isNotEmpty(flowCardInfoList)) {
			hollowAllFlowCardVO.setFlowCardGlassInfoDTOList(flowCardInfoList);
			pairTotalCount.addAndGet(flowCardInfoList.get(0).getPairCount());
			}
			hollowAllFlowCardVO.setFlowCardGlassInfoDTOList(v);
			pairTotalCount.addAndGet(cageDetails.getPairCount());
			resultList.add(hollowAllFlowCardVO);
			}
			});
			@@ -400,14 +393,20 @@
			}

			@Override
			public List<LackDetailsDTO> queryLackByFlowCard() {
			List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard();
			public List<LackDetailsDTO> queryAllLackByFlowCard() {
			List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryAllLackByFlowCard();
			return lackDetailsList;
			}

			@Override
			public int queryLayerByFlowCardId(String flowCardId) {
			return baseMapper.queryLayerByFlowCardId(flowCardId);
			}

			@Override
			public Map<Integer,List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
			List<LackDetailsDTO> detailsDTOS = baseMapper.queryLackByFlowCard(flowCardId);
			return detailsDTOS.stream().collect(Collectors.groupingBy(item -> item.getLayer()));
			}

			@Override
			@@ -430,7 +429,9 @@
			List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>()
			.eq(GlassInfo::getFlowCardId, request.getFlowCardId())
			.eq(GlassInfo::getLayer, request.getLayer())
			.eq(GlassInfo::getGlassType, request.getGlassType()));
			.eq(GlassInfo::getGlassType, request.getGlassType())
			.eq(request.getGlassId() != null, GlassInfo::getGlassId, request.getGlassId())
			);
			for (GlassInfo glassInfo : glassInfos) {
			//掰片报破损
			damageService.autoSubmitReport(glassInfo.getGlassId(), request.getLine(), request.getWorkingProcedure(), request.getRemark(), request.getState());
			@@ -438,6 +439,21 @@
			return Boolean.TRUE;
			}

			@Override
			public List<GlassInfo> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query) {
			return baseMapper.queryLackGlassByFlowCard(query.getFlowCardId(), query.getOrderSort(), query.getLayer());
			}

			@Override
			public OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId, String productName, String customerName) {
			OrderDetailsDTO dto = hollowGlassOutRelationInfoService.queryProductNameByFlowCardId(flowCardId);
			if ((StringUtils.isBlank(productName) \|\| dto.getProductName().contains(productName)) && (StringUtils.isBlank(customerName) \|\| dto.getCustomerName().contains(customerName))) {
			return dto;
			}
			return null;
			}


			private void sortFlowCardIdList(List<HollowAllFlowCardVO> list) {
			Pattern pattern = Pattern.compile("^NG(\\d+)([A-Za-z]+)(\\d+)$");