YiWuProject.git

			@@ -252,7 +252,7 @@

			Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
			// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
			Integer glassGap = getGlassGapByThickness(tempGlassList.get(0).getThickness());
			Integer glassGap = getGlassGapByThickness(glassInfo.getThickness());
			Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_OUT_CAR_SIZE);
			List<HollowGlassRelationInfo> relationInfoList = new ArrayList();
			List<List<HollowGlassRelationInfo>> tempHollowList = new ArrayList<>();
			@@ -323,16 +323,17 @@
			if (null != orderDetails) {
			BeanUtils.copyProperties(orderDetails, hollowAllFlowCardVO);
			hollowAllFlowCardVO.setFlowCardId(e);

			if (cageDetails.getHollowSequence() == 0) {
			hollowAllFlowCardVO.setIsThroughSlot(Boolean.TRUE);
			} else {
			hollowAllFlowCardVO.setIsThroughSlot(Boolean.FALSE);
			}
			List<FlowCardGlassInfoDTO> flowCardInfoList = hollowBigStorageCageDetailsService.hollowIsAll(e, cageDetails.getTotalLayer(), Boolean.FALSE);
			hollowAllFlowCardVO.setFlowCardGlassInfoDTOList(flowCardInfoList);
			pairTotalCount.addAndGet(flowCardInfoList.get(0).getPairCount());

			log.info("获取到的流程卡信息为:{}", flowCardInfoList);
			if(CollectionUtil.isNotEmpty(flowCardInfoList)){
			hollowAllFlowCardVO.setFlowCardGlassInfoDTOList(flowCardInfoList);
			pairTotalCount.addAndGet(flowCardInfoList.get(0).getPairCount());
			}
			resultList.add(hollowAllFlowCardVO);
			}
			});
			@@ -417,11 +418,6 @@
			}
			return sysConfigService.queryConfigValue(sysKey);
			}
			// @Override
			// public List<LackDetailsDTO> queryLackByFlowCard(String flowCardId) {
			// List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);
			// return lackDetailsList;
			// }

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