CanadaMes.git - Gitblit

			@@ -14,6 +14,7 @@
			import com.example.springboot.mapper.SpianMapper;
			import com.example.springboot.service.JdbcConnections;
			import com.example.springboot.service.North_Glass_Buffer1Service;
			import com.example.springboot.service.OutSliceServive;
			import com.example.springboot.service.SpianService;


			@@ -21,6 +22,7 @@

			@Autowired
			private HomeMapper homeMapper;
			private OutSliceServive outSliceServive;
			private SpianMapper spianMapper;
			private SpianService spianService;
			private North_Glass_Buffer1Service north_Glass_Buffer1Service;
			@@ -47,6 +49,7 @@
			homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
			spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
			spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
			outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
			north_Glass_Buffer1Service = WebSocketServer.applicationContext.getBean(North_Glass_Buffer1Service.class);
			// 笼子使用情况
			List<StorageCage> tableData = homeMapper.selectAll();
			@@ -103,10 +106,11 @@
			jsonObject.append("form3", form3);
			}
			// 获取出片队列信息
			List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
			for (Out_slice out_slice : listoutslice) {
			out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
			}
			List<Out_slice> listoutslice=outSliceServive.SelectProductionqueue();
			// List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
			// for (Out_slice out_slice : listoutslice) {
			// out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
			// }
			jsonObject.append("listoutslice", listoutslice);
			//获取当前出片队列状态
			jsonObject.append("isAllowQueue",Plchome.isAllowQueue);