From 6b8b4e4dc8a12695d51ce40f04297f2fcb2bf657 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:24:31 +0800
Subject: [PATCH] 更新
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 93 +++++++++++++++++++++++++++++-----------------
1 files changed, 58 insertions(+), 35 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 dd6b213..518dd87 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,6 +3,8 @@
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;
@@ -75,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);
@@ -111,38 +113,59 @@
Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
jsonObject.append("CurrentFrame", CurrentFrame);
- //璇诲彇DB105鍖烘枃浠�
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ // //璇诲彇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 = "1";
- double width = 402;
- double height = 402;
+ // String PlcRequest=plcmes.getPlcParameter("GaToMES").getValue();//璇锋眰
+ // String MesSend=plcmes.getPlcParameter("MESToGaStatus").getValue();//鍙戦��
+ // double width=Double.valueOf(plcmes.getPlcParameter("width").getValue());//瀹�
+ // double height=Double.valueOf(plcmes.getPlcParameter("Height").getValue());//楂�
+
+ // String PlcRequest=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
+ // double width=Double.parseDouble(S7control.getinstance().ReadWord("DB14.28", 1).get(0)+"");
+ // double height=Double.parseDouble(S7control.getinstance().ReadWord("DB14.30", 1).get(0)+"");
+ // String MesSend=S7control.getinstance().ReadWord("DB14.170", 1).get(0)+"";
+
+ //鑾峰彇娴嬮噺鐨勯暱锛屽
+ boolean istest = true;
+ // String PlcRequest = "1";
+ // String MesSend = "0";
+ // double width = 516;
+ // double height = 507;
- //鑾峰彇鍖归厤璁剧疆
- 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("鍖归厤澶辫触");
+ //鍖归厤
+ //System.err.println(PlcRequest+","+MesSend+","+width+","+height);
+ // if ("0".equals(PlcRequest)&&istest) {
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 0);
+ // }
+ // if ("1".equals(PlcRequest)&&"0".equals(MesSend)) {
+ // boolean is=HomeService.Normal(width, height, "1");
+ // if (is&&istest) {
+ // // 娴嬮噺鎴愬姛
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
+
+ // }else if(istest){
+ // // 閲嶆柊娴嬮噺
+ // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 4);
+ // }
+
+ // }
+ //S7control.getinstance().WriteWord("DB14.170", (short)0);
+ Queue LastQueue= QueueMapper.selectLastQueue();
+ if(LastQueue==null){
+ Queue nullQueue=new Queue();
+ nullQueue.setglassId("");
+ nullQueue.setglassheight(0);
+ nullQueue.setglasswidth(0);
+ nullQueue.setglassheightmm(0);
+ nullQueue.setglasswidthmm(0);
+ jsonObject.append("LastQueue", nullQueue);
+ }else{
+ if (LastQueue.getstate()<1) {
+ LastQueue.setglasswidth(0);
+ LastQueue.setglassheight(0);
}
- else{
- //鍖归厤澶辫触 鏈壘鍒扮鍚堢殑鏁版嵁 娣诲姞鏁版嵁
- QueueMapper.insert(null,width,height,3);
- System.out.println("鏈壘鍒扮鍚堢殑鏁版嵁");
- }
-
+ jsonObject.append("LastQueue", LastQueue);
}
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
@@ -160,7 +183,7 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
- //鏌ヨ褰撳墠璁㈠崟浠诲姟
+ // //鏌ヨ褰撳墠璁㈠崟浠诲姟
List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
jsonObject.append("OrderTask", OrderTask);
--
Gitblit v1.8.0