CanadaMes.git - Gitblit

			@@ -72,7 +72,7 @@
			jsonObject.append("feedglassid", feedglassid);

			try {
			Thread.sleep(1000);
			Thread.sleep(500);
			// 注入mapper
			homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
			spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
			@@ -83,7 +83,9 @@
			storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
			dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);

			// boolean dbconnected = false;



			try {
			dbserve.getConn();
			dbconnected = true;
			@@ -93,30 +95,7 @@
			log.info("dbconnected:" + dbconnected);
			}
			jsonObject.append("dbconnected", dbconnected);
			// // 获取当前扫码枪玻璃id
			// String CurrrentGlassId = "X22595911002GV";
			// if (CurrrentGlassId.toString() != "" && CurrrentGlassId.toString() != null) {
			// north_glass_buffer1 form6 =
			// dbserve.SelectGlassByGlassIdOrderIdFrameIdouts(CurrrentGlassId, "",
			// "");
			// if (form6.getbarcode() != null) {
			// jsonObject.append("form6", form6);
			// double width = 0;
			// double height = 0;
			// if (form6.getglassheightmm() < form6.getglasslengthmm()) {
			// height = form6.getglassheightmm();
			// width = form6.getglasslengthmm();
			// } else {
			// height = form6.getglasslengthmm();
			// width = form6.getglassheightmm();
			// }
			// if (height < 380 \|\| width < 380 \|\| height > 1810 \|\| width > 2760) {
			// zhi = 600;
			// } else {
			// zhi = spianService.selectAlls(form6);
			// }
			// }
			// }


			// 笼子使用情况
			List<StorageCage> tableData = homeMapper.selectAll();
			@@ -167,70 +146,63 @@
			// 查询当前铝框信息
			Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
			jsonObject.append("CurrentFrame", CurrentFrame);


			// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
			// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
			try {
			// 铝框线交互
			// if (S7controlLK.getinstance().CheckConnected() == true) {
			// E02玻璃id
			// log.info("frame1"+S7controlLK.getinstance().CheckConnected());
			String E02id="";
			// try {
			// E02id= S7controlLK.getinstance().readStrings("DB17.40");
			// plc2=true;
			// } catch (Exception e) {
			// // TODO: handle exception
			// plc2=false;
			// e.printStackTrace();
			// }
			try {
			E02id= S7controlLK.getinstance().readStrings("DB17.40");
			plc2=true;
			} catch (Exception e) {
			// TODO: handle exception
			plc2=false;
			e.printStackTrace();
			}

			// jsonObject.append("Plc2", plc2);
			// // log.info("铝框线读取2"+S7controlLK.getinstance().CheckConnected());
			jsonObject.append("Plc2", plc2);
			// log.info("铝框线读取2"+S7controlLK.getinstance().CheckConnected());

			// // log.info("E02id"+E02id);
			// outSliceServive.FrameStateUpdate(E02id);
			// if (CurrentFrame != null) {
			// S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
			// log.info("E02id"+E02id);
			outSliceServive.FrameStateUpdate(E02id);
			if (CurrentFrame != null) {
			S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
			}
			// else{
			// S7controlLK.getinstance().writeStrings("", "DB17.0");
			// }
			// String J01id = S7controlLK.getinstance().readStrings("DB17.22");
			// List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
			// Short framerequest = liststate.get(0);
			// // log.info("liststate:" + liststate);
			// if (framerequest == 1) {
			// // 铝框id
			// String position;
			// try {
			// position = dbserve.SelectPositionByFrameBarcode(J01id);
			// } catch (SQLException e) {
			// // TODO Auto-generated catch block
			// position = "0";
			// e.printStackTrace();
			// }
			// Short send;
			// if (position.equals("1")) {
			// send = 1;
			// } else {
			// send = 2;
			// }
			// if (J01id != null) {
			// int barcodeState = spianMapper.SelectOverState(J01id);// 获取该铝框的状态
			// if (barcodeState == 0) {// 当该铝框所有的玻璃都是完成状态时删除在出片队列的数据
			// spianMapper.DeleteQueue(J01id);
			// // log.info("deleteoutslice:" + J01id);
			// }
			// }
			// S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
			// }

			String E01id = S7controlLK.getinstance().readStrings("DB17.0");
			// log.info("frameno:" + E01id);
			List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
			// log.info("frameflip:" + liststates);
			// }else{
			// log.info("Plc2"+S7controlLK.getinstance().CheckConnected());
			// jsonObject.append("Plc2", false);
			// }
			String J01id = S7controlLK.getinstance().readStrings("DB17.22");
			List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
			Short framerequest = liststate.get(0);
			// log.info("liststate:" + liststate);
			if (framerequest == 1) {
			// 铝框id
			String position;
			try {
			position = dbserve.SelectPositionByFrameBarcode(J01id);
			} catch (SQLException e) {
			// TODO Auto-generated catch block
			position = "0";
			e.printStackTrace();
			}
			Short send;
			if (position.equals("1")) {
			send = 1;
			} else {
			send = 2;
			}
			if (J01id != null) {
			int barcodeState = spianMapper.SelectOverState(J01id);// 获取该铝框的状态
			if (barcodeState == 0) {// 当该铝框所有的玻璃都是完成状态时删除在出片队列的数据
			spianMapper.DeleteQueue(J01id);
			// log.info("deleteoutslice:" + J01id);
			}
			}
			S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			@@ -247,25 +219,34 @@
			// 获取当前扫码枪玻璃id
			String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
			if (CurrrentGlassId.toString() != "" && CurrrentGlassId.toString() != null) {
			north_glass_buffer1 form6 = dbserve.SelectGlassByGlassIdOrderIdFrameIdouts(CurrrentGlassId, "",
			north_glass_buffer1 form6=new north_glass_buffer1();
			try {
			form6= dbserve.SelectGlassByGlassIdOrderIdFrameIdouts(CurrrentGlassId, "",
			"");
			if (form6.getbarcode() != null) {
			jsonObject.append("form6", form6);
			double width = 0;
			double height = 0;
			if (form6.getglassheightmm() < form6.getglasslengthmm()) {
			height = form6.getglassheightmm();
			width = form6.getglasslengthmm();
			} else {
			height = form6.getglasslengthmm();
			width = form6.getglassheightmm();
			}
			if (height < 380 \|\| width < 380 \|\| height > 1810 \|\| width > 2760) {
			zhi = 600;
			} else {
			zhi = spianService.selectAlls(form6);
			} catch (Exception e) {
			// TODO: handle exception
			e.printStackTrace();
			}
			if(form6!=null){
			if (form6.getbarcode() != null) {
			jsonObject.append("form6", form6);
			double width = 0;
			double height = 0;
			if (form6.getglassheightmm() < form6.getglasslengthmm()) {
			height = form6.getglassheightmm();
			width = form6.getglasslengthmm();
			} else {
			height = form6.getglasslengthmm();
			width = form6.getglassheightmm();
			}
			if (height < 225 \|\| width < 380 \|\| height > 1810 \|\| width > 2760) {
			zhi = 600;
			} else {
			zhi = spianService.selectAlls(form6);
			}
			}
			}

			}

			jsonObject.append("CurrrentGlassId", CurrrentGlassId);
			@@ -299,41 +280,61 @@
			if (paramlist != null) {
			jsonObject.append("params", paramlist);
			}
			// // 获取进片车状态
			// List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
			// 1);// 获取进片车状态
			// if (datas1ListState != null) {
			// boolean exist1 = datas1ListState.contains((short) 0);
			// jsonObject.append("zhuangtai", exist1);
			// }

			// // 获取进片玻璃信息
			// List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
			// if (inglassInfo != null) {
			// if (inglassInfo.size() > 0) {
			// jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
			// }
			// }
			// // 获取铝框idDB106.DBW64，添加到出片队列
			// String frameno="X21763329601FB";

			String frameno = spianService.queGlassid("DB103.270", 11).toString();
			north_frame_buffer1_frames frameInfo=dbserve.SelectFrameBarcode(frameno);
			if(frameInfo!=null){
			jsonObject.append("frameInfo", frameInfo);
			}
			if (!frameno.equals(Plchome.FrameNo)) {
			Plchome.FrameNo = frameno;
			try {

			Short num = 0;
			List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
			.SelectAluminumFrameInfoById(Plchome.FrameNo);
			for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
			if (north_glass_buffer1.getstorageCage() == null) {
			break;

			double framewidth=0;
			double frameheight=0;
			if(frameInfo!=null){
			if(frameInfo.getframelengthmm()>frameInfo.getframeheightmm()){
			framewidth=frameInfo.getframelengthmm();
			frameheight=frameInfo.getframeheightmm();
			}else{
			framewidth=frameInfo.getframeheightmm();
			frameheight=frameInfo.getframelengthmm();
			}
			num++;
			}
			if (num == north_glass_buffer1s.size()) {
			north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
			} else {
			Plchome.AluminumFrame = north_glass_buffer1s;
			Plchome.AluminumFrameInfo=dbserve.SelectFrameBarcode(Plchome.FrameNo);
			if(framewidth<600\|\|frameheight<400){
			Plchome.AluminumFrame = north_glass_buffer1s;
			Plchome.AluminumFrameInfo=frameInfo;
			}else{
			for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
			if (north_glass_buffer1.getstorageCage() == null) {
			break;
			}
			num++;
			}

			if(num==0&&north_glass_buffer1s.size()==0){
			Plchome.AluminumFrameInfo=dbserve.SelectFrameBarcode(Plchome.FrameNo);
			if(Plchome.AluminumFrameInfo.getbarcode()!=null){
			int count=homeMapper.SelectCountFrame(AluminumFrameInfo.getbarcode());
			if(count==0){
			int sequence = homeMapper.SelectMaxSquence();
			homeMapper.AddOutSliceS("", AluminumFrameInfo.getflip().toString(), Plchome.FrameNo, "0", "0", sequence, "0", (short)3, AluminumFrameInfo.getordernumber(),AluminumFrameInfo.getlistnumber() , AluminumFrameInfo.getboxnumber(), "0", "0", AluminumFrameInfo.getframelength().toString(), AluminumFrameInfo.getframeheight().toString());
			log.info("NoGlass"+AluminumFrameInfo.getbarcode());
			Plchome.AluminumFrameInfo=new north_frame_buffer1_frames();
			}
			}
			}else{
			if (num == north_glass_buffer1s.size()) {
			north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
			} else {
			Plchome.AluminumFrame = north_glass_buffer1s;
			Plchome.AluminumFrameInfo=dbserve.SelectFrameBarcode(Plchome.FrameNo);
			}
			}
			}
			}
			} catch (SQLException e) {
			// TODO Auto-generated catch block
			@@ -380,7 +381,7 @@
			height = form3.getglasswidth();
			width = form3.getglassheight();
			}
			if (height < 380 \|\| width < 380 \|\| height > 1810 \|\| width > 2760) {
			if (height < 225 \|\| width < 380 \|\| height > 1810 \|\| width > 2760) {
			zhi = 600;
			} else {
			if (D01RequestState == true && D01ResponseState != true) {