~admin/HangZhouMes.git

			@@ -2,22 +2,27 @@

			import cn.hutool.core.lang.Assert;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.query.MPJLambdaQueryWrapper;
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.common.config.Const;
			import com.mes.damage.entity.Damage;
			import com.mes.damage.mapper.DamageMapper;
			import com.mes.damage.service.DamageService;
			import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
			import com.mes.edgglasstask.entity.request.IdentWornRequest;
			import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
			import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
			import com.mes.engineering.entity.Engineering;
			import com.mes.engineering.mapper.EngineeringMapper;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.mapper.GlassInfoMapper;
			import com.mes.pp.entity.OptimizeDetail;
			@@ -29,12 +34,11 @@
			import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang.StringUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import javax.print.attribute.standard.MediaSize;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;
			@@ -60,62 +64,57 @@
			@Autowired
			EdgStorageCageMapper edgStorageCageMapper;
			@Autowired
			DamageMapper damageMapper;

			@Autowired
			EngineeringMapper engineeringMapper;

			@Autowired
			GlassInfoMapper glassInfoMapper;

			@Autowired
			TaskCacheService taskCacheService;

			@Autowired
			DamageMapper damageMapper;

			@Autowired
			DamageService damageService;

			@Autowired
			EdgGlassTaskInfoService edgGlassTaskInfoService;

			/**
			* 识别拿走:200/破损:201
			*
			* @param arguments
			* @return
			*/
			@Override
			public boolean identWorn(Map<String,Object> arguments) {
			String glassId=arguments.get("glassId").toString();
			int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
			int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
			String workingProcedure=arguments.get("workingProcedure").toString();
			if(state==0\|\|line==0\|\|workingProcedure==null\|\|glassId==null\|\|glassId.isEmpty()){
			log.info("前端传递数据不全:{}",arguments);
			return false;
			}
			List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
			.selectAll(GlassInfo.class)
			.eq(GlassInfo::getGlassId, glassId));
			if (GlassInfos.size() == 1) {
			Damage damage =new Damage();
			damage.setGlassId(glassId);
			damage.setLine(line);
			damage.setWorkingProcedure(workingProcedure);
			damage.setRemark("");
			damage.setStatus(state);//8破损，9拿走
			damageService.insertDamage(damage);
			}else{
			return false;
			}
			List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
			.selectAll(EdgStorageCageDetails.class)
			.eq(EdgStorageCageDetails::getGlassId, glassId));
			if (edgStorageCageDetails.size() == 1) {
			EdgStorageCageDetails item = edgStorageCageDetails.get(0);
			item.setState(state);
			baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
			}
			return true;
			}

			@Autowired
			BigStorageCageDetailsService bigStorageCageDetailsService;
			//
			// @Override
			// public boolean identWorn(Map<String, Object> arguments) {
			// String glassId=arguments.get("glassId").toString();
			// int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
			// int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
			// String workingProcedure=arguments.get("workingProcedure").toString();
			// if(state==0\|\|line==0\|\|workingProcedure==null\|\|glassId==null\|\|glassId.isEmpty()){
			// log.info("前端传递数据不全:{}",arguments);
			// return false;
			// }
			// List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
			// .selectAll(GlassInfo.class)
			// .eq(GlassInfo::getGlassId, glassId));
			// if (GlassInfos.size() == 1) {
			// Damage damage =new Damage();
			// damage.setGlassId(glassId);
			// damage.setLine(line);
			// damage.setWorkingProcedure(workingProcedure);
			// damage.setRemark("");
			// damage.setStatus(state);//8破损，9拿走
			// damageService.insertDamage(damage);
			// }else{
			// return false;
			// }
			// List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
			// .selectAll(EdgStorageCageDetails.class)
			// .eq(EdgStorageCageDetails::getGlassId, glassId));
			// if (edgStorageCageDetails.size() == 1) {
			// EdgStorageCageDetails item = edgStorageCageDetails.get(0);
			// item.setState(state);
			// baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
			// }
			// return true;
			// }
			/**
			* 获取切割当前版图
			*
			@@ -152,7 +151,7 @@
			Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
			.selectAll(Damage.class)
			.eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
			).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage));
			).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));

			List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
			for (Map<String, Object> cutTerritory : cutTerritorys) {
			@@ -183,6 +182,13 @@
			*/
			@Override
			public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
			//大理片笼进过的玻璃
			Map<String, BigStorageCageDetails> mapBigCage=bigStorageCageDetailsService.list(
			new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getEngineerId,current)
			.gt(BigStorageCageDetails::getState,Const.GLASS_STATE_NEW)
			).stream().collect(Collectors.toMap(BigStorageCageDetails::getGlassId,BigStorageCageDetails->BigStorageCageDetails,(V1,V2)->V2));;

			//结果
			List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
			//此工程的所有优化数据
			@@ -200,23 +206,27 @@
			.selectAll(EdgStorageCageDetails.class)
			.eq(EdgStorageCageDetails::getEngineerId,current)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
			).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
			).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails,(V1,V2)->V2));

			Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
			.selectAll(Damage.class)
			.eq(Damage::getEngineerId,current)
			).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage));
			).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));

			for (Map<String, Object> item : cutTerritory) {
			// log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);
			// log.info("内容：{}-------{}",cutTerritory,edgStorageCageDetails);
			if(item.get("glass_id")==null\|\|"".equals(item.get("glass_id"))){
			log.info("优化数据中glassId存在空值-----内容：{}",cutTerritory);
			return new ArrayList<>();
			}else if(edgMaps.get(item.get("glass_id"))!=null){
			item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
			}else if(damageMaps.get(item.get("glass_id"))!=null){
			}
			if(damageMaps.get(item.get("glass_id"))!=null){
			//log.info("玻璃已破损/拿走-----内容：{}",damageMaps.get(item.get("glass_id")));
			item.put("glass_state",damageMaps.get(item.get("glass_id")).getStatus());
			}else if(mapBigCage.get(item.get("glass_id"))!=null){
			//进过大理片笼
			item.put("glass_state",98);
			}else if(edgMaps.get(item.get("glass_id"))!=null){
			item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
			}else{
			item.put("glass_state",0);
			}
			@@ -315,22 +325,49 @@
			EdgStorageCageDetails outEdgStorageCageDetails = null;

			// if (queryMaxMinDiff(threshold))
			//todo:逻辑1：获取两条线已出最后一块玻璃在笼内相同尺寸所剩数量，优先走数量少的线
			//todo:需要在卧式理片笼详情表中新增状态，用来表示玻璃进出理片笼情况
			if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
			log.info("按照上一片已出玻璃宽度{}，高度{}，及版图id区间{}到{}获取出片任务玻璃信息", oldEdgStorageCageDetails.getWidth()
			, oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);
			outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
			.notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
			.eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
			.eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
			.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
			.last("limit 1"));
			log.info("出片任务的玻璃信息：{}", outEdgStorageCageDetails);
			}
			//todo:逻辑1：获取两条线已出最后一块玻璃在笼内相同尺寸所剩数量，优先走数量少的线
			//todo:需要在卧式理片笼详情表中新增状态，用来表示玻璃进出理片笼情况
			if (oldEdgStorageCageDetails != null && minTemperingLayoutId != null) {
			log.info("按照上一片已出玻璃宽度{}，高度{}，及版图id区间{}到{}获取出片任务玻璃信息", oldEdgStorageCageDetails.getWidth()
			, oldEdgStorageCageDetails.getHeight(), minTemperingLayoutId.getTemperingLayoutId(), minTemperingLayoutId.getTemperingLayoutId() + threshold);
			outEdgStorageCageDetails = this.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
			.notIn(CollectionUtils.isNotEmpty(glassIds), EdgStorageCageDetails::getGlassId, glassIds)
			.eq(EdgStorageCageDetails::getWidth, oldEdgStorageCageDetails.getWidth())
			.eq(EdgStorageCageDetails::getHeight, oldEdgStorageCageDetails.getHeight())
			.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
			.last("limit 1"));
			log.info("出片任务的玻璃信息：{}", outEdgStorageCageDetails);
			}
			if (outEdgStorageCageDetails == null) {
			outEdgStorageCageDetails = minTemperingLayoutId;
			}
			return outEdgStorageCageDetails;
			}

			@Override
			public String identControls(IdentWornRequest request) {
			//将识别破损的玻璃直接加入破损表
			Damage damage = new Damage();
			BeanUtils.copyProperties(request, damage);
			damage.setType(request.getState());
			damage.setRemark("");
			damage.setStatus(0);
			damageService.insertDamage(damage);
			return "success";
			}

			@Override
			public String edgReportStatus(IdentWornRequest request) {
			//将磨边队列破损的玻璃直接加入破损表
			Damage damage = new Damage();
			BeanUtils.copyProperties(request, damage);
			damage.setType(request.getState());
			damage.setRemark("");
			damage.setStatus(0);
			damageService.insertDamage(damage);
			//修改磨边队列数据状态
			edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
			.set(EdgGlassTaskInfo::getStatus, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
			return "success";
			}
			}