From 49ba681f1478c522c375525146e0ac79b1fbf88b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 26 一月 2024 11:20:33 +0800
Subject: [PATCH] 代码测试更新
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 38 ++--
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 34 ++--
CanadaMes-ui/src/views/home/index.vue | 10 +
CanadaMes-ui/src/configuration/ManualJog.json | 4
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 32 ++--
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 277 ++++++++++++++++++++-------------------
6 files changed, 206 insertions(+), 189 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ManualJog.json b/CanadaMes-ui/src/configuration/ManualJog.json
index 40c659a..07ee2fa 100644
--- a/CanadaMes-ui/src/configuration/ManualJog.json
+++ b/CanadaMes-ui/src/configuration/ManualJog.json
@@ -274,7 +274,7 @@
[
{
"button": {
- "name": "A01琛岃蛋浼烘湇鍥為浂",
+ "name": "A01鍘熺偣璁板繂",
"value": 0,
"value2": 0,
"address": "DB10.0",
@@ -284,7 +284,7 @@
},
{
"button": {
- "name": "A02琛岃蛋浼烘湇鍥為浂",
+ "name": "A02鍘熺偣璁板繂",
"value": 0,
"value2": 0,
"address": "DB10.0",
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 2f3fa0f..302a3d5 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -201,18 +201,18 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
- setTimeout(() => {
- const reversedData = data.map(values => values.map(value => {
- return (!value || value === 1) ? 0 : 0 ;
- }));
+ // setTimeout(() => {
+ // const reversedData = data.map(values => values.map(value => {
+ // return (!value || value === 1) ? 0 : 0 ;
+ // }));
- const reversedJsonObject = { data: reversedData };
+ // const reversedJsonObject = { data: reversedData };
// 鎻愪氦鏁版嵁鍒板悗绔�
- const reversedJsonString = JSON.stringify(reversedJsonObject);
- console.log('鍙嶈浆鍚�:', reversedJsonString);
- socket?.send(reversedJsonString);
- }, 1000);
+ // const reversedJsonString = JSON.stringify(reversedJsonObject);
+ // console.log('鍙嶈浆鍚�:', reversedJsonString);
+ // socket?.send(reversedJsonString);
+ // }, 1000);
}
@@ -233,18 +233,18 @@
const jsonString = JSON.stringify(jsonObject);
console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
socket?.send(jsonString);
- setTimeout(() => {
- const reversedData = data.map(values => values.map(value => {
- return (!value || value === 1) ? 0 : 0 ;
- }));
+ // setTimeout(() => {
+ // const reversedData = data.map(values => values.map(value => {
+ // return (!value || value === 1) ? 0 : 0 ;
+ // }));
- const reversedJsonObject = { data: reversedData };
+ // const reversedJsonObject = { data: reversedData };
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const reversedJsonString = JSON.stringify(reversedJsonObject);
- console.log('鍙嶈浆鍚�:', reversedJsonString);
- socket?.send(reversedJsonString);
- }, 1000);
+ // // 鎻愪氦鏁版嵁鍒板悗绔�
+ // const reversedJsonString = JSON.stringify(reversedJsonObject);
+ // console.log('鍙嶈浆鍚�:', reversedJsonString);
+ // socket?.send(reversedJsonString);
+ // }, 1000);
}
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 14792be..7622122 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -1045,6 +1045,15 @@
}
}
+ //鏍规嵁杩涚墖鐘舵�佸嚭鍙戣繘鐗囦换鍔�
+ if (obj.FeedState != null) {
+ if (obj.FeedState[0] == true) {
+ this.InsertQueueGlass(1);
+ }
+ }
+
+
+
// if (obj.alarmmg[0].length > 0) {
// if (this.alarm.length > 0) {
// if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length - 1].id) {
@@ -1104,6 +1113,7 @@
//鏄惁闇�瑕佹墜鍔ㄧ‘璁や笂鐗�
this.isConfirm = obj.isConfirm[0];
+
//鎵爜浣嶇幓鐠冧俊鎭�
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
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 d178723..cdbb124 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
@@ -7,7 +7,9 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.example.springboot.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -123,162 +125,169 @@
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
- if (S7control.getinstance().CheckConnected() == true) {
+ // if (S7control.getinstance().CheckConnected() == true) {
- // 閾濇绾夸氦浜�
- if (S7controlLK.getinstance().CheckConnected() == true) {
- if (CurrentFrame != null) {
- S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
- }
- String E01id = S7controlLK.getinstance().readStrings("DB17.0");
- String J01id = S7controlLK.getinstance().readStrings("DB17.22");
-
- List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
- List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
- Short framerequest = liststate.get(0);
- if (framerequest == 1) {
- // 閾濇id
- String position;
- try {
- position = dbserve.SelectPositionByFrameBarcode(J01id);
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- position = "0";
- e.printStackTrace();
- }
- Short send;
- if (position.equals("0")) {
- send = 0;
- } else {
- send = 1;
- }
- S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
- }
+ // 閾濇绾夸氦浜�
+ if (S7controlLK.getinstance().CheckConnected() == true) {
+ if (CurrentFrame != null) {
+ S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
}
+ String E01id = S7controlLK.getinstance().readStrings("DB17.0");
+ String J01id = S7controlLK.getinstance().readStrings("DB17.22");
- // 鑾峰彇褰撳墠鎵爜鏂瑰紡
- List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
- if (Scanningmethods != null) {
- for (Boolean Scanningmethod : Scanningmethods) {
- jsonObject.append("Scanningmethod", Scanningmethod);
- }
- }
- // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
- String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
- jsonObject.append("CurrrentGlassId", CurrrentGlassId);
-
- // 鑾峰彇D01-D06,A01,A02,B01,B02鐘舵��
- List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
- jsonObject.append("DeviceList", DeviceList);
- // 鑾峰彇D01-D06,A01,A02,B01,B02鐜荤拑id
- List<String> GlassIdList = new ArrayList<String>();
- GlassIdList.add(spianService.queGlassid("DB103.44", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
-
- GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.212", 14).toString());
-
- GlassIdList.add(spianService.queGlassid("DB103.128", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.142", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.156", 14).toString());
-
- GlassIdList.add(spianService.queGlassid("DB103.72", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.86", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.100", 14).toString());
- GlassIdList.add(spianService.queGlassid("DB103.114", 14).toString());
- jsonObject.append("GlassIdList", GlassIdList);
-
- // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
- List<String> addressList = new ArrayList<String>();
- addressList.add("DB106.12");
- addressList.add("DB106.0");
- List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
- if (paramlist != null) {
- jsonObject.append("params", paramlist);
- }
- // 鑾峰彇杩涚墖杞︾姸鎬�
- List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
- 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- if (datas1ListState != null) {
- boolean exist1 = datas1ListState.contains((short) 0);
- jsonObject.append("zhuangtai", exist1);
- }
-
- // 鑾峰彇杩涚墖鐜荤拑淇℃伅
- List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
- if (inglassInfo != null) {
- if (inglassInfo.size() > 0) {
- jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
- }
- }
- // // 鑾峰彇閾濇idDB106.DBW64锛屾坊鍔犲埌鍑虹墖闃熷垪
- // String frameno="X21763329601FB";
- String frameno = spianService.queGlassid("DB103.270", 14).toString();
- if (!frameno.equals(Plchome.FrameNo)) {
- Plchome.FrameNo = frameno;
+ List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
+ List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
+ Short framerequest = liststate.get(0);
+ if (framerequest == 1) {
+ // 閾濇id
+ String position;
try {
- Short num = 0;
- List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
- .SelectAluminumFrameInfoById(Plchome.FrameNo);
- for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
- if (north_glass_buffer1.getstorageCage() == null) {
- break;
- }
- num++;
- }
- if (num == north_glass_buffer1s.size()) {
- north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
- } else {
- Plchome.AluminumFrame = north_glass_buffer1s;
- }
+ position = dbserve.SelectPositionByFrameBarcode(J01id);
} catch (SQLException e) {
// TODO Auto-generated catch block
+ position = "0";
e.printStackTrace();
}
+ Short send;
+ if (position.equals("0")) {
+ send = 0;
+ } else {
+ send = 1;
+ }
+ S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
}
- if (AluminumFrame != null) {
- jsonObject.append("AluminumFrame", AluminumFrame);
- }
+ }
- // 澶嶄綅鍊掕鏃�
- // 鍦板潃104.9.6
- List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
- for (Boolean countdowns : countdown) {
- jsonObject.append("countdown", countdowns);
+ // 鑾峰彇褰撳墠鎵爜鏂瑰紡
+ List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
+ if (Scanningmethods != null) {
+ for (Boolean Scanningmethod : Scanningmethods) {
+ jsonObject.append("Scanningmethod", Scanningmethod);
}
- // jsonObject.append("countdown", true);
- // 澶嶄綅瀹屾垚淇″彿ss
- List<Boolean> resetss = S7control.getinstance().ReadBits("DB103.284", 1);
- for (Boolean reset : resetss) {
- jsonObject.append("reset", reset);
- }
+ }
+ // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
+ String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
+ jsonObject.append("CurrrentGlassId", CurrrentGlassId);
- // 鏄惁鎬ュ仠
- List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
- for (Boolean emergencystop : emergencystops) {
- jsonObject.append("emergencystop", emergencystop);
- }
- // 鑾峰彇杩涚墖璇锋眰鐘舵��
- List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
- boolean D01RequestState = D01Request.contains((short) 1);
- jsonObject.append("D01RequestState", D01RequestState);
+ // 鑾峰彇D01-D06,A01,A02,B01,B02鐘舵��
+ List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
+ jsonObject.append("DeviceList", DeviceList);
+ // 鑾峰彇D01-D06,A01,A02,B01,B02鐜荤拑id
+ List<String> GlassIdList = new ArrayList<String>();
+ GlassIdList.add(spianService.queGlassid("DB103.44", 14).toString());
+ GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
- // 鑾峰彇杩涚墖鍙戦�佺姸鎬�
- List<Short> D01respnse = S7control.getinstance().ReadWord("DB106.16", 1);
- boolean D01ResponseState = D01respnse.contains((short) 1);
- // jsonObject.append("D01RequestState", D01RequestState);
- // 鑷姩杩涚墖
+ GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
+ GlassIdList.add(spianService.queGlassid("DB103.212", 14).toString());
+
+ GlassIdList.add(spianService.queGlassid("DB103.128", 14).toString());
+ GlassIdList.add(spianService.queGlassid("DB103.142", 14).toString());
+ GlassIdList.add(spianService.queGlassid("DB103.156", 14).toString());
+
+ GlassIdList.add(spianService.queGlassid("DB103.72", 14).toString());
+ GlassIdList.add(spianService.queGlassid("DB103.86", 14).toString());
+ GlassIdList.add(spianService.queGlassid("DB103.100", 14).toString());
+ GlassIdList.add(spianService.queGlassid("DB103.114", 14).toString());
+ jsonObject.append("GlassIdList", GlassIdList);
+
+ // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ List<String> addressList = new ArrayList<String>();
+ addressList.add("DB106.12");
+ addressList.add("DB106.0");
+ List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
+ if (paramlist != null) {
+ jsonObject.append("params", paramlist);
+ }
+ // 鑾峰彇杩涚墖杞︾姸鎬�
+ List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
+ 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ if (datas1ListState != null) {
+ boolean exist1 = datas1ListState.contains((short) 0);
+ jsonObject.append("zhuangtai", exist1);
+ }
+
+ // 鑾峰彇杩涚墖鐜荤拑淇℃伅
+ List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
+ if (inglassInfo != null) {
+ if (inglassInfo.size() > 0) {
+ jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
+ }
+ }
+ // // 鑾峰彇閾濇idDB106.DBW64锛屾坊鍔犲埌鍑虹墖闃熷垪
+ // String frameno="X21763329601FB";
+ String frameno = spianService.queGlassid("DB103.270", 14).toString();
+ if (!frameno.equals(Plchome.FrameNo)) {
+ Plchome.FrameNo = frameno;
+ try {
+ Short num = 0;
+ List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
+ .SelectAluminumFrameInfoById(Plchome.FrameNo);
+ for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
+ if (north_glass_buffer1.getstorageCage() == null) {
+ break;
+ }
+ num++;
+ }
+ if (num == north_glass_buffer1s.size()) {
+ north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ } else {
+ Plchome.AluminumFrame = north_glass_buffer1s;
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ if (AluminumFrame != null) {
+ jsonObject.append("AluminumFrame", AluminumFrame);
+ }
+
+ // 澶嶄綅鍊掕鏃�
+ // 鍦板潃104.9.6
+ List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
+ for (Boolean countdowns : countdown) {
+ jsonObject.append("countdown", countdowns);
+ }
+ // jsonObject.append("countdown", true);
+ // 澶嶄綅瀹屾垚淇″彿ss
+ List<Boolean> resetss = S7control.getinstance().ReadBits("DB103.284", 1);
+ for (Boolean reset : resetss) {
+ jsonObject.append("reset", reset);
+ }
+
+ // 鏄惁鎬ュ仠
+ List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
+ for (Boolean emergencystop : emergencystops) {
+ jsonObject.append("emergencystop", emergencystop);
+ }
+ // 鑾峰彇杩涚墖璇锋眰鐘舵��
+ List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
+ boolean D01RequestState = D01Request.contains((short) 1);
+ jsonObject.append("D01RequestState", D01RequestState);
+
+ // 鑾峰彇杩涚墖鍙戦�佺姸鎬�
+ List<Short> D01respnse = S7control.getinstance().ReadWord("DB106.16", 1);
+ boolean D01ResponseState = D01respnse.contains((short) 1);
+ // jsonObject.append("D01RequestState", D01RequestState);
+ // 鑷姩杩涚墖
+ isConfirm=true;
+ if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {
if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390 || form3.getglassheight() > 1810
|| form3.getglasswidth() > 2760)
|| (form3.getglassheight() < 390 || form3.getglasswidth() < 380
|| form3.getglassheight() > 2760 || form3.getglasswidth() > 1810)) {
-
- if (isConfirm == true && D01RequestState == true && D01ResponseState == false) {
+ FeedState = true;
+ jsonObject.append("FeedState", FeedState);
+ FeedState = false;
+ } else {
+ if (D01RequestState == true && D01ResponseState != true) {
storageCageService.InsertQueueGlassId((short) 1, form3);
}
}
}
+ // }
+
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 87ee534..c635fa0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,29 +17,29 @@
//
System.out.println("鍚姩瀹屾垚");
- new PlcHold().start();
+ // new PlcHold().start();
- new Plchome().start();
- new PlcLayout().start();
- new Plcalarm().start();
+ // new Plchome().start();
+ new PlcLayout().start();
+ new Plcalarm().start();
- new Plcsign().start();
+ new Plcsign().start();
- new Plcstate().start();
- new PlcPositioning1().start();
+ new Plcstate().start();
+ new PlcPositioning1().start();
- new PlcParameter2().start();
+ new PlcParameter2().start();
- new PLCAutomaticParameterSetting().start();
+ new PLCAutomaticParameterSetting().start();
- new PlcManualonePosition().start();
- new PlcManualonePosition2().start();
- new PlcServoManualone().start();
- new PLCManualJog().start();
- new Plclog().start();
+ new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
+ new PlcServoManualone().start();
+ new PLCManualJog().start();
+ new Plclog().start();
- new PlcInteractionState().start();
+ new PlcInteractionState().start();
//new PlcParameter1Review().start();
- // new PLCAutomaticParameterSettingReview2().start();
+ // new PLCAutomaticParameterSettingReview().start();
}
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index cbbb948..df711b9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -181,25 +181,23 @@
public Result InsertQueueGlassId(Short id, Queue queue) {
Map<String, Object> map = new HashMap<>();
- if (Plchome.FeedState == false) {
- Plchome.FeedState = true;
- Short zhi = 200;
- short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
- if (result > 0) {
- map.put("message", "300");
- } else {
- if (id == 1) {
- // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
- zhi = spianService.selectAll(queue.getglassId());
- if (zhi == 200) {
- homeMapper.InsertQueueGlassId(queue, id);
- }
- }
- map.put("message", zhi);
- }
- Plchome.FeedState = false;
+
+ Short zhi = 200;
+ short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
+ if (result > 0) {
+ map.put("message", "300");
} else {
- map.put("message", 200);
+ if (id == 1) {
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ zhi = spianService.selectAll(queue.getglassId());
+ if (zhi == 200) {
+ homeMapper.InsertQueueGlassId(queue, id);
+ }
+ }
+ map.put("message", zhi);
+ }
+ if (zhi != 200) {
+ Plchome.FeedState = true;
}
return Result.success(map);
}
--
Gitblit v1.8.0