From eccfd8d0504c48f07c7e11ed1fc94451ce5e7cb1 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期一, 01 四月 2024 09:10:34 +0800 Subject: [PATCH] 添加报警信息 --- springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 52 +++++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 23 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java index c0a1c85..b528efc 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java +++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java @@ -116,28 +116,18 @@ //璇诲彇DB105鍖烘枃浠� PlcParameterObject plcmes=PLCAutoMes.PlcMesObject; - // String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰 - // String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//鍙戦�� - // double width=Double.valueOf(plcmes.getPlcParameter("Height").getValue());//瀹� - // double height=Double.valueOf(plcmes.getPlcParameter("width").getValue());//楂� + String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰 + String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//鍙戦�� + double width=Double.valueOf(plcmes.getPlcParameter("width").getValue());//瀹� + double height=Double.valueOf(plcmes.getPlcParameter("Height").getValue());//楂� - String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+""; - double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+""); - double height=Double.parseDouble(S7control.getinstance().ReadWord("DB14.30", 1).get(0)+""); - String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+""; + // String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+""; + // double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+""); + // double height=Double.parseDouble(S7control.getinstance().ReadWord("DB14.30", 1).get(0)+""); + // String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+""; //鑾峰彇娴嬮噺鐨勯暱锛屽 - - - //String url="C:\\Users\\SNG-ZDH-012\\Desktop\\闃垮皵宸村凹浜氭暟鎹姹�.xlsx";E:\ - //String url="E:\\闃垮皵宸村凹浜氭暟鎹姹�.xlsx"; - // List result= HomeService.ReadExecl(url); - // for(int i=0;i<result.size();i++){ - // System.out.println(result.get(i)); - // } - - - + boolean istest = false; // String PlcRequest = "1"; // String MesSend = "0"; // double width = 402; @@ -145,26 +135,42 @@ //鍖归厤 //System.err.println(PlcRequest+","+MesSend+","+width+","+height); - if ("0".equals(PlcRequest)) { + if ("0".equals(PlcRequest)&&istest) { S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0); } if ("1".equals(PlcRequest)&&"0".equals(MesSend)) { boolean is=HomeService.Normal(width, height, "1"); - if (is) { + if (is&&istest) { // 娴嬮噺鎴愬姛 S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1); - }else{ + }else if(istest){ // 閲嶆柊娴嬮噺 S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 4); } } + //S7control.getinstance().WriteWord("DB14.170", (short)0); Queue LastQueue= QueueMapper.selectLastQueue(); + if(LastQueue==null){ + Queue nullQueue=new Queue(); + nullQueue.setglassId(""); + nullQueue.setglassheight(0); + nullQueue.setglasswidth(0); + nullQueue.setglassheightmm(0); + nullQueue.setglasswidthmm(0); + jsonObject.append("LastQueue", nullQueue); + }else{ + if (LastQueue.getstate()<1) { + LastQueue.setglasswidth(0); + LastQueue.setglassheight(0); + } + jsonObject.append("LastQueue", LastQueue); + } // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16)); // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14)); - jsonObject.append("LastQueue", LastQueue); + //鏌ヨ鐞嗙墖绗间俊鎭� List<StorageCage> StorageCageInfo = storageCageService.SelectStorageCageInfo(); jsonObject.append("StorageCageInfo", StorageCageInfo); -- Gitblit v1.8.0