YiWuProject.git

			@@ -144,7 +144,7 @@
			// 查询任务


			PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
			// PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;

			List<DownStorageCageDetails> list = downStorageCageDetailsService.CacheOut(1, 5);
			List<DownStorageCageDetails> list2 = downStorageCageDetailsService.CacheOut(6, 10);
			@@ -238,9 +238,18 @@
			}


			@Override
			public List<Map<String, Object>> selectDownStorageCages() {
			return baseMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCage.class)
			.selectAll(DownStorageCage.class)
			.selectAs(DownStorageCageDetails::getId, "esdId")
			.select(DownStorageCageDetails::getGlassId, DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getId)
			.leftJoin(DownStorageCageDetails.class, on -> on
			.eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
			.eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
			);



			}

			/**
			* 修改理片笼信息功能：对笼内栅格玻璃【启用/禁用】
			@@ -265,14 +274,8 @@
			public boolean updateDownStorageCageDetails(int downStorageCageId,DownStorageCageDetails downStorageCageDetails){
			DownStorageCage downItem=baseMapper.selectById(downStorageCageId);
			log.info("正常"+downItem);
			DownStorageCageDetails edgDItem=downStorageCageDetailsMapper.selectById(downStorageCageDetails.getId());
			if (downItem!=null){
			//移除
			DownStorageCageDetails result=downStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<DownStorageCageDetails>().eq(DownStorageCageDetails::getSlot,downStorageCageId));
			if (result!=null){
			result.setSlot(0);
			downStorageCageDetailsMapper.updateById(result);
			}
			if(downStorageCageDetails !=null){
			DownStorageCageDetails edgDItem=downStorageCageDetailsMapper.selectById(downStorageCageDetails.getId());
			//添加
			if(edgDItem!=null){
			//只传格子：移除玻璃
			@@ -281,6 +284,16 @@
			downStorageCageDetailsMapper.updateById(newresult);
			}
			}

			if (downItem!=null){
			//移除
			DownStorageCageDetails result=downStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<DownStorageCageDetails>().eq(DownStorageCageDetails::getSlot,downStorageCageId));
			if (result!=null){
			result.setSlot(0);
			downStorageCageDetailsMapper.updateById(result);
			}

			}
			return true;
			}