~admin/HangZhouMes.git

			@@ -2,6 +2,7 @@

			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.toolkit.CollectionUtils;
			import com.github.yulichang.base.MPJBaseServiceImpl;
			import com.github.yulichang.toolkit.JoinWrappers;
			@@ -26,7 +27,6 @@
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.mapper.GlassInfoMapper;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.job.PlcStorageCageTask;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			@@ -70,9 +70,6 @@

			@Resource
			private TemperingGlassInfoService temperingGlassInfoService;

			@Resource
			private PlcStorageCageTask plcStorageCageTask;

			@Resource
			private DamageService damageService;
			@@ -366,7 +363,7 @@
			}

			@Override
			public boolean temperingGlass(String temperingLayoutId, String engineerId, String temperingFeedSequence) {
			public boolean temperingGlass(String temperingLayoutId, String engineerId) {
			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
			temperingGlassInfoLambdaQueryWrapper
			.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
			@@ -383,13 +380,7 @@
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			if ("0".equals(temperingFeedSequence)) {
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			plcStorageCageTask.computeOutMoreGlassInfo(temperingGlassInfos, Boolean.FALSE, "");
			}
			} else {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			}
			return true;
			}
			}