YiWuProject.git

			@@ -9,6 +9,7 @@
			import com.mes.bigstorage.entity.BigStorageCage;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.dto.*;
			import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
			import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			@@ -294,7 +295,7 @@
			}
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
			// .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where engineer_id = '" + glassInfo.getEngineerId() + "' and tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			@@ -335,7 +336,7 @@
			}
			for (Integer item : deviceUsedList) {
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getDeviceId, item)
			.last("limit 1"));
			@@ -419,9 +420,8 @@


			@Override
			public List<Map<String, Object>> selectTemperingGlass() {
			List<Map<String, Object>> temperingGlass = baseMapper.selectTemperingGlassCount();
			return temperingGlass;
			public List<TemperingGlassCountDTO> selectTemperingGlass(int isTempering) {
			return baseMapper.selectTemperingGlassCount(isTempering);
			}

			@Override
			@@ -433,6 +433,11 @@
			public String dispatchSwitch(Boolean flag) {
			redisUtil.setCacheObject("dispatchSwitch", flag);
			return "success";
			}

			@Override
			public List<GlassInfoLackDTO> queryLackGlassInfo(BigStorageQueryVO bigStorageQueryVO) {
			return baseMapper.queryLackGlassInfo(bigStorageQueryVO);
			}

			@Override
			@@ -455,4 +460,18 @@
			public List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO) {
			return baseMapper.queryNeedDispatchSlot(bigStorageRelationDTO);
			}

			@Override
			public String bigStorageGlassDamageByGlassId(String glassId) {
			Damage damage = new Damage();
			damage.setGlassId(glassId);
			damage.setType(Const.GLASS_STATE_DAMAGE);
			damageService.insertDamage(damage);
			return "success";
			}

			@Override
			public void updateDeviceIdBySlot(List<Integer> slotList) {
			baseMapper.updateDeviceIdBySlot(slotList);
			}
			}