From 63650b635ac59b24292c584a80a9ad3496a14748 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 12 十二月 2023 09:22:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 82 ++++----
springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java | 98 ++++++++++
CanadaMes-ui/src/lang/locales/en-US.json | 5
springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java | 236 ++++---------------------
springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java | 8
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 19 +
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 37 ++-
CanadaMes-ui/src/lang/locales/zh-CN.json | 5
springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java | 11 +
9 files changed, 240 insertions(+), 261 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 6df08de..3cf47d1 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -327,6 +327,11 @@
"This glass is already in the Queue":"This glass is already in the Queue",
"Complete":"Complete",
"Not Allow":"Not Allow",
+ "Completed":"Completed",
+ "Waiting":"Waiting",
+ "Deleted":"Deleted",
+ "Glass State":"Glass State",
+ "Absent":"Absent",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 5814617..0966dab 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -319,6 +319,11 @@
"This glass is already in the Queue":"姝ょ幓鐠冨凡鍦ㄥ嚭鐗囬槦鍒椾腑",
"Complete":"瀹屾垚",
"Not Allow":"涓嶅厑璁�",
+ "Completed":"宸插畬鎴�",
+ "Waiting":"绛夊緟涓�",
+ "Deleted":"宸插垹闄�",
+ "Glass State":"鐜荤拑鐘舵��",
+ "Absent":"涓嶅瓨鍦�",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 00ecd88..daa8132 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -390,9 +390,9 @@
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
+ <!-- <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"
type="primary">{{
- $t('confirm') }}</el-button>
+ $t('confirm') }}</el-button> -->
<el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"
type="primary">{{
$t('confirm') }}</el-button>
@@ -439,7 +439,7 @@
<el-table-column :min-width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
<el-table-column :min-width="80" prop="listId" :label="$t('List No')"></el-table-column>
<el-table-column :min-width="100" prop="boxId" :label="$t('Box No')"></el-table-column>
- <el-table-column :min-width="90" prop="state" :label="$t('State')">
+ <el-table-column :min-width="90" prop="state" :label="$t('Glass State')">
<template slot-scope='scope'>
{{
scope.row.state == 1 ? $t('Normal') : scope.row.state == 2 ? $t('Entering') : scope.row.state == 3 ?
@@ -454,7 +454,7 @@
</el-table-column>
<el-table-column :min-width="250" :label="$t('Operate')">
<template slot-scope='scope'>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="scope.row.state == 1 ? false : true"
@click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
:disabled="scope.row.state == 1 ? false : true"
@@ -636,34 +636,35 @@
}}</el-button>
<el-table :data="this.OutSlice" :height="700" :span-method="objectSpanMethod" border :cell-style="cellStyle"
style="width: 100%;overflow: auto;">
- <el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <el-table-column :min-width="100" prop="glassId" :label="$t('Barcode')"></el-table-column>
<el-table-column prop="storageCage.orderId" :label="$t('Order No')"></el-table-column>
<el-table-column prop="storageCage.listId" :label="$t('List No')"></el-table-column>
<el-table-column prop="storageCage.boxId" :label="$t('Box No')"></el-table-column>
<el-table-column prop="storageCage.glasswidthmm" :label="$t('Length')"></el-table-column>
<el-table-column prop="storageCage.glassheightmm" :label="$t('Width')"></el-table-column>
- <el-table-column prop="state" :label="$t('State')">
+ <el-table-column prop="state" :label="$t('Glass State')">
<template slot-scope='scope'>
- {{ scope.row.state == 0 ? "Waiting" : scope.row.state == 1 ?"Outing":"Completed" }}
+ {{ scope.row.state == 0 ? $t('Waiting') : scope.row.state == 1 ? $t('Outing') : scope.row.state == 2 ? $t('Completed') :scope.row.state == 3 ? $t('Absent') :$t('Deleted') }}
</template>
</el-table-column>
<el-table-column prop="sequence" :label="$t('Sequence')"></el-table-column>
- <el-table-column prop="position" :label="$t('Position')">
+ <el-table-column prop="position" :label="$t('Position')" style="font-size: 20px;">
<template slot-scope='scope'>
- {{ scope.row.position==1?$t('Yes'):$t('No') }}
+ {{ scope.row.position == 1 ? "鈻勨杽鈻�" : "鈻�" }}
</template>
</el-table-column>
<el-table-column prop="position" :label="$t('Flip')">
<template slot-scope='scope'>
- {{ scope.row.flip==1?$t('Yes'):$t('No') }}
+ {{ scope.row.flip == 1 ? $t('Yes') : $t('No') }}
</template>
</el-table-column>
<el-table-column prop="barcode" :label="$t('Frame No')"></el-table-column>
<el-table-column prop="barcode" :label="$t('Complete')">
<template slot-scope='scope'>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="!isAllowQueue"
- @click="CompleteQueue(scope.row.id,scope.row.barcode,scope.row.glassId)">{{ $t('Complete') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" :disabled="(!isAllowQueue||scope.row.state!=1)"
+ @click="CompleteQueue(scope.row.id, scope.row.barcode, scope.row.glassId)">{{ $t('Complete')
+ }}</el-button>
</template>
</el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
@@ -819,7 +820,7 @@
OutingQueue: true,
OrderInfo: true,
CageDetails: true,
-
+
};
},
created() {
@@ -828,8 +829,8 @@
}
,
methods: {
-
-
+
+
init() {
let viewname = "Home";
if (typeof (WebSocket) == "undefined") {
@@ -1011,7 +1012,6 @@
if (res.data.message == 200) {
this.dialogFormVisible1 = false;
this.$message.success(this.$t('Operation successful'));
-
} else {
this.$message.error(this.$t('There is no glass for this order'));
}
@@ -1310,19 +1310,24 @@
},
//鎵嬪姩涓婄墖
FeedInglassid() {
- Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
- if (this.form.barcode != "") {
+ if (this.form.glassId != ""&&this.form.glassId != null) {
+ Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
this.dialogFormVisible = false;
- } else {
+ }
+ else if (res.data.message == 400) {
+ this.$message.error(this.$t('The glass size is not within the range'));
+ }
+ else if (res.data.message == 300) {
this.$message.error(this.$t('This glass is already in the cage'));
}
- } else {
- this.$message.error(this.$t('There is no such glass'));
- }
+ });
+ } else {
+ this.$message.error(this.$t('There is no such glass'));
+ }
- });
+
},
//鍚敤//鐞嗙墖绗肩鐢�
UpdateDisabled(cage, cell, disabled) {
@@ -1588,19 +1593,20 @@
});
}
,
- cellStyle({ row, column, rowIndex, columnIndex }) {
- // console.log(row, column, "ss");
- column=rowIndex;
- rowIndex=column;
- let style="";
- if (columnIndex === 8&&row.position==1) {
- style="background-Color:yellow;";
- }
- if (columnIndex === 9&&row.flip==1) {
- style="background-Color:yellow;";
- }
- return style;
- }
+ cellStyle({ row, column, rowIndex, columnIndex }) {
+ // console.log(row, column, "ss");
+ column = rowIndex;
+ rowIndex = column;
+ let style = "";
+ if (columnIndex === 8 ) {
+ style = "font-size:25px;";
+ }
+ if (columnIndex === 9 && row.flip == 1) {
+ style = "background-Color:yellow;";
+ }
+ style
+ return style;
+ }
,
//鍚堝苟琛�
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
@@ -1678,8 +1684,8 @@
this.form5 = {};
},
//鎵嬪姩瀹屾垚鍑虹墖浠诲姟
- CompleteQueue(id,frameid,glassid) {
- CompleteQueue(id,frameid,glassid).then(res => {
+ CompleteQueue(id, frameid, glassid) {
+ CompleteQueue(id, frameid, glassid).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java b/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java
new file mode 100644
index 0000000..adde27f
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/MessageHandler.java
@@ -0,0 +1,98 @@
+package com.example.springboot.component;
+import cn.hutool.json.JSONArray;
+import com.example.springboot.component.*;
+import com.google.common.primitives.Bytes;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class MessageHandler {
+ //鍐欏叆byte
+ public void outmesid(String glassid,String address) {
+ //System.out.println("outmesid:" + glassid);
+ List<Byte> glassidlist = new ArrayList();
+ char ds[]=glassid.toCharArray();
+ for (char iditem : ds) {
+ glassidlist.add((byte)iditem);
+ }
+ byte[] bytes = Bytes.toArray(glassidlist);
+ System.out.println("outmesidbytes:" + bytes.length);
+ S7control.getinstance().WriteByte(address, bytes);
+ }
+ //鍐欏叆bit
+ public void writeBitToPLC( JSONArray messageArray,List<String> addresses, int index) {
+ if (messageArray.getJSONArray(index).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(index);
+ List<Boolean> sValue = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue.isEmpty()) {
+ // 杩欓噷鍋囪 S7control.getinstance().WriteBit 鏂规硶鍙互姝ｇ‘鍐欏叆 sValue 鍒板湴鍧�鍒楄〃 addresses
+ S7control.getinstance().WriteBit(addresses, sValue);
+ System.out.println("Values " + sValue + " written to PLC at address " + addresses);
+ }
+ }
+ }
+
+
+
+ //鍐欏叆Word
+ public void WriteWordToPLC( JSONArray messageArray,List<String> addresses, int index) {
+ if (messageArray.getJSONArray(index).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(index);
+ List<Short> sValues = new ArrayList<>();
+
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValues.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+
+ if (!sValues.isEmpty()) {
+ S7control.getinstance().WriteWord(addresses.get(index), sValues);
+ System.out.println("Values " + sValues + " written to PLC at address " + addresses.get(index));
+ }
+ }
+ }
+
+//鍐欏叆String
+ public void writeStringToPLC( JSONArray messageArray, String addresses,int index) {
+ if (messageArray.getJSONArray(index).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(index);
+
+ if (!jsonArray.isEmpty()) {
+ String value = (String) jsonArray.get(0);
+ outmesid(value.trim(), addresses);
+ System.out.println("Value " + value + " written to PLC at address " + addresses);
+ }
+ }
+ }
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
index 3859be2..b3f59ca 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -13,13 +13,18 @@
public class PlcServoManualone extends Thread {
-
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
private Configuration config;
+
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+ MessageHandler customS7Control = new MessageHandler();
+
public PlcServoManualone() throws IOException {
config = new Configuration("config.properties");
}
+//灏嗗竷灏斿垪琛ㄨ浆鎹负浜岃繘鍒剁殑 short 鏁扮粍
public static class PLCBooleanConverter {
public static short[] convertListsToBinaryShortArray(List<Boolean>... lists) {
@@ -59,18 +64,7 @@
}
return writedstrIdOut;
}
-//鍐欏叆id
- public void outmesid(String glassid,String address) {
- //System.out.println("outmesid:" + glassid);
- List<Byte> glassidlist = new ArrayList();
- char ds[]=glassid.toCharArray();
- for (char iditem : ds) {
- glassidlist.add((byte)iditem);
- }
- byte[] bytes = Bytes.toArray(glassidlist);
- System.out.println("outmesidbytes:" + bytes.length);
- S7control.getinstance().WriteByte(address, bytes);
- }
+
@Override
public void run() {
@@ -81,6 +75,8 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
+
+
//A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
List<String> addresses = Arrays.asList(config.getProperty("A01.addresses").split(","));
@@ -134,7 +130,7 @@
StringBuilder queueid1 = queGlassid(inputGlassIdAddress, 14);
// 瀛樼墖id鍦板潃
StringBuilder queueid2 = queGlassid(outputGlassIdAddress, 14);
-
+//A01 A02鍚姩 鍗婅嚜鍔ㄥ惎鍔�
List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
List<Boolean> A01readBstart = S7control.getinstance().readBits(A01Bstart);
@@ -171,7 +167,7 @@
}
-
+//鎵�鏈夋湭鍥為浂鎸夐挳杞崲涓�1鍜�0
List<Boolean> arraylist8 = S7control.getinstance().readBits(addresses8);
short[] params = new short[arraylist8.size()];
for (int i = 0; i < arraylist8.size(); i++) {
@@ -258,201 +254,53 @@
// 鍐欏叆AO1缁勫悎
- if (messageArray.getJSONArray(0).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(0);
- List<Short> sValue = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue.add(val);
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
+ customS7Control.WriteWordToPLC(messageArray, addresses,0);
+ if (A01readstart != null && !A01readstart.isEmpty()) {
+ // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
+ List<Boolean> a01startval = new ArrayList<>();
+ // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
+ for (Boolean bit : A01readstart) {
+ // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
+ a01startval.add(!bit);
}
- if (!sValue.isEmpty()) {
-
- S7control.getinstance().WriteWord(addresses, sValue);
- // 妫�鏌ユ槸鍚﹁鍙栧埌浜嗕綅鍊硷紝骞朵笖鍒楄〃涓嶄负绌�
- if (A01readstart != null && !A01readstart.isEmpty()) {
- // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
- List<Boolean> a01startval = new ArrayList<>();
- // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
- for (Boolean bit : A01readstart) {
- // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
- a01startval.add(!bit);
- }
- // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
- S7control.getinstance().WriteBit(A01start, a01startval);
- }
- System.out.println("Values " + sValue + " written to PLC at address " + addresses);
- }
+ // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
+ S7control.getinstance().WriteBit(A01start, a01startval);
}
- //// 鍐欏叆AO2缁勫悎
- if (messageArray.getJSONArray(1).size() > 0) {
- JSONArray jsonArray2 = messageArray.getJSONArray(1);
- List<Short> sValue2 = new ArrayList<>();
- for (int i = 0; i < jsonArray2.size(); i++) {
- Object value = jsonArray2.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short val = Short.parseShort(cleanedValue.trim());
- sValue2.add(val);
- System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(addresses2, sValue2);
- if (A02readstart != null && !A02readstart.isEmpty()) {
- // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
- List<Boolean> a02startval = new ArrayList<>();
- // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
- for (Boolean bit : A02readstart) {
- // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
- a02startval.add(!bit);
- }
- // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
- S7control.getinstance().WriteBit(A02start, a02startval);
- }
- System.out.println("Values " + sValue2 + " written to PLC at address " + addresses2);
+ // 鍐欏叆AO2缁勫悎
+ customS7Control.WriteWordToPLC(messageArray, addresses2,1);
+
+ if (A02readstart != null && !A02readstart.isEmpty()) {
+ // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
+ List<Boolean> a02startval = new ArrayList<>();
+ // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
+ for (Boolean bit : A02readstart) {
+ // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
+ a02startval.add(!bit);
}
+ // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
+ S7control.getinstance().WriteBit(A02start, a02startval);
}
// 澶嶄綅鎸夐挳鍐欏叆
- if (messageArray.getJSONArray(2).size() > 0) {
- JSONArray jsonArray3 = messageArray.getJSONArray(2);
- List<Boolean> sValue3 = new ArrayList<>();
- for (int i = 0; i < jsonArray3.size(); i++) {
- Object value = jsonArray3.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- boolean val = "1".equals(cleanedValue.trim());
- sValue3.add(val);
- System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- if (!sValue3.isEmpty()) {
- S7control.getinstance().WriteBit(Reset, sValue3);
- System.out.println("Values " + sValue3 + " written to PLC at address " + Reset);
- }
- }
+ customS7Control.writeBitToPLC( messageArray, Reset,2);
//鍥為浂鎸夐挳鍐欏叆
- if (messageArray.getJSONArray(3).size() > 0) {
- JSONArray jsonArray4 = messageArray.getJSONArray(3);
- List<Boolean> sValue4 = new ArrayList<>();
- for (int i = 0; i < jsonArray4.size(); i++) {
- Object value = jsonArray4.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- boolean val = "1".equals(cleanedValue.trim());
- sValue4.add(val);
- System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- if (!sValue4.isEmpty()) {
- S7control.getinstance().WriteBit(waddresses4, sValue4);
- System.out.println("Values " + sValue4 + " written to PLC at address " + waddresses4);
- }
- }
+ customS7Control.writeBitToPLC( messageArray, waddresses4,3);
-
- //鍙栫墖ID鍐欏叆
- if (messageArray.getJSONArray(5).size() > 0) {
-// JSONArray jsonArray5 = messageArray.getJSONArray(4);
- String jsonArray5 = String.valueOf(messageArray.getJSONArray(5));
- if (!jsonArray5.isEmpty()) {
-// String value = (String) jsonArray5.get(0);
- jsonArray5 = jsonArray5.replaceAll("[\\[\\]\"]", ""); // 鍘婚櫎鏂规嫭鍙峰拰鍙屽紩鍙�
- outmesid(jsonArray5, outputGlassIdAddress);
- System.out.println("Values1 " + jsonArray5 + " written to PLC at address " + outputGlassIdAddress);
- }
- }
// 杩涚墖ID鍐欏叆
- if (messageArray.getJSONArray(4).size() > 0) {
- JSONArray jsonArray6 = messageArray.getJSONArray(4);
+ customS7Control.writeStringToPLC( messageArray,inputGlassIdAddress,4);
+ //鍙栫墖ID鍐欏叆
+ customS7Control.writeStringToPLC( messageArray,outputGlassIdAddress,5);
- if (!jsonArray6.isEmpty()) {
- String value2 = (String) jsonArray6.get(0);
- outmesid(value2.trim(), inputGlassIdAddress);
- System.out.println("Values2 " + value2 + " written to PLC at address " + inputGlassIdAddress);
- }
- }
+ //A01鍗婅嚜鍔�
+ customS7Control.writeBitToPLC( messageArray, A01Bstart,6);
-
- if (messageArray.getJSONArray(6).size() > 0) {
- JSONArray jsonArray4 = messageArray.getJSONArray(6);
- List<Boolean> sValueb4 = new ArrayList<>();
- for (int i = 0; i < jsonArray4.size(); i++) {
- Object value = jsonArray4.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- boolean val = "1".equals(cleanedValue.trim());
- sValueb4.add(val);
- System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- if (!sValueb4.isEmpty()) {
-
- S7control.getinstance().WriteBit(A01Bstart, sValueb4);
- System.out.println("Values " + sValueb4 + " written to PLC at address " + A01Bstart);
- }
- }
-
-
- if (messageArray.getJSONArray(7).size() > 0 && !messageArray.isNull(7)) {
- JSONArray jsonArray4 = messageArray.getJSONArray(7);
- List<Boolean> sValueb5 = new ArrayList<>();
- for (int i = 0; i < jsonArray4.size(); i++) {
- Object value = jsonArray4.get(i);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- boolean val = "1".equals(cleanedValue.trim());
- sValueb5.add(val);
- System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
- if (!sValueb5.isEmpty()) {
-
- S7control.getinstance().WriteBit(A02Bstart, sValueb5);
- System.out.println("Values " + sValueb5 + " written to PLC at address " + A02Bstart);
- }
- }
-
+ //A02鍗婅嚜鍔�
+ customS7Control.writeBitToPLC( messageArray, A02Bstart,7);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index dbe13fa..6f74524 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -68,7 +68,7 @@
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鏉冮檺
@GetMapping("/SelectPermissionByUserName")
- public Result SelectPermissionByUserName(String username) {
+ public Result SelectPermissionByUserName(String username) throws SQLException {
Map<String, Object> map = new HashMap<>();
List<RolePermission> permission = homeMapper.SelectPermissionByUserName(username);
map.put("permission", permission);
@@ -140,7 +140,7 @@
@GetMapping("/UpdateTask")
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types,glassid);
+ homeMapper.UpdateTask(types, glassid);
StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
homeMapper.UpdateCageTask1(glassid);
@@ -197,7 +197,7 @@
int sequence = homeMapper.SelectMaxSquence();
homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),
- sequence, position);
+ sequence, position, 0);
map.put("message2", "200");
} else {
map.put("message2", "300");
@@ -256,14 +256,19 @@
public Result Inglassid(short cage, short cell, short tier, @RequestBody Queue queue) {
Map<String, Object> map = new HashMap<>();
short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
- if (result > 0) {
- map.put("message", "300");
+ Double cagewidth = homeMapper.SelectCageWidth(cage, cell);
+ if (cagewidth - queue.getglasswidth() - 400 < 0 || (cagewidth == 2750 && queue.getglasswidth() > cagewidth)) {
+ map.put("message", "400");
} else {
- homeMapper.Inglassid(queue, cage, cell, tier);
- spianMapper.UpdataAddCage1(queue.getglasswidth(), cage, cell);
- map.put("message", "200");
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.Inglassid(queue, cage, cell, tier);
+ spianMapper.UpdataAddCage1(queue.getglasswidth(), cage, cell);
+ map.put("message", "200");
+ }
}
- return Result.success(map);
+ return Result.success(map);
}
// 鏌ヨ鐜荤拑淇℃伅
@@ -331,10 +336,10 @@
return Result.success(map);
}
- // 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ // 鏍规嵁閾濇id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@PostMapping("/DeleteProductionQueueGlass")
public Result DeleteProductionQueueGlass(String FrameNo) {
- homeMapper.DeleteProductionQueueGlass(FrameNo);
+ homeMapper.CompleteQueueByFrameNo(FrameNo);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -372,11 +377,11 @@
return Result.success(map);
}
- //鎵嬪姩瀹屾垚浠诲姟
+ // 鎵嬪姩瀹屾垚浠诲姟
@PostMapping("/CompleteQueue")
- public Result CompleteQueue(String id,String frameid,String glassid) {
- return outSliceServive.CompleteQueue(id,frameid,glassid);
-
+ public Result CompleteQueue(String id, String frameid, String glassid) {
+ return outSliceServive.CompleteQueue(id, frameid, glassid);
+
}
-
+
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index e494aba..7927307 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -135,7 +135,7 @@
north_glass_buffer1 SelectBoxNo(String glassid);
//鏌ヨ鍑虹墖闃熷垪淇℃伅
- @Select("select * from out_slice where state=0 or state=1 or state=2 order by sequence")
+ @Select("select * from out_slice order by sequence")
List<Out_slice> SelectProductionqueue();
//鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
@@ -143,9 +143,9 @@
StorageCage SelectStorageGlassById(String glassid);
- //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
- @Update("update out_slice set state=4 where barcode=#{FrameNo} and (state=0 or state=1 or state=2)")
- void DeleteProductionQueueGlass(String id);
+ // //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ // @Update("update out_slice set state=4 where barcode=#{FrameNo} and (state=0 or state=1 or state=2)")
+ // void DeleteProductionQueueGlass(String id);
//鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
@Select("select * from north_glass_buffer1 where FrameBarcode=#{FrameBarcode}")
@@ -157,8 +157,8 @@
Out_slice SelectQueueByglassid(String getbarcode);
//娣诲姞鍑虹墖闃熷垪
- @Insert("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip}, #{sequence}, now(), #{position});")
- void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm, int sequence, String position);
+ @Insert("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, #{state}, #{flip}, #{sequence}, now(), #{position});")
+ void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm, int sequence, String position, Short state);
//鍑虹墖闃熷垪璋冨簭
@Update("update out_slice set sequence=#{sequence} where glassid=#{glassId}")
@@ -178,8 +178,11 @@
@Select("select count(*) from out_slice where barcode=#{frameid} and state<2")
Short SelectCountByFrameNo(String frameid);
- //閾濇id瀵瑰簲鐜荤拑鏀瑰畬鍏ㄩ儴瀹屾垚鐘舵��
- @Update("update out_slice set state=3 where barcode=#{frameid} and state=2")
+ //鍒犻櫎宸插畬鎴愮殑浠诲姟
+ @Update("delete from out_slice where Barcode=#{frameid}")
void CompleteQueueByFrameNo(String frameid);
+ @Select("Select width from storage_cage where cage=#{cage} and cell=#{cell} limit 1")
+ Double SelectCageWidth(short cage, short cell);
+
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java b/springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java
index d2a518a..0a351d4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java
@@ -17,6 +17,7 @@
@Autowired
private JdbcConnections jdbcConnections;
+ //鑾峰彇鐜荤拑鏄惁鍦ㄧ瀛愶紝鏄惁鍦ㄥ嚭鐗囬槦鍒�
public List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
List<north_glass_buffer1> listAluminumFrame = jdbcConnections
.SelectGlassByGlassIdOrderIdFrameIdss(FrameBarcode);
@@ -27,14 +28,20 @@
return listAluminumFrame;
}
+ //鏍规嵁閾濇id娣诲姞鐜荤拑鍒板嚭鐗囬槦鍒�
public void AddOutSliceS(String FrameBarcode) throws SQLException{
List<north_glass_buffer1> north_glass_buffer1s=SelectAluminumFrameInfoById(FrameBarcode);
String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
String position =jdbcConnections.SelectPositionByFrameBarcode(FrameBarcode);
int sequence=homeMapper.SelectMaxSquence();
+
for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
- if(north_glass_buffer1.getstorageCage()!=null&&north_glass_buffer1.getOut_slice()==null){
- homeMapper.AddOutSliceS(north_glass_buffer1.getbarcode(), flip, FrameBarcode, north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(), sequence, position);
+ Short state=0;
+ if(north_glass_buffer1.getOut_slice()==null){
+ if(north_glass_buffer1.getstorageCage()==null){
+ state=3;
+ }
+ homeMapper.AddOutSliceS(north_glass_buffer1.getbarcode(), flip, FrameBarcode, north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(), sequence, position, state);
sequence+=1;
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
index 4e670f0..617f7d7 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
@@ -33,8 +33,9 @@
// 娣诲姞鍒版暟鎹簱
for (String[] item : AluminumFrames) {
if (item[1] == "true") {
+ Short state=0;
String position = jdbcConnections.SelectPositionByFrameBarcode(item[3]);
- homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5], sequence, position);
+ homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5], sequence, position,state );
sequence += 1;
}
}
@@ -56,8 +57,9 @@
homeMapper.CompleteQueueByFrameNo(frameid);
}
StorageCage storageCage = homeMapper.SelectGlassInfo(glassid);
- spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
-
+ if(storageCage!=null){
+ spianMapper.UpdataOutCage1(storageCage.getGlassWidth(), storageCage.getCage(), storageCage.getCell());
+ }
homeMapper.UpdateCageTask2(glassid);
S7control.getinstance().WriteWord("DB105.12", (short) 0);
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0