Albania_Mes-ui/src/views/home/index.vue
@@ -253,18 +253,18 @@ </div> <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;"> <el-button type="primary" @click="showform(1)" :disabled="SoftEmergencyStopState" :class="SoftEmergencyStopState == true ? 'hide' : ''"> :class="SoftEmergencyStopState == true ? 'hide' : ''" style="z-index: 999;"> {{ $t('Import order') }}</el-button> <el-button type="primary" @click="showform(2)" :disabled="SoftEmergencyStopState" :class="SoftEmergencyStopState == true ? 'hide' : ''"> :class="SoftEmergencyStopState == true ? 'hide' : ''" style="z-index: 999;"> {{ $t('Measure') }}</el-button> <el-button type="primary" @click="showform(3)" :disabled="SoftEmergencyStopState" :class="SoftEmergencyStopState == true ? 'hide' : ''"> :class="SoftEmergencyStopState == true ? 'hide' : ''" style="z-index: 999;"> {{ $t('StorageCage') }}</el-button> <el-button type="primary" @click="showform(4)" :disabled="SoftEmergencyStopState" :class="SoftEmergencyStopState == true ? 'hide' : ''"> :class="SoftEmergencyStopState == true ? 'hide' : ''" style="z-index: 999;"> {{ $t('Task queue') }}</el-button> </div> <div style="display: flex;align-items: center;"> springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -144,27 +144,9 @@ 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("未找到符合的数据"); } boolean Result=HomeService.Normal(width, height, "1"); } // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16)); // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14)); springboot-vue3/src/main/java/com/example/springboot/entity/GlassInfo.java
@@ -20,4 +20,5 @@ private Double thickness;// 厚 private Integer number;// 数量 private Integer finishnumber;// 完成数量 private Integer measurenumber;// 测量完成数量 } springboot-vue3/src/main/java/com/example/springboot/entity/glassinfo.java
@@ -20,4 +20,5 @@ private Double thickness;// 厚 private Integer number;// 数量 private Integer finishnumber;// 完成数量 private Integer measurenumber;// 测量完成数量 } springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
@@ -15,15 +15,15 @@ @Repository public interface GlassInfoMapper extends BaseMapper<GlassInfo> { @Select("SELECT * FROM glassinfo where width<=#{maxwidth} and width>=#{minwidth} and height<=#{maxheight} and height>=#{minheight}") @Select("SELECT * FROM glassinfo where width<=#{maxwidth} and width>=#{minwidth} and height<=#{maxheight} and height>=#{minheight} and measurenumber<number") List<GlassInfo> selectGlassInfos(@Param("maxwidth") double maxwidth, @Param("minwidth") double minwidth, @Param("maxheight") double maxheight, @Param("minheight") double minheight); // @Select("SELECT COUNT(*) FROM role_permission WHERE role_id = #{roleId} AND permission_id = #{permissionId}") // boolean checkExists(@Param("roleId") int roleId, @Param("permissionId") int permissionId); // @Update("UPDATE role_permission SET state = #{state} WHERE role_id = #{roleId} AND permission_id = #{permissionId}") // void updateState(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state); @Update("UPDATE glassinfo SET measurenumber = measurenumber+1 WHERE id = #{id}") void updatemeasurenumber(@Param("id") int roleId); // @Insert("INSERT INTO role_permission (role_id, permission_id, state) VALUES (#{roleId}, #{permissionId}, #{state})") // void insert(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state); springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
@@ -61,64 +61,90 @@ return Results; } //Execl表格 传入文件路径 // 匹配逻辑 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 { // 创建文件对象 File file = new File(filename); // 创建文件输入流对象 FileInputStream inputStream = new FileInputStream(file); // 创建工作簿对象 Workbook workbook = WorkbookFactory.create(inputStream); // 获取第一个工作表对象 Sheet sheet = workbook.getSheetAt(0); // 创建一个实体类集合，用于存储Excel数据 List Results=new ArrayList(); int i=0; // 遍历行 for (Row row : sheet) { // 遍历单元格 List ResultRow=new ArrayList(); //System.out.println(); for (Cell cell : row) { String LastCellvalue=""; // 判断单元格类型是否为公式类型 if (cell.getCellType() == CellType.FORMULA) { // 使用公式计算器计算单元格的值 FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator(); CellValue cellValue = evaluator.evaluate(cell); // 计算后的单元格值 LastCellvalue=cellValue.getNumberValue()+""; }else if(cell.getCellType() == CellType.NUMERIC){ double value = cell.getNumericCellValue(); if (value%1==0) { LastCellvalue=Math.round(value)+""; }else{ LastCellvalue=value+""; // 创建文件对象 File file = new File(filename); // 创建文件输入流对象 FileInputStream inputStream = new FileInputStream(file); // 创建工作簿对象 Workbook workbook = WorkbookFactory.create(inputStream); // 获取第一个工作表对象 Sheet sheet = workbook.getSheetAt(0); // 创建一个实体类集合，用于存储Excel数据 List Results = new ArrayList(); int i = 0; // 遍历行 for (Row row : sheet) { // 遍历单元格 List ResultRow = new ArrayList(); // System.out.println(); for (Cell cell : row) { String LastCellvalue = ""; // 判断单元格类型是否为公式类型 if (cell.getCellType() == CellType.FORMULA) { // 使用公式计算器计算单元格的值 FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator(); CellValue cellValue = evaluator.evaluate(cell); // 计算后的单元格值 LastCellvalue = cellValue.getNumberValue() + ""; } else if (cell.getCellType() == CellType.NUMERIC) { double value = cell.getNumericCellValue(); if (value % 1 == 0) { LastCellvalue = Math.round(value) + ""; } else { LastCellvalue = value + ""; } } else { // 单元格值 LastCellvalue = cell.toString(); } } else { // 单元格值 LastCellvalue=cell.toString(); ResultRow.add(LastCellvalue); // System.out.print(LastCellvalue+" "); } ResultRow.add(LastCellvalue); //System.out.print(LastCellvalue+" "); Results.add(ResultRow); i++; } Results.add(ResultRow); i++; } System.out.println(i); // 关闭工作簿和输入流对象 workbook.close(); inputStream.close(); return Results; System.out.println(i); // 关闭工作簿和输入流对象 workbook.close(); inputStream.close(); return Results; } catch (Exception e) { // TODO: handle exception System.out.println("异常"); return new ArrayList(); } } } }
