From 202ca0f62257d108e95ca2e5912b86cf7b407906 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期一, 25 三月 2024 08:09:49 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes --- springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 51 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 35 insertions(+), 16 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 b5693e4..c0a1c85 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 @@ -77,13 +77,13 @@ storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class); // 绗煎瓙浣跨敤鎯呭喌 - List<StorageCage> tableData = homeMapper.selectAll(); + List<StorageCage> tableData = homeMapper.selectAlls(); jsonObject.append("tableData", tableData); // 鏍肩悊鐗囩鏍煎瓙鐘舵�� - List<StorageCage> cagelist1 = homeMapper.selectRack1(); - List<StorageCage> cagelist2 = homeMapper.selectRack2(); - List<StorageCage> cagelist3 = homeMapper.selectRack3(); - List<StorageCage> cagelist4 = homeMapper.selectRack4(); + List<StorageCage> cagelist1=storageCageService.SelectStorageCageByCage(1); + List<StorageCage> cagelist2=storageCageService.SelectStorageCageByCage(2); + List<StorageCage> cagelist3=storageCageService.SelectStorageCageByCage(3); + List<StorageCage> cagelist4=storageCageService.SelectStorageCageByCage(4); jsonObject.append("cagelist1", cagelist1); jsonObject.append("cagelist2", cagelist2); jsonObject.append("cagelist3", cagelist3); @@ -116,9 +116,16 @@ //璇诲彇DB105鍖烘枃浠� PlcParameterObject plcmes=PLCAutoMes.PlcMesObject; - //String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰 - //double width=plcmes.getPlcParameter("Height").getValue();//瀹� - //double height=plcmes.getPlcParameter("width").getValue();//楂� + // 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=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)+""; + //鑾峰彇娴嬮噺鐨勯暱锛屽 @@ -131,15 +138,27 @@ - String PlcRequest = "1"; - double width = 402; - double height = 402; + // String PlcRequest = "1"; + // String MesSend = "0"; + // double width = 402; + // double height = 402; //鍖归厤 - if ("1".equals(PlcRequest)) { - GlassInfo MesureGlassinfo=HomeService.Normal(width, height, "1"); - - + //System.err.println(PlcRequest+","+MesSend+","+width+","+height); + if ("0".equals(PlcRequest)) { + 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) { + // 娴嬮噺鎴愬姛 + S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1); + + }else{ + // 閲嶆柊娴嬮噺 + S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 4); + } + } Queue LastQueue= QueueMapper.selectLastQueue(); // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16)); @@ -158,7 +177,7 @@ List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1); jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut); - //鏌ヨ褰撳墠璁㈠崟浠诲姟 + // //鏌ヨ褰撳墠璁㈠崟浠诲姟 List<FlowCard> OrderTask = storageCageService.SelectOrderTask(); jsonObject.append("OrderTask", OrderTask); -- Gitblit v1.8.0