YiWuProject.git

			@@ -26,6 +26,7 @@
			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;
			@@ -80,7 +81,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()
			@@ -98,7 +99,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()
			@@ -136,7 +137,7 @@
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			if (bigStorageCageDetails.getBigStorageCageFeedTask().getTaskState() == 0) {
			carWidth -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + galssGap;
			carWidth = carWidth - bigStorageCageDetails.getWidth() - galssGap;
			}
			}
			return carWidth;
			@@ -153,7 +154,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);
			@@ -163,15 +164,16 @@
			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);
			}
			baseMapper.deleteById(bigStorageCageDetails.getId());
			bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
			baseMapper.updateById(bigStorageCageDetails);
			bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
			//todo:插入破损数据

			@@ -179,15 +181,19 @@

			//查询玻璃信息
			@Override
			public BigStorageCageDetails selectBigStorageCageDetails(String glassId) {
			public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) {
			LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
			glassInfoWrapper.eq(GlassInfo::getGlassId, glassId);
			GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
			BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
			BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
			bigStorageCageDetails.setState(0);
			bigStorageCageDetails.setGap(galssGap);
			return bigStorageCageDetails;
			if(glassInfo!=null){
			BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
			bigStorageCageDetails.setState(0);
			bigStorageCageDetails.setGap(galssGap);
			}
			List<BigStorageCageDetails> bigStorageCageDetailsList=new ArrayList<>();
			bigStorageCageDetailsList.add(bigStorageCageDetails);
			return bigStorageCageDetailsList;
			}

			//理片笼详情添加
			@@ -200,7 +206,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 {