YiWuProject.git

			@@ -26,7 +26,6 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;
			@@ -56,6 +55,18 @@
			@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;

			/**
			* 查询进/出片任务
			*/
			@@ -69,7 +80,7 @@
			List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);

			LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
			feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState,Const.BIG_STORAGE_IN_SLOT);
			feedTaskWrapper.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT);
			List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);

			Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
			@@ -87,7 +98,7 @@
			List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);

			LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
			outTaskWrapper.lt(BigStorageCageOutTask::getTaskState,Const.BIG_STORAGE_OUT_SUCCESS);
			outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
			List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);

			Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
			@@ -125,7 +136,7 @@
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) {
			carWidth -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
			carWidth = carWidth - bigStorageCageDetails.getWidth() - galssGap;
			}
			}
			return carWidth;
			@@ -142,7 +153,7 @@

			//理片笼详情破损
			@Override
			public void damageBigStorageCageDetails(String glassId,int status) {
			public void damageBigStorageCageDetails(String glassId, int status) {

			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>();
			temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId, glassId);
			@@ -152,10 +163,10 @@
			bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId, glassId);
			BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);

			if(temperingGlassInfo!=null){
			if(status==0){
			if (temperingGlassInfo != null) {
			if (status == 0) {
			temperingGlassInfo.setState(Const.TEMPERING_DAMAGE);
			}else{
			} else {
			temperingGlassInfo.setState(Const.TEMPERING_TAKE);
			}
			temperingGlassInfoMapper.updateById(temperingGlassInfo);
			@@ -175,7 +186,7 @@
			BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
			BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
			bigStorageCageDetails.setState(0);
			bigStorageCageDetails.setGap(Const.BIG_STORAGE_GAP);
			bigStorageCageDetails.setGap(galssGap);
			return bigStorageCageDetails;
			}

			@@ -189,7 +200,7 @@
			//理片笼详情完成
			@Override
			public void finishBigStorageCageDetails(BigStorageCageDetails bigStorageCageDetails) {
			if (bigStorageCageDetails.getBigStorageCageFeedTask()!=null) {
			if (bigStorageCageDetails.getBigStorageCageFeedTask() != null) {
			bigStorageCageDetails.setState(Const.BIG_STORAGE_INSIDE);
			baseMapper.updateById(bigStorageCageDetails);
			} else {
			@@ -210,21 +221,25 @@
			public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
			BigStorageDTO bigStorageDTO = null;
			MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
			.selectAsClass(BigStorageCage.class, BigStorageDTO.class)
			.selectAll(BigStorageCage.class)
			.leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
			.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
			.gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
			.last("limit 1");
			if (glassInfo.getTemperingLayoutId() == 0) {
			wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
			} else {
			wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
			}
			bigStorageDTO = bigStorageCageService.selectJoinOne(BigStorageDTO.class, wrapper);
			if (null != bigStorageDTO) {
			BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper);
			if (null != bigStorageCage) {
			bigStorageDTO = new BigStorageDTO();
			bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
			bigStorageDTO.setSlot(bigStorageCage.getSlot());
			return bigStorageDTO;
			}
			BigStorageCage bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH)
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			.last("limit 1"));
			@@ -235,15 +250,13 @@
			return bigStorageDTO;
			}
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH)
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.last("limit 1"));
			Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
			bigStorageDTO = new BigStorageDTO();
			bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
			bigStorageDTO.setSlot(bigStorageCage.getSlot());
			return bigStorageDTO;


			}

			@Override