YiWuProject.git

			@@ -8,8 +8,6 @@
			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;
			@@ -23,7 +21,6 @@
			import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
			import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
			import com.mes.engineering.entity.Engineering;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.mapper.GlassInfoMapper;
			import com.mes.pp.entity.OptimizeDetail;
			import com.mes.pp.entity.OptimizeLayout;
			@@ -77,9 +74,6 @@

			@Autowired
			EdgGlassTaskInfoService edgGlassTaskInfoService;

			@Autowired
			BigStorageCageDetailsService bigStorageCageDetailsService;
			//
			// @Override
			// public boolean identWorn(Map<String, Object> arguments) {
			@@ -182,12 +176,6 @@
			*/
			@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<>();
			@@ -205,7 +193,6 @@
			Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
			.selectAll(EdgStorageCageDetails.class)
			.eq(EdgStorageCageDetails::getEngineerId,current)
			.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
			).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails,(V1,V2)->V2));

			Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
			@@ -222,9 +209,6 @@
			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{
			@@ -234,7 +218,16 @@
			}
			Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("stock_id").toString()));
			// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
			return new ArrayList<>(groupBy.values());
			int count=1;
			List<List<Map<String, Object>>> result=new ArrayList<>();
			for (String item : groupBy.keySet()) {
			String key=count+"";
			if(key!=null){
			result.add(groupBy.get(key));
			}
			count++;
			}
			return result;
			}

			/**