~admin/HangZhouMes.git

			@@ -1,7 +1,9 @@
			package com.mes.downglassinfo.service.impl;

			import cn.smallbun.screw.core.util.CollectionUtils;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			@@ -18,14 +20,20 @@
			import com.mes.downworkstation.service.DownWorkstationService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.job.DownLoadCacheGlassTask;
			import com.mes.pp.service.FlowCardService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.math.BigDecimal;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			@Slf4j
			@Service
			public class DownGlassInfoServiceImpl extends ServiceImpl<DownGlassInfoMapper, DownGlassInfo> implements DownGlassInfoService {

			@@ -41,6 +49,9 @@

			@Autowired
			RedisUtil redisUtil;

			@Autowired
			FlowCardService flowCardService;

			/**
			* 根据流程卡号查询最大序号
			@@ -97,6 +108,7 @@
			BeanUtils.copyProperties(details, downGlassInfo);
			//获取当前流程卡最大片序
			downGlassInfo.setSequence(this.getMaxSequenceByFlowCardId(details.getFlowCardId(), details.getLayer()) + 1);
			downGlassInfo.setWorkStationId(Const.G13_WORK_STATION);
			this.save(downGlassInfo);
			//生成任务信息并向plc发送出片任务
			GlassInfo glassInfo = new GlassInfo();
			@@ -130,11 +142,82 @@
			//可以落架的玻璃信息且已绑定流程卡的所有的工位 - 玻璃未满流程卡及层数的工位 = 已满工位
			workstationFull = list.stream().filter(item -> !flowCardIdList.contains(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
			//是否需要将已满的工位置为不可落架
			List<Integer> workstationIds = workstationFull.stream().map(DownWorkstation::getWorkstationId).collect(Collectors.toList());
			downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getEnableState, Const.SLOT_OFF)
			.in(DownWorkstation::getWorkstationId, workstationIds));

			if (CollectionUtils.isNotEmpty(workstationFull)) {
			List<Integer> workstationIds = workstationFull.stream().map(DownWorkstation::getWorkstationId).collect(Collectors.toList());
			downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getEnableState, Const.SLOT_OFF)
			.in(DownWorkstation::getWorkstationId, workstationIds));
			}
			}
			return workstationFull;
			}

			@Override
			public List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo) {
			log.info("打印参数:{}", downGlassInfo);
			QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query();
			queryWrapper.eq("flow_card_id", downGlassInfo.getFlowCardId())
			.eq("layer", downGlassInfo.getLayer())
			.select("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "COUNT(*) AS quantity")
			.groupBy("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type","id")
			.orderByAsc("id");
			List<Map<String, Object>> resultList = baseMapper.selectMaps(queryWrapper);
			log.info("MES落架数据:{}", resultList);

			List<Map<String, Object>> projectInfo = flowCardService.selectProject(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
			log.info("流程卡头部数据:{}", projectInfo);
			List<Map<String, Object>> flowCardInfo = flowCardService.selectFlowCard(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer());
			log.info("流程卡玻璃数据:{}", flowCardInfo);
			for (Map<String, Object> row : resultList) {
			int glass_type = (int) row.get("glass_type");
			int layer = (int) row.get("layer");
			Long quantity1 = (Long) row.get("quantity");

			for (Map<String, Object> row1 : flowCardInfo) {
			int order_number = (int) row1.get("order_number");
			int technology_number = (int) row1.get("technology_number");
			String child_width = (String) row1.get("child_width");
			Long quantity = (Long) row1.get("quantity");
			BigDecimal total_area = (BigDecimal) row1.get("total_area");
			String separation = (String) row1.get("separation");
			String perimeter = (String) row1.get("perimeter");
			BigDecimal width = (BigDecimal) row1.get("width");
			String other_columns = (String) row1.get("other_columns");
			String remarks = (String) row1.get("remarks");
			BigDecimal height = (BigDecimal) row1.get("height");
			if (order_number == glass_type && technology_number == layer) {
			// row.put("quantity1", quantity1);
			// row.put("quantity", quantity);
			row.put("order_number", order_number);
			row.put("technology_number", technology_number);
			row.put("child_width", child_width);
			row.put("total_area", total_area);
			row.put("separation", separation);
			row.put("perimeter", perimeter);
			row.put("width", width);
			row.put("other_columns", other_columns);
			row.put("remarks", remarks);
			row.put("height", height);
			}
			}
			}
			log.info("流程卡玻璃数据2:{}", flowCardInfo);
			List<Map<String, List<Map<String, Object>>>> listMap = new ArrayList<>();
			Map<String, List<Map<String, Object>>> result = new HashMap<>();
			result.put("detail", projectInfo);
			result.put("detailList", resultList);
			for (Map<String, Object> row : projectInfo) {
			String order_number = (String) row.get("process");
			String[] processes = order_number.split("->");
			List<Map<String, Object>> processList = new ArrayList<>();
			for (int i = 0; i < processes.length; i++) {
			Map<String, Object> processMap = new JSONObject();
			processMap.put("process", processes[i]);
			processMap.put("id", i);
			processList.add(processMap);
			}
			result.put("processList", processList);
			}
			listMap.add(result);
			return listMap;
			}
			}