YiWuProject.git

			@@ -6,9 +6,11 @@
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.base.entity.vo.BigStorageVO;
			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 +296,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 +337,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"));
			@@ -395,9 +397,9 @@

			if (temperingGlassInfoList.size() == 0) {
			List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
			.selectAll(GlassInfo.class)
			.select("-1 as state")
			.selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
			.select("-1 as state,t.filmsid as films_id,t.glass_id,t.flow_card_id,t.glass_type,t.width,t.height" +
			",t.thickness,t.ishorizontal,t.tempering_layout_id,t.tempering_feed_sequence,t.x_coordinate,t.y_coordinate," +
			"t.angle,t1.slot,t.engineer_id")
			.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
			.eq(GlassInfo::getTemperingLayoutId, temperingLayoutId)
			.eq(GlassInfo::getEngineerId, engineerId)
			@@ -419,9 +421,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
			@@ -436,14 +437,54 @@
			}

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

			@Override
			public List<BigStorageCageDetails> queryRealGlassInfo(BigStorageQueryVO bigStorageQueryVO) {
			return this.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getEngineerId, bigStorageQueryVO.getEngineerId())
			.eq(BigStorageCageDetails::getTemperingLayoutId, bigStorageQueryVO.getTemperingLayoutId())
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).orderByAsc(BigStorageCageDetails::getTemperingFeedSequence));
			}

			@Override
			public List<BigStorageVO> querybigStorageCageDetail() {
			return baseMapper.querybigStorageCageDetail();
			}

			@Override
			public String temperingSwitch(Boolean flag) {
			redisUtil.setCacheObject("temperingSwitch", flag);
			return "success";
			}

			@Override
			public void appointEngineerId(String engineerId) {
			redisUtil.setCacheObject("temperingengineerId", engineerId);
			public boolean appointTemperingEngineerId(String engineerId) {
			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
			temperingGlassInfoLambdaQueryWrapper
			.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
			List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);

			if (temperingGlassInfoList.size() == 0) {
			List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
			.select("-1 as state,t.filmsid as films_id,t.glass_id,t.flow_card_id,t.glass_type,t.width,t.height" +
			",t.thickness,t.ishorizontal,t.tempering_layout_id,t.tempering_feed_sequence,t.x_coordinate,t.y_coordinate," +
			"t.angle,t1.slot,t.engineer_id")
			.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
			.eq(GlassInfo::getEngineerId, engineerId)
			.ne(GlassInfo::getTemperingLayoutId, 0)
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.orderByAsc(BigStorageCageDetails::getTemperingLayoutId)
			.orderByAsc(BigStorageCageDetails::getTemperingFeedSequence)
			);
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			return true;
			}
			}
			return false;
			}

			@Override
			@@ -455,4 +496,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);
			}
			}