YiWuProject.git

			@@ -232,7 +232,7 @@
			List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
			bigStorageCageDetailsList.add(bigStorageCageDetails);
			return bigStorageCageDetailsList;
			}else{
			} else {
			return null;
			}

			@@ -308,8 +308,8 @@
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.notInSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			.gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			"select distinct device_id from big_storage_cage_details where state in (100,102,103)")
			.ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.orderByAsc(BigStorageCage::getDeviceId)
			.last("limit 1"));
			if (null != bigStorageCage) {
			@@ -322,7 +322,7 @@
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.orderByAsc(BigStorageCage::getDeviceId)
			.last("limit 1"));
			Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
			@@ -350,12 +350,12 @@
			}

			@Override
			public boolean TemperingGlass(String temperingLayoutId, String engineerId){
			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper=new LambdaQueryWrapper<>();
			public boolean TemperingGlass(String temperingLayoutId, String engineerId) {
			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
			temperingGlassInfoLambdaQueryWrapper
			.eq(TemperingGlassInfo::getTemperingLayoutId,temperingLayoutId)
			.eq(TemperingGlassInfo::getEngineerId,engineerId);
			.eq(TemperingGlassInfo::getState,Const.TEMPERING_NEW);
			List<TemperingGlassInfo> temperingGlassInfoList=temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);

			if(temperingGlassInfoList.size()==0){
			LambdaQueryWrapper<BigStorageCageDetails> wrapper =new LambdaQueryWrapper<>();
			wrapper.eq(BigStorageCageDetails::getTemperingLayoutId,temperingLayoutId)
			@@ -363,12 +363,12 @@
			.in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL);
			List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(wrapper);

			for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList
			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
			LambdaQueryWrapper<GlassInfo> glassInfoLambdaQueryWrapper=new LambdaQueryWrapper<>();
			glassInfoLambdaQueryWrapper.eq(GlassInfo::getGlassId,bigStorageCageDetails.getGlassId());
			GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoLambdaQueryWrapper);
			TemperingGlassInfo temperingGlassInfo = new TemperingGlassInfo();
			LambdaQueryWrapper<GlassInfo> glassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
			glassInfoLambdaQueryWrapper.eq(GlassInfo::getGlassId, bigStorageCageDetails.getGlassId());
			GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoLambdaQueryWrapper);

			BeanUtils.copyProperties(glassInfo, temperingGlassInfo);
			temperingGlassInfo.setAngle((int) glassInfo.getAngle());
			@@ -377,7 +377,7 @@
			temperingGlassInfoMapper.insert(temperingGlassInfo);
			}
			return true;
			}else{
			} else {
			return false;
			}

			@@ -388,6 +388,7 @@
			public List<Map<String, Object>> selectTemperingGlass(){
			QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
			wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
			.in("state",Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL)
			.groupBy("engineer_id,tempering_layout_id");
			List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
			return TemperingGlass;