From e76f203f76b934d2f49dcea89649b2f616878056 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 18 三月 2024 12:36:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java | 122 ++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 48 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java b/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
index dda7048..4842b26 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/HomeService.java
+++ b/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);
- // 鍒涘缓涓�涓疄浣撶被闆嗗悎锛岀敤浜庡瓨鍌‥xcel鏁版嵁
-
- 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);
+ // 鍒涘缓涓�涓疄浣撶被闆嗗悎锛岀敤浜庡瓨鍌‥xcel鏁版嵁
+
+ 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();
}
-
- }
+ }
}
--
Gitblit v1.8.0