From ef47083c90ff7e70362a32741a0a4d5770037e7f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 三月 2024 10:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 5e1f626..425009b 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
@@ -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,10 +116,30 @@
//璇诲彇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=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 = 402;
double height = 402;
@@ -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) {
--
Gitblit v1.8.0