YiWuProject.git

			@@ -8,9 +8,7 @@
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.bigstorage.entity.BigStorageCage;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.BigStorageDTO;
			import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
			import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
			import com.mes.bigstorage.entity.dto.*;
			import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			@@ -296,7 +294,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())
			@@ -337,7 +335,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"));
			@@ -432,6 +430,12 @@
			}

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

			@Override
			public String temperingSwitch(Boolean flag) {
			redisUtil.setCacheObject("temperingSwitch", flag);
			return "success";
			@@ -441,4 +445,14 @@
			public void appointEngineerId(String engineerId) {
			redisUtil.setCacheObject("temperingengineerId", engineerId);
			}

			@Override
			public List<BigStorageRelationDTO> queryIsAllNeedDispatchVirtualSlot() {
			return baseMapper.queryIsAllNeedDispatchVirtualSlot();
			}

			@Override
			public List<BigStorageSequenceDTO> dispatchBigStorageGlassInfo(BigStorageRelationDTO bigStorageRelationDTO) {
			return baseMapper.queryNeedDispatchSlot(bigStorageRelationDTO);
			}
			}