YiWuProject.git

			@@ -3,7 +3,9 @@
			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;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.bigstorage.entity.BigStorageCage;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			@@ -23,8 +25,10 @@
			import com.mes.damage.service.DamageService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.mapper.GlassInfoMapper;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;
			@@ -59,6 +63,12 @@
			private GlassInfoMapper glassInfoMapper;

			@Resource
			private GlassInfoService glassInfoService;

			@Resource
			private TemperingGlassInfoService temperingGlassInfoService;

			@Resource
			private DamageService damageService;

			@Value("${mes.minCount}")
			@@ -69,6 +79,9 @@

			@Value("${mes.glassGap}")
			private Integer glassGap;

			@Value("${mes.sequence.order}")
			private boolean sequenceOrder;

			/**
			* 查询进/出片任务
			@@ -354,37 +367,30 @@
			}

			@Override
			public boolean TemperingGlass(String temperingLayoutId, String engineerId) {
			public boolean temperingGlass(String temperingLayoutId, String engineerId) {
			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
			temperingGlassInfoLambdaQueryWrapper
			.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
			List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);

			if (temperingGlassInfoList.size() == 0) {
			LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutId)
			.eq(BigStorageCageDetails::getEngineerId, engineerId)
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL);
			List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(wrapper);

			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			TemperingGlassInfo temperingGlassInfo = new TemperingGlassInfo();
			LambdaQueryWrapper<GlassInfo> glassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
			glassInfoLambdaQueryWrapper.eq(GlassInfo::getGlassId, bigStorageCageDetails.getGlassId());
			GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoLambdaQueryWrapper);

			BeanUtils.copyProperties(glassInfo, temperingGlassInfo);
			temperingGlassInfo.setAngle((int) glassInfo.getAngle());
			temperingGlassInfo.setState(Const.TEMPERING_NEW);
			temperingGlassInfo.setSlot(bigStorageCageDetails.getSlot());
			temperingGlassInfoMapper.insert(temperingGlassInfo);
			}
			List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
			.selectAll(GlassInfo.class)
			.select("-1 as state")
			.selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
			.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
			.eq(GlassInfo::getTemperingLayoutId, temperingLayoutId)
			.eq(GlassInfo::getEngineerId, engineerId)
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			return true;
			} else {
			}
			}
			return false;
			}
			}


			@Override
			public List<Map<String, Object>> selectTemperingGlass() {