YiWuProject.git

			@@ -5,8 +5,8 @@
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.service.TemperingGlassInfoService;
			import com.mes.uppattenusage.entity.GlassInfo;
			import com.mes.uppattenusage.service.GlassInfoService;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import org.springframework.beans.factory.annotation.Autowired;

			import java.util.List;
			@@ -21,11 +21,11 @@
			private TemperingGlassInfoService temperingGlassInfoService;
			@Autowired
			private GlassInfoService glassInfoService;

			@Override
			public void run() {
			while (this != null) {
			try {

			Thread.sleep(500);
			String plcFeedReq ="0";
			String plcFeedGlassid ="111";
			@@ -35,7 +35,7 @@
			//传入玻璃id
			GlassInfo glassInfo=glassInfoService.getById(plcFeedGlassid);

			BigStorageCageDetails SlotInfo=bigStorageCageService.FeedGlass(glassInfo,bigStorageCageDetails);
			BigStorageCageDetails SlotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
			if(SlotInfo!=null){
			//plc任务发送字
			}
			@@ -46,23 +46,12 @@
			boolean result=false;
			if("1".equals(plcOutReq)){
			//获取钢化小片表未出笼信息
			List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.SelectTemperingGlassInfo();
			//没有可出的玻璃时
			if(temperingGlassInfoList!=null){
			//查询是否有小片全部到齐的钢化版图
			result = bigStorageCageDetailsService.getTemperingGlass();
			}else{
			//继续当前钢化版图的任务

			temperingGlassInfoService.addOutTask(temperingGlassInfoList);
			result=true;
			}

			if(result==true){
			//plc任务发送字
			}
			}




			} catch (Exception e) {