YiWuProject.git

			@@ -4,9 +4,9 @@

			import com.mes.common.PLCAutoMes;
			import com.mes.common.PlcParameterObject;
			import com.mes.common.S7object;
			import com.mes.taskcache.entity.EdgStorageCageDetails;
			import com.mes.taskcache.entity.GlassInfo;
			//import com.mes.common.S7object;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.taskcache.mapper.HangzhouMesMapper;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			@@ -40,14 +40,14 @@
			PlcParameterObject plcmes= PLCAutoMes.PlcMesObject;
			if(GlassInfo!=null){//存在此玻璃编号
			//同钢化版图内的栅格号
			List<EdgStorageCageDetails> list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth());
			List<EdgStorageCageDetails> list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperingLayoutId(),GlassInfo.getTemperingFeedSequence(),GlassInfo.getWidth());
			//空栅格号
			if (list.size()==0) {
			list=hangzhouMesMapper.selectCacheLeisure();
			}
			//小于此玻璃钢化版图序号的栅格号
			if(list.size()==0){
			list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getWidth());
			list=hangzhouMesMapper.selectIsExistIntoCache(GlassInfo.getTemperingLayoutId(),GlassInfo.getWidth());
			}
			if(list.size()>0){
			//存在空格
			@@ -55,7 +55,7 @@
			//2.回复 1进片
			EdgStorageCageDetails item=list.get(0);
			hangzhouMesMapper.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
			S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
			// S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
			return true;
			}