~admin/HangZhouMes.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;
			@@ -15,15 +17,19 @@
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
			import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
			import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
			import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
			import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
			import com.mes.common.config.Const;
			import com.mes.common.utils.RedisUtil;
			import com.mes.damage.entity.Damage;
			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;
			@@ -58,7 +64,15 @@
			private GlassInfoMapper glassInfoMapper;

			@Resource
			private GlassInfoService glassInfoService;

			@Resource
			private TemperingGlassInfoService temperingGlassInfoService;

			@Resource
			private DamageService damageService;
			@Resource
			private RedisUtil redisUtil;

			@Value("${mes.minCount}")
			private int minCount;
			@@ -68,6 +82,10 @@

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

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


			/**
			* 查询进/出片任务
			@@ -232,7 +250,7 @@
			List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
			bigStorageCageDetailsList.add(bigStorageCageDetails);
			return bigStorageCageDetailsList;
			}else{
			} else {
			return null;
			}

			@@ -292,6 +310,7 @@
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			.last("limit 1"));
			@@ -307,9 +326,10 @@
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
			.notInSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			.gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			"select distinct device_id from big_storage_cage_details where state in (100,102,103)")
			.ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.orderByAsc(BigStorageCage::getDeviceId)
			.last("limit 1"));
			if (null != bigStorageCage) {
			@@ -321,8 +341,9 @@
			}
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.orderByAsc(BigStorageCage::getDeviceId)
			.last("limit 1"));
			Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
			@@ -340,7 +361,7 @@


			@Override
			public TemperingLayoutDTO queryTemperingOccupySlot() {
			public List<TemperingLayoutDTO> queryTemperingOccupySlot() {
			return baseMapper.queryTemperingOccupySlot(minCount);
			}

			@@ -350,46 +371,49 @@
			}

			@Override
			public boolean TemperingGlass(String temperingLayoutId, String engineerId){
			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper=new LambdaQueryWrapper<>();
			public boolean temperingGlass(String temperingLayoutId, String engineerId) {
			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
			temperingGlassInfoLambdaQueryWrapper
			.eq(TemperingGlassInfo::getTemperingLayoutId,temperingLayoutId)
			.eq(TemperingGlassInfo::getEngineerId,engineerId);
			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);
			.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
			List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);

			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);
			if (temperingGlassInfoList.size() == 0) {
			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;
			}
			return true;
			}else{
			return false;
			}


			return false;
			}


			@Override
			public List<Map<String, Object>> selectTemperingGlass(){
			public List<Map<String, Object>> selectTemperingGlass() {
			QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
			wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
			.in("state", Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL)
			.groupBy("engineer_id,tempering_layout_id");
			List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
			return TemperingGlass;
			}

			@Override
			public void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state) {
			baseMapper.updateBySlot(glassList, state);
			}

			@Override
			public String temperingSwitch(Boolean flag) {
			redisUtil.setCacheObject("temperingSwitch", flag);
			return "success";
			}
			}