From eb87cabfb1b88e0c1bd7ebf091eef5369c7729ad Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 19 三月 2024 11:46:16 +0800
Subject: [PATCH] 文件导入功能+页面
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 684d234..b5693e4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -120,20 +120,11 @@
//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));
// }
@@ -146,12 +137,15 @@
//鍖归厤
if ("1".equals(PlcRequest)) {
- boolean Result=HomeService.Normal(width, height, "1");
+ 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);
--
Gitblit v1.8.0