YiWuProject.git

			@@ -3,9 +3,10 @@
			import cn.hutool.core.collection.CollectionUtil;
			import cn.hutool.core.lang.Assert;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
			import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.kangaroohy.milo.model.ReadWriteEntity;
			import com.kangaroohy.milo.service.MiloService;
			@@ -87,6 +88,9 @@
			@Autowired
			@Qualifier("s7SerializerDLPTwo")
			private S7Serializer s7SerializerDLPTwo;
			@Autowired
			@Qualifier("s7plcWZL")
			private S7PLC s7plcWZL;

			@Resource
			SysConfigService sysConfigService;
			@@ -389,6 +393,11 @@
			log.info("当前未收到出片请求，结束出片任务");
			return;
			}
			int outRequest = s7plcWZL.readUInt16("DB51.8");
			if (outRequest == 0){
			log.info("当前未收到卧转立允许出片请求，结束出片任务");
			return;
			}
			//获取出片任务表
			List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
			if (CollectionUtil.isNotEmpty(outTaskList)) {
			@@ -414,6 +423,8 @@
			LambdaQueryWrapper<BigStorageCage> queryWrapper = new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.le(BigStorageCage::getMinThickness, info.getThickness())
			.ge(BigStorageCage::getMaxThickness, info.getThickness())
			.orderByAsc(BigStorageCage::getDeviceId).orderByAsc(BigStorageCage::getSlot)
			.last("limit 1");

			@@ -478,13 +489,30 @@

			String temperingEngineerId = redisUtil.getCacheObject("temperingEngineerId");
			if (StringUtils.isNotBlank(temperingEngineerId)) {
			TemperingGlassInfo temperingGlassInfo = temperingGlassInfoService.getOne(new QueryWrapper<TemperingGlassInfo>()
			.select("Top 1 *")
			.eq("engineer_id", temperingEngineerId)
			.orderByDesc("tempering_layout_id"));
			List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(
			new LambdaQueryWrapper<TemperingGlassInfo>()
			.eq(TemperingGlassInfo::getEngineerId, temperingEngineerId)
			.orderByAsc(TemperingGlassInfo::getId)
			);
			int temperingLayoutId = 1;
			if (temperingGlassInfo != null) {
			temperingLayoutId = temperingGlassInfo.getTemperingLayoutId() + 1;
			if (CollectionUtils.isEmpty(temperingGlassInfoList)) {
			temperingLayoutId = 1;
			} else {
			List<Integer> tempIds = temperingGlassInfoList.stream()
			.map(TemperingGlassInfo::getTemperingLayoutId)
			.distinct()
			.sorted()
			.collect(Collectors.toList());

			int expected = 1;
			for (int current : tempIds) {
			if (current > expected) {
			break; // 找到第一个缺失值，跳出循环
			} else if (current == expected) {
			expected++; // 连续则递增期望的值
			}
			}
			temperingLayoutId = expected; // 缺失则为expected，连续则为max+1
			}
			List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getEngineerId, temperingEngineerId).eq(GlassInfo::getTemperingLayoutId, temperingLayoutId));
			if (CollectionUtil.isEmpty(glassInfos)) {
			@@ -575,6 +603,7 @@
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON));
			//定义10个格子为阈值
			if (count <= 10) {
			log.info("笼子超过阈值，执行4号笼子调度逻辑");
			//获取序号为1的格子将格子内的所有玻璃送到对应的笼子
			BigStorageCage bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			@@ -582,15 +611,18 @@
			.in(BigStorageCage::getDeviceId, Arrays.asList(5, 6))
			.orderByAsc(BigStorageCage::getDeviceId).orderByAsc(BigStorageCage::getSlot)
			.last("limit 1"));

			list = bigStorageCageDetailsService.queryNeedDispatch();
			computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task",
			bigStorageCage.getSlot(), Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
			List<Integer> slotList = new ArrayList<>();
			slotList.add(bigStorageCage.getSlot());
			slotList.add(list.get(0).getSlot());
			updateSlotRemainBySlots(slotList);
			return;
			if (null != bigStorageCage) {
			list = bigStorageCageDetailsService.queryNeedDispatch();
			if (CollectionUtil.isNotEmpty(list)) {
			computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task",
			bigStorageCage.getSlot(), Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
			List<Integer> slotList = new ArrayList<>();
			slotList.add(bigStorageCage.getSlot());
			slotList.add(list.get(0).getSlot());
			updateSlotRemainBySlots(slotList);
			return;
			}
			}
			}
			//生成调度任务按照组号组序由1开始依次往5号笼子送小片
			BigStorageSlotDTO slotDTO = bigStorageCageDetailsService.queryNeedDispatchSlotBySequence();