CanadaMes.git - Gitblit

			@@ -83,11 +83,9 @@
			storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
			dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);

			// String framenos="X225045101V";
			// north_frame_buffer1_frames frameInfos=dbserve.SelectFrameBarcode(framenos);
			// if(frameInfos!=null){
			// jsonObject.append("frameInfo", frameInfos);
			// }



			try {
			dbserve.getConn();
			dbconnected = true;
			@@ -148,6 +146,7 @@
			// 查询当前铝框信息
			Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
			jsonObject.append("CurrentFrame", CurrentFrame);


			try {
			// 铝框线交互
			@@ -172,6 +171,9 @@
			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);
			@@ -201,15 +203,6 @@
			}
			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);
			// }
			} catch (Exception e) {
			e.printStackTrace();
			}
			@@ -226,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 < 225 \|\| 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);
			@@ -287,35 +289,53 @@
			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==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();
			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);
			}
			}
			}
			}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
			e.printStackTrace();