~admin/HangZhouMes.git

			@@ -27,6 +27,7 @@

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Iterator;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;
			@@ -56,28 +57,21 @@
			@Value("${mes.minCount}")
			private int minCount;

			@Value("${mes.carWidth}")
			private Integer carWidth;

			@Value("${mes.slotWidth}")
			private Integer slotWidth;

			@Value("${mes.carMaxSize}")
			private Integer carMaxSize;

			@Value("${mes.galssGap}")
			private Integer galssGap;
			@Value("${mes.glassGap}")
			private Integer glassGap;

			/**
			* 查询进/出片任务
			*/
			@Override
			public List<BigStorageCageDetails> selectTask(int taskType) {

			if (taskType == 1) {
			//进片任务数据
			LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
			feedWrapper.eq(BigStorageCageDetails::getState, Const.BIG_STORAGE_IN);
			feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
			List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);

			LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
			@@ -86,16 +80,20 @@

			Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
			.collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));

			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
			Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
			while (iterator.hasNext()) {
			BigStorageCageDetails bigStorageCageDetails = iterator.next();
			BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
			bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
			if (bigStorageCageDetails.getBigStorageCageFeedTask() == null) {
			iterator.remove();
			}
			}
			return bigStorageCageDetailsList;
			} else {
			//出片任务数据
			LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
			outWrapper.eq(BigStorageCageDetails::getState, Const.BIG_STORAGE_OUT);
			outWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
			List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);

			LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
			@@ -107,6 +105,15 @@
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
			BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
			bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
			}
			Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
			while (iterator.hasNext()) {
			BigStorageCageDetails bigStorageCageDetails = iterator.next();
			BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
			bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
			if (bigStorageCageDetails.getBigStorageCageOutTask() == null) {
			iterator.remove();
			}
			}
			return bigStorageCageDetailsList;
			}
			@@ -137,7 +144,7 @@
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) {
			carWidth = carWidth - bigStorageCageDetails.getWidth() - galssGap;
			carWidth = carWidth - bigStorageCageDetails.getWidth() - glassGap;
			}
			}
			return carWidth;
			@@ -172,7 +179,11 @@
			}
			temperingGlassInfoMapper.updateById(temperingGlassInfo);
			}
			bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
			if (status == 0) {
			bigStorageCageDetails.setState(Const.GLASS_STATE_TAKE);
			} else {
			bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
			}
			baseMapper.updateById(bigStorageCageDetails);
			bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
			//todo:插入破损数据
			@@ -188,8 +199,8 @@
			BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
			if (glassInfo != null) {
			BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
			bigStorageCageDetails.setState(0);
			bigStorageCageDetails.setGap(galssGap);
			bigStorageCageDetails.setState(1);
			bigStorageCageDetails.setGap(glassGap);
			}
			List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
			bigStorageCageDetailsList.add(bigStorageCageDetails);
			@@ -199,6 +210,7 @@
			//理片笼详情添加
			@Override
			public void insertBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
			bigStorageCageDetails.setState(100);
			baseMapper.insert(bigStorageCageDetails);
			bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
			}
			@@ -206,20 +218,20 @@
			//理片笼详情完成
			@Override
			public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
			if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) {
			bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE);
			baseMapper.updateById(bigStorageCageDetails);
			} else {
			bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
			baseMapper.updateById(bigStorageCageDetails);
			bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
			}
			// if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) {
			// bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE);
			// baseMapper.updateById(bigStorageCageDetails);
			// } else {
			// bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
			// baseMapper.updateById(bigStorageCageDetails);
			// bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
			// }
			}

			//手动出片
			@Override
			public void outBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
			bigStorageCageDetails.setState(4);
			bigStorageCageDetails.setState(Const.GLASS_STATE_ARTIFICIAL);
			baseMapper.updateById(bigStorageCageDetails);
			}