From 147e949e6ed8bb2c6cd68bd2fcc518405fd38d34 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 11 五月 2024 08:42:39 +0800
Subject: [PATCH] 拉取最新代码
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 117 ++++++++++++++++++++++++++++------------------------------
1 files changed, 56 insertions(+), 61 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 f332474..f663b3c 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
@@ -1,5 +1,4 @@
package com.example.springboot.component;
-
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
@@ -32,8 +31,12 @@
@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;
@@ -58,9 +61,6 @@
// public static Map b=new HashMap<>();
// b.put()
- public double carstart = 200;
- public double carend = 20000;
-
@Override
public void run() {
while (this != null) {
@@ -68,28 +68,22 @@
try {
Thread.sleep(1000);
// 娉ㄥ叆mapper
- HomeService = WebSocketServer.applicationContext.getBean(HomeService.class);
- QueueMapper = WebSocketServer.applicationContext.getBean(QueueMapper.class);
+ 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);
outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
- // 鑾峰彇鍏惰溅鐨勪綅缃�
- if (S7control.getinstance().CheckConnected() == true) {
- double carposition = 0;
- float car = S7control.getinstance().readFloat32("DB10.1992");
- carposition = (-40 + (car / (carend - carstart) * 595));
- jsonObject.append("carposition", carposition);
- }
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAlls();
jsonObject.append("tableData", tableData);
-
// 鏍肩悊鐗囩鏍煎瓙鐘舵��
- List<StorageCage> cagelist1 = storageCageService.SelectStorageCageByCage(1);
- List<StorageCage> cagelist2 = storageCageService.SelectStorageCageByCage(2);
- List<StorageCage> cagelist3 = storageCageService.SelectStorageCageByCage(3);
- List<StorageCage> cagelist4 = storageCageService.SelectStorageCageByCage(4);
+ 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);
@@ -103,6 +97,7 @@
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
jsonObject.append("alarmmg", alarmmg);
+
// 鑾峰彇鍑虹墖闃熷垪淇℃伅
List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
jsonObject.append("listoutslice", listoutslice);
@@ -117,57 +112,56 @@
// 鏌ヨ褰撳墠閾濇淇℃伅
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());//楂�
- // 璇诲彇DB105鍖烘枃浠�
- PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
- // if(plcmes.==null){
+ // 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;
+ //鑾峰彇娴嬮噺鐨勯暱锛屽
+ boolean istest = true;
// String PlcRequest = "1";
// String MesSend = "0";
- // double width = 0;
- // double height = 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);
- // 鍖归厤
- // System.err.println(PlcRequest+","+MesSend+","+width+","+height);
- // 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());// 楂�
- // 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);
+ }
- // } 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();
+ }
+ //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) {
+ }else{
+ if (LastQueue.getstate()<1) {
LastQueue.setglasswidth(0);
LastQueue.setglassheight(0);
}
@@ -176,15 +170,16 @@
// 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();
jsonObject.append("StorageCageInfo", StorageCageInfo);
- // 鏌ヨ褰撳墠杩涚墖浠诲姟
+ //鏌ヨ褰撳墠杩涚墖浠诲姟
List<StorageTask> StoragTaskeTaskFeed = storageCageService.SelectStorageTask(0);
jsonObject.append("StoragTaskeTaskFeed", StoragTaskeTaskFeed);
- // 鏌ヨ褰撳墠鍑虹墖浠诲姟
+ //鏌ヨ褰撳墠鍑虹墖浠诲姟
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
--
Gitblit v1.8.0