From 1fb67fa712ec8844a6e6215d71dd67c2a935a136 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 22 三月 2024 15:13:10 +0800
Subject: [PATCH] 表格导入：数据处理 （总层数计算）
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 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..2a2322c 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
@@ -77,13 +77,13 @@
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
// 绗煎瓙浣跨敤鎯呭喌
- List<StorageCage> tableData = homeMapper.selectAll();
+ List<StorageCage> tableData = homeMapper.selectAlls();
jsonObject.append("tableData", tableData);
// 鏍肩悊鐗囩鏍煎瓙鐘舵��
- List<StorageCage> cagelist1 = homeMapper.selectRack1();
- List<StorageCage> cagelist2 = homeMapper.selectRack2();
- List<StorageCage> cagelist3 = homeMapper.selectRack3();
- List<StorageCage> cagelist4 = homeMapper.selectRack4();
+ List<StorageCage> cagelist1=storageCageService.SelectStorageCageByCage(1);
+ List<StorageCage> cagelist2=storageCageService.SelectStorageCageByCage(2);
+ List<StorageCage> cagelist3=storageCageService.SelectStorageCageByCage(3);
+ List<StorageCage> cagelist4=storageCageService.SelectStorageCageByCage(4);
jsonObject.append("cagelist1", cagelist1);
jsonObject.append("cagelist2", cagelist2);
jsonObject.append("cagelist3", cagelist3);
@@ -117,23 +117,15 @@
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰
+ //String MesSend=plcmes.getPlcParameter("MESToGaStatus").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);
+
+
+ //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));
// }
@@ -141,17 +133,19 @@
String PlcRequest = "1";
+ String MesSend = "0";
double width = 402;
double height = 402;
//鍖归厤
- if ("1".equals(PlcRequest)) {
- boolean Result=HomeService.Normal(width, height, "1");
+ if ("1".equals(PlcRequest)&&"0".equals(PlcRequest)) {
+ 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