阿尔巴尼亚项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
严智鑫
2024-03-22 814323aa300f65154c299a9f3b1c44aa6cb5e9c6 
 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);


@@ -117,23 +117,15 @@


                PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;


      


                //String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//请求


                //String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//发送


                //double width=plcmes.getPlcParameter("Height").getValue();//宽


                //double height=plcmes.getPlcParameter("width").getValue();//高


                //获取测量的长，宽


                String url="C:\\Users\\SNG-ZDH-012\\Desktop\\阿尔巴尼亚数据要求.xlsx";


                //List typecount= HomeService.ReadExecl2(s);


                // List xiaopian=HomeService.ReadExecl2(s);


                // //xiaopian   NG1{A:10,B20}   NG2{A:5,B5}


                // for(Object C:xiaopian){


                //     //看层数


                // }




                // for(int i=0;i<result.size();i++){


                //     System.out.println(result.get(i));


                // }






                //List result= HomeService.ReadExecl(url);


                


                


                //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));


                // }


@@ -141,35 +133,19 @@






                String PlcRequest = "1";


                String MesSend = "0";


                double width = 402;


                double height = 402;


                


                //获取匹配设置


                if ("1".equals(PlcRequest)) {


                    List<GlassInfo> Result=HomeService.NormalGlassInfo(width, height, "1");


                    if(Result.size()==1){


                        //匹配成功  就一种类型  添加数据


                        GlassInfo GlassInfo=Result.get(0);


                        QueueMapper.insert(GlassInfo.getGlassid(),width,height,1);


                        System.out.println("匹配成功");


                        //S7control.getinstance().WriteWord(plcmes.getPlcParameter("GaToMES").getAddress(), (short) 1);


                        System.out.println(GlassInfo.getGlassid());


                    }else if(Result.size()>1){


                        //匹配失败 匹配到多条符合的数据  添加数据


                        QueueMapper.insert(null,width,height,2);


                        System.out.println("匹配失败");


                    }


                    else{


                        //匹配失败 未找到符合的数据 添加数据


                        QueueMapper.insert(null,width,height,3);


                        System.out.println("未找到符合的数据");


                    }


                    


                //匹配


                if ("1".equals(PlcRequest)&&"0".equals(PlcRequest)) {


                    GlassInfo MesureGlassinfo=HomeService.Normal(width, height, "1");


                }


                Queue LastQueue= QueueMapper.selectLastQueue();


                // 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);