YiWuProject.git

			@@ -1,6 +1,6 @@
			package com.mes.downstorage.service.impl;

			import com.github.yulichang.query.MPJQueryWrapper;
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.mes.common.PLCAutoMes;
			import com.mes.common.S7control;
			import com.mes.device.PlcParameterObject;
			@@ -9,14 +9,13 @@
			import com.mes.downstorage.entity.DownStorageCage;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.downstorage.entity.DownStorageCageDetails;
			import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
			import com.mes.downstorage.mapper.DownStorageCageMapper;
			import com.mes.downstorage.service.DownStorageCageDetailsService;
			import com.mes.downstorage.service.DownStorageCageService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.tools.WebSocketServer;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			@@ -44,23 +43,9 @@
			private DownGlassTaskService downGlassTaskService;
			@Autowired
			private DownStorageCageDetailsService downStorageCageDetailsService;
			@Override
			public List<Map> gettask(){
			downStorageCageMapper.selectList(null);
			// downStorageCageMapper.selectJoin();
			return null;
			};


			@Override
			public List<Map> selectCacheEmpty(){
			return baseMapper.selectJoinList(
			Map.class,new MPJQueryWrapper<DownStorageCage>().selectAll(DownStorageCage.class)
			.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
			.leftJoin("down_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
			.isNull("escd.slot")
			);
			}




			@@ -84,32 +69,23 @@

			public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell,String taskType ) {
			DownGlassTask downGlassTask = new DownGlassTask();
			downGlassTask.setId(glassInfo.getId());
			downGlassTask.setStartCell(startCell);
			downGlassTask.setTaskType(taskType);
			downGlassTask.setEndCell(endCell);
			downGlassTask.setWidth(glassInfo.getWidth());
			downGlassTask.setHeight(glassInfo.getHeight());
			downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid()));
			downGlassTask.setThickness(glassInfo.getThickness());
			downGlassTask.setFlowCardId(glassInfo.getFlowcardId());

			BeanUtils.copyProperties(glassInfo,downGlassTask);

			downGlassTask.setStartCell(startCell);
			downGlassTask.setTaskType(taskType);
			downGlassTask.setEndCell(endCell);
			return downGlassTask;
			}


			public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell,String taskType ) {
			DownGlassTask downGlassTask = new DownGlassTask();
			downGlassTask.setId(glassInfo.getId());

			BeanUtils.copyProperties(glassInfo,downGlassTask);
			downGlassTask.setStartCell(startCell);
			downGlassTask.setTaskType(taskType);
			downGlassTask.setEndCell(endCell);
			downGlassTask.setWidth(glassInfo.getWidth());
			downGlassTask.setHeight(glassInfo.getHeight());
			downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid()));
			downGlassTask.setThickness(glassInfo.getThickness());
			downGlassTask.setFlowCardId(glassInfo.getFlowCardId());

			return downGlassTask;
			}

			@@ -123,13 +99,13 @@
			//存在此玻璃编号
			if (GlassInfo != null) {
			//同找到同流程卡附近空格
			List<DownStorageCageDetails> list = downStorageCageDetailsService.getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(), GlassInfo.getWidth());
			List<DownStorageCageDetails> list = selectCacheEmpty();

			List<Map> selectCacheEmpty=selectCacheEmpty();


			// list<Map> list=selectCacheEmpty();
			// list<Map> = downStorageCageService.selectCacheEmpty();
			if (selectCacheEmpty.size() > 0) {
			if (list.size() > 0) {
			//存在空格
			//1.生成任务：起始位置0 结束位置this.slot 任务类型 1 （进片任务）
			//2.回复 1进片
			@@ -141,7 +117,7 @@

			downGlassTaskService.insertCacheTask(downGlassTask);

			S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
			//S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);


			//完成后插入小片数据到缓存表
			@@ -185,13 +161,13 @@
			String endcell = "13";
			String SendEndcell = "1";

			// selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());


			DownGlassTask downGlassTask =createDownGlassTask(item3,"0",endcell,"2");

			downGlassTaskService.insertCacheTask(downGlassTask);
			S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
			S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
			// S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
			// S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
			return true;
			}
			}
			@@ -203,7 +179,7 @@
			DownStorageCageDetails item3 = list2.get(0);
			String endcell = "11";
			String SendEndcell = "1";
			// selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());

			DownGlassTask downGlassTask =createDownGlassTask(item3,"0",endcell,"2");
			downGlassTaskService.insertCacheTask(downGlassTask);

			@@ -217,7 +193,7 @@
			DownStorageCageDetails item = list.get(0);

			// 出到 G06
			//selectInfo.insertCacheTask(item.getGlassId() + "", "0", "06", "2", item.getWidth(), item.getHeight(), item.getFilmsid(), item.getThickness(), item.getFlowCardId());


			DownGlassTask downGlassTask =createDownGlassTask(item,"0","06","2");
			downGlassTaskService.insertCacheTask(downGlassTask);
			@@ -230,7 +206,7 @@
			DownStorageCageDetails item2 = list2.get(0);

			// 出到 G11
			// selectInfo.insertCacheTask(item2.getGlassId() + "", "0", "11", "2", item2.getWidth(), item2.getHeight(), item2.getFilmsid(), item2.getThickness(), item2.getFlowCardId());

			DownGlassTask downGlassTask =createDownGlassTask(item2,"0","11","2");
			downGlassTaskService.insertCacheTask(downGlassTask);

			@@ -248,8 +224,17 @@
			}





			@Override
			public List<DownStorageCageDetails> selectCacheEmpty() {
			return baseMapper.selectJoinList(DownStorageCageDetails.class,
			JoinWrappers.lambda(DownStorageCage.class)
			.selectAll(DownStorageCage.class)
			.select(DownStorageCageDetails::getWidth, DownStorageCageDetails::getHeight, DownStorageCageDetails::getGlassId)
			.leftJoin(DownStorageCageDetails.class, on -> on
			.eq(DownStorageCageDetails::getDeviceId, DownStorageCage::getDeviceId)
			.eq(DownStorageCageDetails::getSlot, DownStorageCage::getSlot))
			.isNull(DownStorageCageDetails::getSlot)
			);
			}

			}