YiWuProject.git

			@@ -177,14 +177,10 @@
			@Override
			public int bigStorageSlotPair(BigStorageGlassInfo bigStorageGlassInfo) {
			//获取所有空闲可用的格子号
			Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_SLOT_WIDTH);
			BigStorageCage storageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth)
			.le(BigStorageCage::getMinThickness, bigStorageGlassInfo.getThickness())
			.ge(BigStorageCage::getMaxThickness, bigStorageGlassInfo.getThickness())
			.orderByAsc(BigStorageCage::getMaxThickness).orderByAsc(BigStorageCage::getSlot).last("limit 1"));
			Assert.isTrue(null != storageCage, "没有空余的笼子存放玻璃");
			Integer slot = storageCage.getSlot();
			BigStorageDTO bigStorageDTO = bigStorageCageDetailsService.queryTargetSlot(bigStorageGlassInfo.getEngineerId(),
			bigStorageGlassInfo.getGlassId(), bigStorageGlassInfo.getThickness().intValue());
			Assert.isTrue(null != bigStorageDTO, "没有空余的笼子存放玻璃");
			Integer slot = bigStorageDTO.getSlot();
			//获取该工程同一流程卡同一车的玻璃信息
			List<BigStorageGlassInfo> bigStorageGlassInfoList = this.list(new LambdaQueryWrapper<BigStorageGlassInfo>()
			.eq(BigStorageGlassInfo::getEngineerId, bigStorageGlassInfo.getEngineerId())
			@@ -195,7 +191,7 @@
			BigStorageGlassRelationInfo info = new BigStorageGlassRelationInfo();
			BeanUtils.copyProperties(e, info);
			info.setSlot(slot);
			info.setDeviceId(storageCage.getDeviceId());
			info.setDeviceId(bigStorageDTO.getDeviceId());
			return info;
			}).collect(Collectors.toList());
			//保存关系表

			@@ -3,13 +3,11 @@
			import cn.hutool.json.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
			import com.kangaroohy.milo.model.ReadWriteEntity;
			import com.kangaroohy.milo.service.MiloService;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.dto.BigStorageSummaryDTO;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragecagetask.entity.BigStorageCageHistoryTask;
			import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
			import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
			import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
			@@ -230,13 +228,7 @@
			jsonObject.append("autoPrint", autoPrint);

			//当前指定工程
			String temperingengineerId = "";
			if (redisUtil.getCacheObject("temperingengineerId") == null) {
			redisUtil.setCacheObject("temperingengineerId", temperingengineerId);
			} else {
			temperingengineerId = redisUtil.getCacheObject("temperingengineerId");
			}
			jsonObject.append("temperingengineerId", temperingengineerId);
			jsonObject.append("temperingEngineerId", redisUtil.getCacheObject("temperingEngineerId"));


			}

	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史