YiWuProject.git

			@@ -283,7 +283,7 @@
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where engineer_id = '" + EngineerId + "'")
			"select distinct device_id from big_storage_cage_details where engineer_id = '" + EngineerId + "' and device_id not in (5,6)")
			.last("limit 1"));
			if (null != bigStorageCage) {
			log.info("根据版图id找到笼子内的目标格子：{},玻璃id：{}", bigStorageCage.getSlot(), glassId);

			@@ -136,10 +136,7 @@
			return;
			}
			Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_SLOT_WIDTH);
			// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_GLASS_GAP);
			Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_OUT_CAR_SIZE);
			// Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>()
			// .eq(Engineering::getEngineerId, glassInfo.getEngineerId()));
			//获取玻璃的工程id，按照工程id获取工程下的所有玻璃信息
			List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>()
			.eq(GlassInfo::getEngineerId, engineerId)

			@@ -20,6 +20,7 @@
			WHERE T.MAX_THICKNESS >= #{thickness}
			and t.MIN_THICKNESS <= #{thickness}
			AND T.ENABLE_STATE = 1
			and t.device_id not in (5,6)
			GROUP BY T.DEVICE_ID
			HAVING count(t.slot) - COUNT(DISTINCT T1.slot) > 0
			ORDER BY COUNT(DISTINCT T1.ENGINEER_ID), count(t.slot) - COUNT(DISTINCT T1.slot) desc

	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageGlassInfoServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史