更新

严智鑫

2024-03-18 a65b82e86951db8540d38141715be2444b12dc99

 springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java

@@ -61,6 +61,33 @@
        return Results;
    }

    // 匹配逻辑
    public boolean Normal(double width, double height, String line) {
        List<GlassInfo> Result = NormalGlassInfo(width, height, "1");
        if (Result.size() == 1) {
            // 匹配成功 就一种类型 添加数据
            GlassInfo GlassInfo = Result.get(0);
            QueueMapper.insert(GlassInfo.getGlassid(), width, height, 1);
            GlassInfoMapper.updatemeasurenumber(GlassInfo.getId());
            System.out.println("匹配成功");
            
            // S7control.getinstance().WriteWord(plcmes.getPlcParameter("GaToMES").getAddress(),
            // (short) 1);
            System.out.println(GlassInfo.getGlassid());
            return true;
        } else if (Result.size() > 1) {
            // 匹配失败 匹配到多条符合的数据 添加数据
            QueueMapper.insert(null, width, height, 2);
            System.out.println("匹配失败");
            return false;
        } else {
            // 匹配失败 未找到符合的数据 添加数据
            QueueMapper.insert(null, width, height, 3);
            System.out.println("未找到符合的数据");
            return false;
        }
    }

    //Execl表格 传入文件路径  
    public List ReadExecl(String filename) {
        try {
@@ -119,6 +146,5 @@
        }
       
    }


}