修改主页面

ZengTao

2024-03-18 5a427c9d36d3712ec6185e14637cb8b4d0183fe8

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -3,8 +3,12 @@
import java.util.ArrayList;
import java.util.List;
import com.example.springboot.service.*;

import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.entity.Flowcard;

import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.FlowCard;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
import com.example.springboot.entity.Out_slice;
@@ -112,36 +116,56 @@
                //读取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 = "1";
                double width = 402;
                double height = 402;
                //String PlcRequest=plcmes.getPlcParameter("GaToMES").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);
                // for(int i=0;i<result.size();i++){
                //     System.out.println(result.get(i));
                // }



                // String PlcRequest = "1";
                // double width = 0;
                // double height = 0;
                
                //获取匹配设置
                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)) {
                //     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("未找到符合的数据");
                //     }
                    
                }
                // }
                // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
                // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));

@@ -159,7 +183,7 @@
                jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);

                //查询当前订单任务
                List<Flowcard> OrderTask = storageCageService.SelectOrderTask();
                List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
                jsonObject.append("OrderTask", OrderTask);

            } catch (InterruptedException e) {