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 | 89 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 80 insertions(+), 9 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 0292e94..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,25 +3,40 @@
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;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.entity.device.PlcParameterObject;
import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.mapper.GlassInfoMapper;
+import com.example.springboot.mapper.MeasureSettingMapper;
+import com.example.springboot.mapper.QueueMapper;
import com.example.springboot.mapper.SpianMapper;
public class Plchome extends Thread {
@Autowired
private HomeMapper homeMapper;
+ @Autowired
+ private HomeService HomeService;
+ private QueueMapper QueueMapper;
+ private GlassInfoMapper GlassInfoMapper;
+ private MeasureSettingMapper MeasureSettingMapper;
private OutSliceServive outSliceServive;
private SpianMapper spianMapper;
private SpianService spianService;
+
// 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
public static Boolean isAllowQueue = true;
public static Boolean isAllowReordering = true;
@@ -53,6 +68,8 @@
try {
Thread.sleep(1000);
// 娉ㄥ叆mapper
+ HomeService = WebSocketServer.applicationContext.getBean(HomeService.class);
+ QueueMapper = WebSocketServer.applicationContext.getBean(QueueMapper.class);
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
@@ -60,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);
@@ -80,7 +97,6 @@
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
-
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
@@ -96,9 +112,64 @@
// 鏌ヨ褰撳墠閾濇淇℃伅
Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
jsonObject.append("CurrentFrame", CurrentFrame);
+
+ // //璇诲彇DB105鍖烘枃浠�
+ // PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+
+ // 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;
+
+ //鍖归厤
+ //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);
+ }
+ jsonObject.append("LastQueue", LastQueue);
+ }
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
+
//鏌ヨ鐞嗙墖绗间俊鎭�
List<StorageCage> StorageCageInfo = storageCageService.SelectStorageCageInfo();
@@ -112,8 +183,8 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
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