YiWuProject.git

			@@ -186,12 +186,12 @@
			glassInfoWrapper.eq(GlassInfo::getGlassId, glassId);
			GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
			BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
			if(glassInfo!=null){
			if (glassInfo != null) {
			BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
			bigStorageCageDetails.setState(0);
			bigStorageCageDetails.setGap(galssGap);
			}
			List<BigStorageCageDetails> bigStorageCageDetailsList=new ArrayList<>();
			List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
			bigStorageCageDetailsList.add(bigStorageCageDetails);
			return bigStorageCageDetailsList;
			}
			@@ -229,6 +229,7 @@
			MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
			.selectAll(BigStorageCage.class)
			.leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
			.gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
			.last("limit 1");
			@@ -245,6 +246,7 @@
			return bigStorageDTO;
			}
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			@@ -257,6 +259,7 @@
			}
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.last("limit 1"));
			Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
			bigStorageDTO = new BigStorageDTO();