YiWuProject.git

			@@ -6,29 +6,34 @@
			import com.baomidou.mybatisplus.core.toolkit.StringUtils;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.common.config.Const;
			import com.mes.common.config.ConstSysConfig;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.hollow.entity.HollowBigStorageCage;
			import com.mes.hollow.entity.HollowBigStorageCageDetails;
			import com.mes.hollow.entity.HollowGlassOutRelationInfo;
			import com.mes.hollow.entity.HollowGlassRelationInfo;
			import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
			import com.mes.hollow.entity.dto.HollowBigStorageDTO;
			import com.mes.hollow.entity.dto.HollowGlassDetailsDTO;
			import com.mes.hollow.entity.dto.LackDetailsDTO;
			import com.mes.hollow.entity.dto.*;
			import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
			import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
			import com.mes.hollow.mapper.HollowGlassRelationInfoMapper;
			import com.mes.hollow.service.HollowBigStorageCageDetailsService;
			import com.mes.hollow.service.HollowBigStorageCageService;
			import com.mes.hollow.service.HollowGlassOutRelationInfoService;
			import com.mes.hollow.service.HollowGlassRelationInfoService;
			import com.mes.sysconfig.service.SysConfigService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.*;
			import java.math.BigInteger;
			import java.util.ArrayList;
			import java.util.Comparator;
			import java.util.List;
			import java.util.Map;
			import java.util.regex.Matcher;
			import java.util.regex.Pattern;
			import java.util.stream.Collectors;

			/**
			@@ -51,13 +56,15 @@
			HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
			@Resource
			HollowBigStorageCageDetailsService hollowBigStorageCageDetailsService;
			@Value("${mes.slotWidth}")
			private Integer slotWidth;
			@Value("${mes.glassGap}")
			private Integer glassGap;

			@Value("${mes.outCarMaxSize}")
			private Integer outCarMaxSize;
			@Resource
			SysConfigService sysConfigService;
			// @Value("${mes.slotWidth}")
			// private Integer slotWidth;
			// @Value("${mes.glassGap}")
			// private Integer glassGap;
			//
			// @Value("${mes.outCarMaxSize}")
			// private Integer outCarMaxSize;

			@Override
			public HollowBigStorageDTO queryHollowTargetSlot(String flowCardId, double width, double height, int totalLayer, int layer) {
			@@ -96,6 +103,7 @@
			.last("limit 1")
			);
			}
			Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
			//详情表内获取本组是否已经有玻璃在笼子内（0表示提前占用）
			int taskCount = hollowGlassOutRelationInfoService.count(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
			.eq(HollowGlassOutRelationInfo::getFlowCardId, flowCardId));
			@@ -240,6 +248,10 @@
			// List<HollowBigStorageCage> hollowSlotList = HollowBigStorageCageService.list(new LambdaQueryWrapper<HollowBigStorageCage>()
			// .eq(HollowBigStorageCage::getEnableState, Const.SLOT_ON).eq(HollowBigStorageCage::getRemainWidth, slotWidth));
			//方式二：将玻璃按流程卡、尺寸、版图、版序，优先将格子全部补全后依次计算后面的格子号

			Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
			Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
			Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_OUT_CAR_SIZE);
			List<HollowGlassRelationInfo> relationInfoList = new ArrayList();
			List<List<HollowGlassRelationInfo>> tempHollowList = new ArrayList<>();
			int slotNumber = 1;
			@@ -286,7 +298,7 @@
			}

			@Override
			public Map<String, List<FlowCardGlassInfoDTO>> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query) {
			public List<HollowAllFlowCardVO> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query) {
			List<HollowBigStorageCageDetails> detailsList = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
			.eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
			@@ -296,39 +308,30 @@
			);
			if (CollectionUtil.isEmpty(detailsList)) {
			log.info("笼内无玻璃");
			return new HashMap<>();
			return new ArrayList<>();
			}
			Map<String, List<HollowBigStorageCageDetails>> listMap = detailsList.stream().collect(Collectors.groupingBy(HollowBigStorageCageDetails::getFlowCardId));
			List<FlowCardGlassInfoDTO> dtos = new ArrayList<>();
			List<HollowAllFlowCardVO> resultList = new ArrayList<>();
			listMap.forEach((e, v) -> {
			HollowAllFlowCardVO hollowAllFlowCardVO = new HollowAllFlowCardVO();
			HollowBigStorageCageDetails cageDetails = v.get(0);
			//按照流程卡获取对应的产品名称
			String productName = baseMapper.queryProductNameByFlowCardId(cageDetails.getFlowCardId());
			List<FlowCardGlassInfoDTO> flowCardInfoList = hollowBigStorageCageDetailsService.hollowIsAll(e, cageDetails.getTotalLayer(), Boolean.FALSE);
			for (FlowCardGlassInfoDTO item : flowCardInfoList) {
			item.setProductName(productName);
			dtos.add(item);
			OrderDetailsDTO orderDetails = baseMapper.queryProductNameByFlowCardId(cageDetails.getFlowCardId());
			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);
			resultList.add(hollowAllFlowCardVO);
			});
			Map<String, FlowCardGlassInfoDTO> result = dtos.stream()
			.collect(Collectors.toMap(
			FlowCardGlassInfoDTO::getFlowCardId,
			dto -> {
			FlowCardGlassInfoDTO newDto = new FlowCardGlassInfoDTO();
			newDto.setFlowCardId(dto.getFlowCardId());
			newDto.setSumCount(dto.getSumCount());
			newDto.setPairCount(dto.getPairCount());
			newDto.setRealCount(dto.getRealCount());
			newDto.setLayer(dto.getLayer());
			return newDto;
			},
			(dto1, dto2) -> {
			dto1.setRealCount(dto1.getRealCount() + dto2.getRealCount()); // 累加 realCount
			dto1.setLayer(Math.max(dto1.getLayer(), dto2.getLayer())); // 累加最大层数
			return dto1; // 返回合并后的对象
			}
			));
			return dtos.stream().collect(Collectors.groupingBy(e -> e.getFlowCardId() + ":" + e.getProductName()));
			sortFlowCardIdList(resultList);
			return resultList;
			}

			@Override
			@@ -395,5 +398,33 @@
			// return lackDetailsList;
			// }

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

			list.sort((v1, v2) -> {
			Matcher m1 = pattern.matcher(v1.getFlowCardId());
			Matcher m2 = pattern.matcher(v2.getFlowCardId());

			if (!m1.find() \|\| !m2.find()) {
			throw new IllegalArgumentException("获取到的流程卡不符合校验规则");
			}

			// 提取部分
			BigInteger order1 = new BigInteger(m1.group(1));
			BigInteger order2 = new BigInteger(m2.group(1));
			String layer1 = m1.group(2);
			String layer2 = m2.group(2);
			BigInteger seq1 = new BigInteger(m1.group(3));
			BigInteger seq2 = new BigInteger(m2.group(3));

			// 优先级排序
			int cmp = order1.compareTo(order2);
			if (cmp != 0) return cmp;
			cmp = layer1.compareTo(layer2);
			if (cmp != 0) return cmp;
			return seq1.compareTo(seq2);
			});
			}

			}