From 3f98ccf49e7ffc098689c37237bd1dceed651ca1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 27 十一月 2023 09:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/views/home/index.vue | 536 ++++--
springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java | 5
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java | 2
CanadaMes-ui/src/views/Electrical/State.vue | 21
CanadaMes-ui/src/views/Electrical/Parameter.vue | 148 +
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java | 89
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 85
springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 42
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 36
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 71
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java | 168 +
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 62
springboot-vue3/pom.xml | 14
CanadaMes-ui/src/api/home.js | 42
CanadaMes-ui/src/views/Electrical/Action.vue | 59
springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java | 101 +
CanadaMes-ui/src/configuration/State.json | 40
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 126 +
springboot-vue3/src/main/java/com/example/springboot/security/config/ShiroConfig.java | 34
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java | 104 +
CanadaMes-ui/src/views/Electrical/Sign.vue | 168 -
.vscode/settings.json | 3
CanadaMes-ui/src/configuration/Parameter.json | 86 +
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 34
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 253 ++-
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 591 +++++---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 546 ++++--
CanadaMes-ui/src/lang/locales/zh-CN.json | 286 ++-
springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java | 66
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 10
CanadaMes-ui/src/configuration/Action.json | 88 +
.vscode/launch.json | 28
CanadaMes-ui/src/lang/locales/en-US.json | 27
CanadaMes-ui/src/configuration/Sign.json | 295 ++++
34 files changed, 3,023 insertions(+), 1,243 deletions(-)
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..a0df939
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,28 @@
+{
+ // 浣跨敤 IntelliSense 浜嗚В鐩稿叧灞炴�с��
+ // 鎮仠浠ユ煡鐪嬬幇鏈夊睘鎬х殑鎻忚堪銆�
+ // 娆蹭簡瑙ｆ洿澶氫俊鎭紝璇疯闂�: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "java",
+ "name": "Current File",
+ "request": "launch",
+ "mainClass": "${file}"
+ },
+ {
+ "type": "java",
+ "name": "MyGenerator",
+ "request": "launch",
+ "mainClass": "MyGenerator",
+ "projectName": "springboot-vue3"
+ },
+ {
+ "type": "java",
+ "name": "AuthorityApplication",
+ "request": "launch",
+ "mainClass": "com.example.springboot.AuthorityApplication",
+ "projectName": "springboot-vue3"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..c995aa5
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "java.debug.settings.onBuildFailureProceed": true
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/api/home.js b/CanadaMes-ui/src/api/home.js
index 4a35acf..05cc8b4 100644
--- a/CanadaMes-ui/src/api/home.js
+++ b/CanadaMes-ui/src/api/home.js
@@ -154,4 +154,44 @@
method: 'post',
data: ""
})
-}
\ No newline at end of file
+}
+
+export function SelectGlassNo(orderid) {
+ return request({
+ url: '/home/SelectGlassNo?orderid=' + orderid,
+ method: 'post',
+ data: ""
+ })
+}
+
+export function SelectAluminumFrameInfoById(FrameBarcode) {
+ return request({
+ url: '/home/SelectAluminumFrameInfoById?FrameBarcode=' + FrameBarcode,
+ method: 'post',
+ data: ""
+ })
+}
+
+export function SelectProductionqueue() {
+ return request({
+ url: '/home/SelectProductionqueue',
+ method: 'post',
+ data: ""
+ })
+}
+
+export function DeleteProductionQueueGlass(id) {
+ return request({
+ url: '/home/DeleteProductionQueueGlass?id='+id,
+ method: 'post',
+ data: ""
+ })
+}
+
+export function AddOutSliceS(data) {
+ return request({
+ url: '/home/AddOutSliceS',
+ method: 'post',
+ data
+ })
+}
diff --git a/CanadaMes-ui/src/configuration/Action.json b/CanadaMes-ui/src/configuration/Action.json
new file mode 100644
index 0000000..91e8990
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Action.json
@@ -0,0 +1,88 @@
+{
+ "action": [
+ {
+ "name": "D01 VFD conveyor"
+ },
+ {
+ "name": "D02 VFD conveyor"
+ },
+ {
+ "name": "D03 VFD conveyor"
+ },
+ {
+ "name": "D04 VFD conveyor"
+ },
+ {
+ "name": "D05 VFD conveyor"
+ },
+ {
+ "name": "D06 VFD conveyor"
+ },
+ {
+ "name": "A01 VFD conveyor"
+ },
+ {
+ "name": "A02 VFD conveyor"
+ },
+ {
+ "name": "B01 VFD conveyor"
+ },
+ {
+ "name": "B02 VFD conveyor"
+ },
+ {
+ "name": "A01 SERVE TURN JOG+"
+ },
+ {
+ "name": "A02 SERVE TURN JOG-"
+ },
+ {
+ "name": "A01 SERVE TRAVEL JOG+"
+ },
+ {
+ "name": "A02 SERVE TRAVEL JOG-"
+ },
+ {
+ "name": "B01 SERVE TRAVEL JOG+"
+ },
+ {
+ "name": "B02 SERVE TRAVEL JOG-"
+ },
+ {
+ "name": "A01 SERVE TURN POS"
+ },
+ {
+ "name": "A02 SERVE TURN POS"
+ },
+ {
+ "name": "A01 SERVE TRAVEL POS"
+ },
+ {
+ "name": "A02 SERVE TRAVEL POS"
+ },
+ {
+ "name": "B01 SERVE TRAVEL POS"
+ },
+ {
+ "name": "B02 SERVE TRAVEL POS"
+ },
+ {
+ "name": "B01 YV TURN"
+ },
+ {
+ "name": "B01 YV UP DOWN"
+ },
+ {
+ "name": "B02 YV TURN"
+ },
+ {
+ "name": "B02 YV UP DOWN"
+ }
+ ],
+ "address": [
+ {
+ "name": "DB2.0.0",
+ "count": 26
+ }
+ ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Parameter.json b/CanadaMes-ui/src/configuration/Parameter.json
new file mode 100644
index 0000000..a04f953
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Parameter.json
@@ -0,0 +1,86 @@
+{
+ "para": [
+ {
+ "name": "conveyor Velocity(Auto FAST)",
+ "read": 33,
+ "sending": 0,
+ "unit": "m/min"
+ },
+ {
+ "name": "conveyor Velocity(Auto SLOW)",
+ "read": 11,
+ "sending": 0,
+ "unit": "m/min"
+ },
+ {
+ "name": "conveyor Velocity(Manual)",
+ "read": 22,
+ "sending": 0,
+ "unit": "m/min"
+ },
+ {
+ "name": "A01 A02 TURN JOG Velocity",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ },
+ {
+ "name": "A01 A02 TRAVEL JOG Velocity",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ },
+ {
+ "name": "B01 B02 TRAVEL JOG Velocity",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ },
+ {
+ "name": "A01 A02 TURN POS Velocity AUTO",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ },
+ {
+ "name": "A01 A02 TURN POS Velocity manual",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ },
+ {
+ "name": "A01 A02 TRAVEL POS Velocity AUTO",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ },
+ {
+ "name": "A01 A02 TRAVEL POS Velocity manual",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ },
+ {
+ "name": "B01 B02 TRAVEL POS Velocity AUTO",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ },
+ {
+ "name": "B01 B02 TRAVEL POS Velocity manual",
+ "read": 0,
+ "sending": 0,
+ "unit": "mm/S"
+ }
+ ],
+ "address": [
+ {
+ "name": "DB100.0",
+ "count": 12
+ },
+ {
+ "name": "DB100.0",
+ "count": 12
+ }
+ ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Sign.json b/CanadaMes-ui/src/configuration/Sign.json
new file mode 100644
index 0000000..c634375
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -0,0 +1,295 @@
+{
+ "sign": [
+ {
+ "name": "D01.SR dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D01.SR in pos",
+ "value": "0",
+ "state": "1"
+ },
+ {
+ "name": "D02.SR dec",
+ "value": "0",
+ "state": "1"
+ },
+ {
+ "name": "D02.SR in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D03.SR into",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D03.SR dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D03.SR in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D04.SR dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D04.SR in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D05.SR dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D05.SR in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D06.SR dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D06.SR in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR out dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR out in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR in dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR in in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR turn on",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR turn off",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR up",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR down",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR out dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR out in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR in dec",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR in in pos",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR turn on",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR turn off",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR up",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR down",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR out safety",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.SR in safety",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR out safety",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SB.start(+)",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SB.stop(1)",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SB.reset",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SB.auto/manul",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SB.pause",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SB.emg",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D01.SB.start",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D06.SB.start",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.SR in safety",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SAFETYDOOR.requset",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SAFETYDOOR.confirm",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SAFETYDOOR.reset",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "LED.red",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "LED.green",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "LED.yellow",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D01.LED.green",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "D06.LED.green",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.YV.turn",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.YV.up down",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B01.YV.gassing",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.YV.turn",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.YV.up down",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "B02.YV.gassing",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SAFETYDOOR.led",
+ "value": "1",
+ "state": "1"
+ },
+ {
+ "name": "SAFETYDOOR.open",
+ "value": "1",
+ "state": "1"
+ }
+ ],
+ "address": [
+ {
+ "name": "DB102.0.0",
+ "count": 58
+ }
+ ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/State.json b/CanadaMes-ui/src/configuration/State.json
new file mode 100644
index 0000000..f823304
--- /dev/null
+++ b/CanadaMes-ui/src/configuration/State.json
@@ -0,0 +1,40 @@
+{
+ "state": [
+ {
+ "name": "D01.State"
+ },
+ {
+ "name": "D02.State"
+ },
+ {
+ "name": "B01.State"
+ },
+ {
+ "name": "B02.State"
+ },
+ {
+ "name": "A01.State"
+ },
+ {
+ "name": "A02.State"
+ },
+ {
+ "name": "D03.State"
+ },
+ {
+ "name": "D04.State"
+ },
+ {
+ "name": "D05.State"
+ },
+ {
+ "name": "D06.State"
+ }
+ ],
+ "address": [
+ {
+ "name": "DB103.0",
+ "count": 10
+ }
+ ]
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index f5e850b..a3374c9 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -236,18 +236,17 @@
"Alarm Information":"Alarm Information",
"Cage Details":"Cage Details",
"order":"order",
- "length":"length",
- "width":"width",
+ "Length":"Length",
+ "Width":"Width",
"Operate":"Operate",
"Terminate Task":"Terminate Task",
"cancel":"cancel",
"confirm":"confirm",
- "number":"number",
+ "Number":"Number",
"Outfeed glass barcode":"Outfeed glass barcode",
- "Infeed glass barcode鈥�":"Infeed glass barcode鈥�",
+ "Infeed glass barcode":"Infeed glass barcode",
"Cage No":"Cage No",
"Slot No":"Slot No",
- "Order Nmuber":"Order Nmuber",
"Dim":"Dim",
"id":"id",
"content":"content",
@@ -255,12 +254,12 @@
"endTime":"endTime",
"The Side":"The Side",
- "Barcodid":"Barcodid",
+ "barcode":"barcode",
"Order No":"Order No",
"List No":"List No",
"Box No":"Box No",
- "delete":"delete",
- "out":"out",
+ "Delete":"Delete",
+ "Out":"Out",
"Operation successful":"Operation successful",
"Operation canceled":"Operation canceled",
@@ -271,7 +270,6 @@
"No delete allowed":"No delete allowed",
"No out allowed":"No out allowed",
"Are you sure to perform this operation ?":"Are you sure to perform this operation ?",
- "prompt":"prompt",
"Yes":"Yes",
@@ -281,7 +279,7 @@
"DataBase Connection failed":"DataBase Connection failed",
"Distribute parameters":"Distribute parameters",
"The glass size is not within the range":"The glass size is not within the range",
- "increase":"increase",
+ "Increase":"Increase",
"Enable":"Enable",
"Disable":"Disable",
"Usage":"Usage",
@@ -300,6 +298,13 @@
"Clear Current":"Clear Current",
"Confirm Modification":"Confirm modification",
"The glass ID already exists in the loading queue":"The glass ID already exists in the loading queue",
- "This glass ID already exists in the sorting cage":"This glass ID already exists in the sorting cage"
+ "This glass ID already exists in the sorting cage":"This glass ID already exists in the sorting cage",
+ "Production queue":"Production queue",
+ "Enter the Frame No":"Enter the Frame No",
+ "Frame No":"Frame No",
+ "Glass information corresponding to aluminum frame":"Glass information corresponding to aluminum frame",
+ "In the cage":"In the cage",
+ "Flip":"Flip",
+ "In the queue":"In the queue"
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index a150194..49d0c11 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -196,10 +196,8 @@
"langResetButton": "閲嶇疆",
"langCancelButton": "鍙栨秷",
"langRegisterSuccessMessage": "娉ㄥ唽鎴愬姛",
-
- "娣诲姞鐢ㄦ埛鎴愬姛":"娣诲姞鐢ㄦ埛鎴愬姛",
+ "娣诲姞鐢ㄦ埛鎴愬姛": "娣诲姞鐢ㄦ埛鎴愬姛",
"confirmResetPassword": "纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�",
-
"confirm": "纭畾",
"cancel": "鍙栨秷",
"passwordResetSuccess": "瀵嗙爜宸查噸缃负榛樿鍊�",
@@ -210,64 +208,56 @@
"addUserSuccess": "娣诲姞鐢ㄦ埛鎴愬姛",
"editUserSuccess": "淇敼鐢ㄦ埛鎴愬姛",
"effective": "鏈夋晥",
-"invalid": "鏃犳晥",
-
-"addSuccessMessage": "娣诲姞鎴愬姛",
-"deleteConfirmMessage": "纭畾瑕佸垹闄よ鏉冮檺鍚楋紵",
-
-"confirmButtonText": "纭畾",
-"cancelButtonText": "鍙栨秷",
-"deleteSuccessMessage": "鍒犻櫎鎴愬姛",
-"deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
-
-
-
- "Enter the glass barcode":"杈撳叆鐜荤拑id",
- "Manually Infeed Glass":"鎵嬪姩涓婄墖",
- "Exit the glass by order number":"鎸夎鍗曞嚭鐗�",
- "Please confirm the glass information":"璇风‘璁ょ幓鐠冧俊鎭�",
- "Please confirm the Ordering Information":"璇风‘璁よ鍗曚俊鎭�",
- "Alarm Information":"鎶ヨ淇℃伅",
- "Cage Details":"鐞嗙墖绗艰鎯�",
- "order":"璁㈠崟",
- "length":"闀�",
- "width":"瀹�",
- "Operate":"鎿嶄綔",
- "Terminate Task":"瀹屾垚浠诲姟",
- "cancel":"鍙栨秷",
- "confirm":"纭",
- "number":"鏁伴噺",
- "Outfeed glass barcode":"鍑虹墖鐜荤拑id",
- "Cage No鈥�":"杩涚墖鐜荤拑id",
- "The Cage number being used":"绗煎瓙",
- "Slot No":"鏍煎瓙",
- "Order No":"璁㈠崟缂栧彿",
- "List No":"鍒楄〃缂栧彿",
- "Box No":"绠卞瓙缂栧彿",
- "Dim":"灏哄",
- "id":"id",
- "content":"鍐呭",
- "timeon":"鎶ヨ鏃堕棿",
- "endTime":"缁撴潫鏃堕棿",
-
- "The Side":"鍐呭渚�",
- "Barcodid":"鐜荤拑id",
- "Order Number":"璁㈠崟",
- "delete":"鍒犻櫎",
- "out":"鍑虹墖",
-
- "Operation successful":"鎿嶄綔鎴愬姛",
- "Operation canceled":"鎿嶄綔鍙栨秷",
- "There is no such order":"娌℃湁姝よ鍗曠殑鐜荤拑",
- "There are currently tasks":"褰撳墠鏈変换鍔�",
- "There is no such glass":"娌℃湁姝ょ幓鐠�",
- "There is no such grid":"娌℃湁绌洪棽鏍煎瓙",
- "No delete allowed":"涓嶈兘鍒犻櫎",
- "No out allowed":"涓嶈兘鍑虹墖",
- "Are you sure to perform this operation ?":"纭畾鎵ц姝ゆ搷浣�?",
- "prompt":"鎻愮ず",
- "Yes":"鏄�",
- "No":"鍚�",
+ "invalid": "鏃犳晥",
+ "addSuccessMessage": "娣诲姞鎴愬姛",
+ "deleteConfirmMessage": "纭畾瑕佸垹闄よ鏉冮檺鍚楋紵",
+ "confirmButtonText": "纭畾",
+ "cancelButtonText": "鍙栨秷",
+ "deleteSuccessMessage": "鍒犻櫎鎴愬姛",
+ "deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
+ "Enter the glass barcode": "杈撳叆鐜荤拑id",
+ "Infeed Barcodeid": "鎵嬪姩涓婄墖",
+ "Enter the order number": "杈撳叆璁㈠崟鍙�",
+ "Exit the glass by order number": "鎸夎鍗曞嚭鐗�",
+ "Please confirm the glass information": "璇风‘璁ょ幓鐠冧俊鎭�",
+ "Please confirm the Ordering Information": "璇风‘璁よ鍗曚俊鎭�",
+ "Alarm Information": "鎶ヨ淇℃伅",
+ "Cage Details": "鐞嗙墖绗艰鎯�",
+ "order": "璁㈠崟",
+ "Length": "闀�",
+ "Width": "瀹�",
+ "Operate": "鎿嶄綔",
+ "Terminate Task":"缁撴潫浠诲姟",
+ "end task": "瀹屾垚浠诲姟",
+ "Number": "鏁伴噺",
+ "Outfeed glass barcode": "鍑虹墖鐜荤拑id",
+ "Infeed glass barcode": "杩涚墖鐜荤拑id",
+ "Order No": "璁㈠崟缂栧彿",
+ "List No": "鍒楄〃缂栧彿",
+ "Box No": "绠卞瓙缂栧彿",
+ "Dim": "灏哄",
+ "id": "id",
+ "content": "鍐呭",
+ "timeon": "鎶ヨ鏃堕棿",
+ "endTime": "缁撴潫鏃堕棿",
+ "Cage No": "绗煎瓙",
+ "The Side": "鍐呭渚�",
+ "Slot No": "鏍煎瓙",
+ "Barcode": "鐜荤拑id",
+ "Delete": "鍒犻櫎",
+ "Out": "鍑虹墖",
+ "Operation successful": "鎿嶄綔鎴愬姛",
+ "Operation canceled": "鎿嶄綔鍙栨秷",
+ "There is no such order": "娌℃湁姝よ鍗曠殑鐜荤拑",
+ "There are currently tasks": "褰撳墠鏈変换鍔�",
+ "There is no such glass": "娌℃湁姝ょ幓鐠�",
+ "There is no such grid": "娌℃湁绌洪棽鏍煎瓙",
+ "No delete allowed": "涓嶈兘鍒犻櫎",
+ "No out allowed": "涓嶈兘鍑虹墖",
+ "Are you sure to perform this operation ?": "纭畾鎵ц姝ゆ搷浣�?",
+ "prompt": "鎻愮ず",
+ "Yes": "鏄�",
+ "No": "鍚�",
"today": "浠婂ぉ",
"yesterday": "鏄ㄥぉ",
"week": "涓�鍛ㄥ墠",
@@ -277,31 +267,151 @@
"alacontent": "鎶ヨ鍐呭",
"time-on": "寮�濮嬫椂闂�",
"End-Time": "缁撴潫鏃堕棿",
-
- "Please enter the password":"璇疯緭鍏ュ瘑鐮�",
- "Password error":"瀵嗙爜閿欒",
- "DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�",
- "Distribute parameters":"涓嬪彂鍙傛暟",
- "The glass size is not within the range":"鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
- "increase":"娣诲姞",
- "Enable":"鍚敤",
- "Disable":"绂佺敤",
- "Usage":"浣跨敤鐜�",
- "Space (Pieces)":"绌洪棿(鐗囨暟)",
- "This glass is already in the cage":"绗煎瓙閲屽凡鏈夋鐜荤拑",
- "Enter the Order No":"璇疯緭鍏ヨ鍗昳d",
- "OrderInfo":"璁㈠崟淇℃伅",
- "Query":"鏌ヨ",
- "permission update":"鏉冮檺缂栬緫",
- "query was successful":"鏌ヨ鎴愬姛",
- "Scan Code Point":"鎵爜浣�",
- "Upper film position":"涓婄墖浣�",
- "Glass Information":"鐜荤拑淇℃伅",
- "current Information":"褰撳墠淇℃伅",
- "Modify Information":"淇敼淇℃伅",
- "Clear Current":"娓呴櫎褰撳墠",
- "Confirm Modification":"纭淇敼",
- "The glass ID already exists in the loading queue":"涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
- "This glass ID already exists in the sorting cage":"鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id"
-
+ "Please enter the password": "璇疯緭鍏ュ瘑鐮�",
+ "Password error": "瀵嗙爜閿欒",
+ "DataBase Connection failed": "鏁版嵁搴撹繛鎺ュけ璐�",
+ "Distribute parameters": "涓嬪彂鍙傛暟",
+ "The glass size is not within the range": "鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
+ "Increase": "娣诲姞",
+ "Enable": "鍚敤",
+ "Disable": "绂佺敤",
+ "Usage": "浣跨敤鐜�",
+ "Space (Pieces)": "绌洪棿(鐗囨暟)",
+ "This glass is already in the cage": "绗煎瓙閲屽凡鏈夋鐜荤拑",
+ "Enter the Order No": "璇疯緭鍏ヨ鍗昳d",
+ "OrderInfo": "璁㈠崟淇℃伅",
+ "Query": "鏌ヨ",
+ "permission update": "鏉冮檺缂栬緫",
+ "query was successful": "鏌ヨ鎴愬姛",
+ "Scan Code Point": "鎵爜浣�",
+ "Upper film position": "涓婄墖浣�",
+ "Glass Information": "鐜荤拑淇℃伅",
+ "current Information": "褰撳墠淇℃伅",
+ "Modify Information": "淇敼淇℃伅",
+ "Clear Current": "娓呴櫎褰撳墠",
+ "Confirm Modification": "纭淇敼",
+ "The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
+ "This glass ID already exists in the sorting cage": "鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id",
+ "Production queue":"涓婄墖闃熷垪",
+ "Enter the Aluminum Frame No":"璇疯緭鍏ラ摑妗唅d",
+ "Frame No":"閾濇id",
+ "Glass information corresponding to aluminum frame":"閾濇瀵瑰簲鐨勭幓鐠冧俊鎭�",
+ "In the cage":"鍦ㄧ鍐�",
+ "Flip":"缈昏浆",
+ "In the queue":"鍦ㄩ槦鍒�",
+ "Enter the Frame No":"璇疯緭鍏ラ摑妗唅d",
+ "Manually Infeed Glass":"鎵嬪姩杩涚墖",
+ "langparameter": {
+ "conveyor Velocity(Auto FAST)": "鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
+ "conveyor Velocity(Auto SLOW)": "鐨甫杈撻�佽嚜鍔ㄦ參閫�",
+ "conveyor Velocity(Manual)": "鐨甫杈撻�佹墜鍔ㄩ�熷害",
+ "A01 A02 TURN JOG Velocity": "A01 A02 缈昏浆鐐瑰姩閫熷害",
+ "A01 A02 TRAVEL JOG Velocity": "A01 A02 琛岃蛋鐐瑰姩閫熷害",
+ "B01 B02 TRAVEL JOG Velocity": "B01 B02 琛岃蛋鐐瑰姩閫熷害",
+ "A01 A02 TURN POS Velocity AUTO": "A01 A02 缈昏浆鑷姩瀹氫綅閫熷害",
+ "A01 A02 TURN POS Velocity manual": "A01 A02 缈昏浆鎵嬪姩瀹氫綅閫熷害",
+ "A01 A02 TRAVEL POS Velocity AUTO": "A01 A02 琛岃蛋鑷姩瀹氫綅閫熷害",
+ "A01 A02 TRAVEL POS Velocity manual": "A01 A02 琛岃蛋鎵嬪姩瀹氫綅閫熷害",
+ "B01 B02 TRAVEL POS Velocity AUTO": "B01 B02 琛岃蛋鑷姩瀹氫綅閫熷害",
+ "B01 B02 TRAVEL POS Velocity manual": "B01 B02 琛岃蛋鎵嬪姩瀹氫綅閫熷害"
+ },
+ "langActions": {
+ "D01 VFD conveyor": "D01 杈撻�佸彉棰�",
+ "D02 VFD conveyor": "D02 杈撻�佸彉棰�",
+ "D03 VFD conveyor": "D03 杈撻�佸彉棰�",
+ "D04 VFD conveyor": "D04 杈撻�佸彉棰�",
+ "D05 VFD conveyor": "D05 杈撻�佸彉棰�",
+ "D06 VFD conveyor": "D06 杈撻�佸彉棰�",
+ "A01 VFD conveyor": "A01 杈撻�佸彉棰�",
+ "A02 VFD conveyor": "A02 杈撻�佸彉棰�",
+ "B01 VFD conveyor": "B01 杈撻�佸彉棰�",
+ "B02 VFD conveyor": "B02 杈撻�佸彉棰�",
+ "A01 SERVE TURN JOG+": "A01 缈昏浆浼烘湇鐐瑰姩",
+ "A02 SERVE TURN JOG-": "A02 缈昏浆浼烘湇鐐瑰姩",
+ "A01 SERVE TRAVEL JOG+": "A01 琛岃蛋浼烘湇鐐瑰姩",
+ "A02 SERVE TRAVEL JOG-": "A02 琛岃蛋浼烘湇鐐瑰姩",
+ "B01 SERVE TRAVEL JOG+": "B01 琛岃蛋浼烘湇鐐瑰姩",
+ "B02 SERVE TRAVEL JOG-": "B02 琛岃蛋浼烘湇鐐瑰姩",
+ "A01 SERVE TURN POS": "A01 缈昏浆浼烘湇瀹氫綅",
+ "A02 SERVE TURN POS": "A02 缈昏浆浼烘湇瀹氫綅",
+ "A01 SERVE TRAVEL POS": "A01 琛岃蛋浼烘湇瀹氫綅",
+ "A02 SERVE TRAVEL POS": "A02 琛岃蛋浼烘湇瀹氫綅",
+ "B01 SERVE TRAVEL POS": "B01 琛岃蛋浼烘湇瀹氫綅",
+ "B02 SERVE TRAVEL POS": "B02 琛岃蛋浼烘湇瀹氫綅",
+ "B01 YV TURN": "B01 鎶捣鐢电闃�",
+ "B01 YV UP DOWN": "B01 涓婂崌涓嬮檷鐢电闃�",
+ "B02 YV TURN": "B02 鎶捣鐢电闃�",
+ "B02 YV UP DOWN": "B02 涓婂崌涓嬮檷鐢电闃�"
+ },
+ "Signlang": {
+ "D01.SR dec": "D01.鍑忛�熶紶鎰熷櫒",
+ "D01.SR in pos": "D01.鍒颁綅浼犳劅鍣�",
+ "D02.SR dec": "D02.鍑忛�熶紶鎰熷櫒",
+ "D02.SR in pos": "D02.鍒颁綅浼犳劅鍣�",
+ "D03.SR into": "D03.杩涚墖浼犳劅鍣�",
+ "D03.SR dec": "D03.鍑忛�熶紶鎰熷櫒",
+ "D03.SR in pos": "D03.鍒颁綅浼犳劅鍣�",
+ "D04.SR dec": "D04.鍑忛�熶紶鎰熷櫒",
+ "D04.SR in pos": "D04.鍒颁綅浼犳劅鍣�",
+ "D05.SR dec": "D05.鍑忛�熶紶鎰熷櫒",
+ "D05.SR in pos": "D05.鍒颁綅浼犳劅鍣�",
+ "D06.SR dec": "D06.鍑忛�熶紶鎰熷櫒",
+ "D06.SR in pos": "D06.鍒颁綅浼犳劅鍣�",
+ "B01.SR out dec": "B01.鍑虹墖鍑忛�熶紶鎰熷櫒",
+ "B01.SR out in pos": "B01.鍑虹墖鍒颁綅浼犳劅鍣�",
+ "B01.SR in dec": "B01.杩涚墖鍑忛�熶紶鎰熷櫒",
+ "B01.SR in in pos": "B01.杩涚墖鍒颁綅浼犳劅鍣�",
+ "B01.SR turn on": "B01.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
+ "B01.SR turn off": "B01.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
+ "B01.SR up": "B01.涓婂崌鍒颁綅浼犳劅鍣�",
+ "B01.SR down": "B01.涓嬮檷鍒颁綅浼犳劅鍣�",
+ "B02.SR out dec": "B02.鍑虹墖鍑忛�熶紶鎰熷櫒",
+ "B02.SR out in pos": "B02.鍑虹墖鍒颁綅浼犳劅鍣�",
+ "B02.SR in dec": "B02.杩涚墖鍑忛�熶紶鎰熷櫒",
+ "B02.SR in in pos": "B02.杩涚墖鍒颁綅浼犳劅鍣�",
+ "B02.SR turn on": "B02.缈昏浆涓婂埌浣嶄紶鎰熷櫒",
+ "B02.SR turn off": "B02.缈昏浆涓嬪埌浣嶄紶鎰熷櫒",
+ "B02.SR up": "B02.涓婂崌鍒颁綅浼犳劅鍣�",
+ "B02.SR down": "B02.涓嬮檷鍒颁綅浼犳劅鍣�",
+ "B01.SR out safety": "B01.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "B01.SR in safety": "B01.杩涚墖瀹夊叏浼犳劅鍣�",
+ "B02.SR out safety": "B02.鍑虹墖瀹夊叏浼犳劅鍣�",
+ "SB.start(+)": "SB.鍚姩锛�+锛夋寜閽�",
+ "SB.stop(1)": "SB.鍋滄锛�-锛夋寜閽�",
+ "SB.reset": "SB.澶嶄綅鎸夐挳",
+ "SB.auto/manul": "SB.鎵�/鑷垏鎹㈡寜閽�",
+ "SB.pause": "SB.鏆傚仠鎸夐挳",
+ "SB.emg": "SB.鎬ュ仠鎸夐挳",
+ "D01.SB.start": "D01.鍚姩",
+ "D06.SB.start": "D06.鍚姩",
+ "B02.SR in safety": "B02.杩涚墖瀹夊叏浼犳劅鍣�",
+ "SAFETYDOOR.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
+ "SAFETYDOOR.confirm": "瀹夊叏闂ㄧ‘璁�",
+ "SAFETYDOOR.reset": "瀹夊叏闂ㄥ浣�",
+ "LED.red": "涓夎壊鐏孩",
+ "LED.green": "涓夎壊鐏豢",
+ "LED.yellow": "涓夎壊鐏粍",
+ "D01.LED.green": "D01.缁跨伅",
+ "D06.LED.green": "D06.缁跨伅",
+ "B01.YV.turn": "B01.鐢电闃�缈昏浆",
+ "B01.YV.up down": "B01.鐢电闃�涓婂崌涓嬮檷",
+ "B01.YV.gassing": "B01.鐢电闃�鍚规皵",
+ "B02.YV.turn": "B02.鐢电闃�缈昏浆",
+ "B02.YV.up down": "B02.鐢电闃�涓婂崌涓嬮檷",
+ "B02.YV.gassing": "B02.鐢电闃�鍚规皵",
+ "SAFETYDOOR.led": "瀹夊叏闂ㄧ姸鎬佺伅",
+ "SAFETYDOOR.open": "瀹夊叏闂ㄦ墦寮�"
+ },
+ "Statelang": {
+ "D01.State": "D01.鐘舵��",
+ "D02.State": "D02.鐘舵��",
+ "B01.State": "B01.鐘舵��",
+ "B02.State": "B02.鐘舵��",
+ "A01.State": "A01.鐘舵��",
+ "A02.State": "A02.鐘舵��",
+ "D03.State": "D03.鐘舵��",
+ "D04.State": "D04.鐘舵��",
+ "D05.State": "D05.鐘舵��",
+ "D06.State": "D06.鐘舵��"
+ }
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index db3b8da..1afd13b 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -2,11 +2,16 @@
<div class="app">
<!--闈㈠寘灞戝鑸尯鍩�-->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+ }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+ }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+ }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
+ }}</router-link>
</el-breadcrumb>
<div>Action</div>
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
@@ -19,20 +24,24 @@
<el-input v-model="item.name" style="width: 240px;" class="in_mc" readonly></el-input>
<el-switch v-model="item.value" active-value="1" inactive-value="0" @change="send()"></el-switch>
</div>
+
+
</el-form>
</div>
</template>
-<script >
+<script >
import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Action'
let socket;
export default {
name: "Action",
mixins: [LanguageMixin],
data () {
return {
+ jsonData: data,
activeButton: '',
record: {
params: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -107,12 +116,13 @@
}
},
created () {
- this.init();
+ this.init();
},
methods: {
- setActiveButton(buttonName) {
- this.activeButton = buttonName;
- },
+
+ setActiveButton (buttonName) {
+ this.activeButton = buttonName;
+ },
init () {
let viewname = "action";
@@ -134,24 +144,28 @@
};
// 娴忚鍣ㄧ鏀舵秷鎭紝鑾峰緱浠庢湇鍔＄鍙戦�佽繃鏉ョ殑鏂囨湰娑堟伅
socket.onmessage = (msg) => {
+ //console.log("鏀跺埌鏁版嵁====" + msg.data);
if (!msg.data) {
return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
}
let obj = JSON.parse(msg.data);
- if (obj.params ){
- this.record.params[0] = obj.params[0];
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a].toString() };
- } else {
+ if (obj.params) {
+ this.record.params[0] = obj.params[0];
+ for (let a = 0; a <= this.record.params[0].length - 1; a++) {
+ this.record.xyData[a].name = this.jsonData.action[a].name;
this.record.xyData[a].value = this.record.params[0][a].toString();
}
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
}
- }
- // console.log(this.record.xyData);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
};
//鍏抽棴浜嬩欢
@@ -169,7 +183,13 @@
this.messagepack.data = this.record.xyData.map(item => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
//console.log(this.messagepack);
socket?.send(JSON.stringify(this.messagepack));
- }
+ },
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('langActions');
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+ console.log(translation);
+ },
}
@@ -206,6 +226,7 @@
.el-input__inner {
border: none;
}
+
.blue-button {
background-color: skyblue;
}
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 0910224..b41aaf1 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -2,66 +2,73 @@
<div class="app">
<!-- 闈㈠寘灞戝鑸尯鍩� -->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+ }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+ }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+ }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
+ }}</router-link>
</el-breadcrumb>
<div>Parameter</div>
<el-form label-width="100px" style="display: flex; flex-wrap: wrap;" :model="messagepack.data">
<div id="btn_div">
- <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters') }}</el-button>
+ <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')
+ }}</el-button>
</div>
<div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
<el-input style="width: 280px; border:none;" class="in_mc" v-model="item.name" readonly></el-input>
-
- <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
- <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>
- <input v-model="item.value2" type="number" style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+
+ <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
+ <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>
+ <input v-model="item.value2" type="number"
+ style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
+ <span style="margin-right: 5px; width: 50px;">{{ item.unit }}</span>
</div>
</el-form>
<div>
-
- </div>
- </div>
-
-
+ </div>
+ </div>
</template>
-<script>
+<script>
let socket;
import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Parameter'
export default {
name: "Parameter",
mixins: [LanguageMixin],
data () {
return {
+ jsonData: data,
dialogVisible: true,
password: '',
activeButton: '',
record: {
params: [100, 200, 10, 10, 10, 10],
xyData: [
- { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0 },
- { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0 },
- { name: "conveyor Velocity(Manual)", value: 0, value2: 0 },
- { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0 },
- { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0 },
- { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
- { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0 },
- { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0 }
+ { name: "conveyor Velocity(Auto FAST)", value: 0, value2: 0, unit: "m/min" },
+ { name: "conveyor Velocity(Auto SLOW)", value: 0, value2: 0, unit: "m/min" },
+ { name: "conveyor Velocity(Manual)", value: 0, value2: 0, unit: "m/min" },
+ { name: "A01 A02 TURN JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
+ { name: "B01 B02 TRAVEL JOG Velocity", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TURN POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TURN POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
+ { name: "A01 A02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" },
+ { name: "B01 B02 TRAVEL POS Velocity AUTO", value: 0, value2: 0, unit: "mm/S" },
+ { name: "B01 B02 TRAVEL POS Velocity manual", value: 0, value2: 0, unit: "mm/S" }
],
canshu: []
},
@@ -78,13 +85,19 @@
created () {
this.initWebSocket();
- this.isButtonDisabled = true;
+ this.isButtonDisabled = true;
+
},
methods: {
-
-
-
- setActiveButton(buttonName) {
+ showdata () {
+ console.log(1111);
+ console.log(this.jsonData.para[0].name);
+ // console.log(this.record.xyData);
+
+ },
+
+
+ setActiveButton (buttonName) {
this.activeButton = buttonName;
},
initWebSocket () {
@@ -117,33 +130,53 @@
let obj = JSON.parse(msg.data);
- if (obj.params && obj.state){
+ if (obj.params && obj.state) {
-
- this.record.params[0] = obj.params[0];
- this.record.state = obj.state[0];
- if (obj.state && obj.state.length > 0) {
- let isButtonDisabled = this.record.state.includes(1);
- this.isButtonDisabled = isButtonDisabled;
-
- // 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
- //console.log(isButtonDisabled)
- // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
+ this.record.params[0] = obj.params[0];
+ this.record.state = obj.state[0];
+ if (obj.state && obj.state.length > 0) {
+ let isButtonDisabled = this.record.state.includes(1);
+ this.isButtonDisabled = isButtonDisabled;
- for (let a = 0; a <= this.record.params[0].length - 1; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
- } else {
- this.record.xyData[a].value = this.record.params[0][a];
+
+ // 鍒ゆ柇state涓槸鍚﹀瓨鍦�1
+ //console.log(isButtonDisabled)
+ // 灏嗗垽鏂粨鏋滀繚瀛樺埌鍙橀噺isButtonDisabled涓�
+
+ for (let a = 0; a <= this.record.params[0].length - 1; a++) {
+ // this.record.xyData[a] =
+ // {
+ // name: this.jsonData.para[a].name,
+ // value: this.jsonData.para[a].read,
+ // value2: this.jsonData.para[a].sending,
+ // unit: this.jsonData.para[a].unit
+ // };
+
+ // if (!this.xyData[a]) {
+ this.record.xyData[a] =
+ {
+ name: this.jsonData.para[a].name,
+ value: this.record.params[0][a],
+ unit: this.jsonData.para[a].unit
+ };
+ }
+ // else {
+ // this.xyData[a].value = this.record.params[0][a];
+ // }
+ // }
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
}
}
- }
- }
- //console.log(this.record.xyData);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
};
// 鍏抽棴浜嬩欢
@@ -164,7 +197,13 @@
},
handleChange (index, value) {
this.record.xyData[index].value = value;
- }
+ },
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('langparameter');
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
+ //console.log(translation);
+ },
}
};
</script>
@@ -187,8 +226,9 @@
.blue-button {
background-color: skyblue;
-
+
}
+
#btn_div {
width: 100%;
}
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 11e52a9..a3151cf 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -3,19 +3,23 @@
<!--闈㈠寘灞戝鑸尯鍩�-->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+ }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+ }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+ }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
+ }}</router-link>
-
+
</el-breadcrumb>
<div>{{ $t('Sign') }}</div>
<div style="padding-right: 30px;display: flex;flex-wrap: wrap;" class="neir">
<div class="kuai_sb" v-for="item in record.xyData" :key="item.name">
- <el-col class="deng" :class="getStatusClass(item.value)">
- </el-col>
+ <el-col class="deng" :class="getStatusClass(item.value)"></el-col>
<el-input v-model="item.name" style="width: 280px;" class="in_mc"></el-input>
</div>
@@ -27,112 +31,19 @@
<script >
import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Sign'
let socket;
export default {
name: "Sign",
mixins: [LanguageMixin],
data () {
return {
+ jsonData: data,
activeButton: '',
record: {
- //瀹氫箟鏁扮粍锛屽苟娣诲姞榛樿鍊�
- params: [1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,
- 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,],
- xyData: [
- { name: 'D01.SR dec', value: 1 },
- { name: "D01.SR in pos", value: 1 },
- { name: "D02.SR dec", value: 1 },
- { name: "D02.SR in pos", value: 1 },
- { name: "D03.SR into", value: 1 },
- { name: "D03.SR dec", value: 1 },
- { name: 'D03.SR in pos', value: 1 },
- { name: "D04.SR dec", value: 1 },
- { name: "D04.SR in pos", value: 1 },
- { name: "D05.SR dec", value: 1 },
- { name: "D05.SR in pos", value: 1 },
- { name: "D06.SR dec", value: 1 },
- { name: 'D06.SR in pos', value: 1 },
- { name: "B01.SR out dec", value: 1 },
- { name: "B01.SR out in pos", value: 1 },
- { name: "B01.SR in dec", value: 1 },
- { name: "B01.SR in in pos", value: 1 },
- { name: "B01.SR turn on", value: 1 },
- { name: 'B01.SR turn off', value: 1 },
- { name: "B01.SR up", value: 1 },
- { name: "B01.SR down", value: 1 },
- { name: "B02.SR out dec", value: 1 },
- { name: "B02.SR out in pos", value: 1 },
- { name: "B02.SR in dec", value: 1 },
- { name: 'B02.SR in in pos', value: 1 },
- { name: "B02.SR turn on", value: 1 },
- { name: "B02.SR turn off", value: 1 },
- { name: "B02.SR up", value: 1 },
- { name: "B02.SR down", value: 1 },
- { name: "B01.SR out safety", value: 1 },
- { name: "B01.SR in safety", value: 1 },
- { name: "B02.SR out safety", value: 1 },
- { name: "SB.start(+)", value: 1 },
- { name: "SB.stop(1)", value: 1 },
- { name: "SB.reset", value: 1 },
- { name: "SB.auto/manul", value: 1 },
- { name: "SB.pause", value: 1 },
- { name: "SB.emg", value: 1 },
- { name: "D01.SB.start", value: 1 },
- { name: "D06.SB.start", value: 1 },
- { name: "B02.SR in safety", value: 1 },
- { name: "SAFETYDOOR.requset", value: 1 },
- { name: "SAFETYDOOR.confirm", value: 1 },
- { name: "SAFETYDOOR.reset", value: 1 },
- { name: "LED.red", value: 1 },
- { name: "LED.green", value: 1 },
- { name: "LED.yellow", value: 1 },
- { name: "D01.LED.green", value: 1 },
- { name: "D06.LED.green", value: 1 },
- { name: "B01.YV.turn", value: 1 },
- { name: "B01.YV.up down", value: 1 },
- { name: "B01.YV.gassing", value: 1 },
- { name: "B02.YV.turn", value: 1 },
- { name: "B02.YV.up down", value: 1 },
- { name: "B02.YV.gassing", value: 1 },
- { name: "SAFETYDOOR.led", value: 1 },
- { name: "SAFETYDOOR.open", value: 1 },
-
- ],
- canshu: [
- 'D01.SR dec',
- 'D01.SR in pos',
- 'D02.SR dec',
- 'D02.SR in pos',
- 'D03.SR into',
- 'D03.SR dec',
- 'D03.SR in pos',
- 'D04.SR dec',
- 'D04.SR in pos',
- 'D05.SR dec',
- 'D05.SR in pos',
- 'D06.SR dec',
- 'D06.SR in pos',
- 'B01.SR out dec',
- 'B01.SR out in pos',
- 'B01.SR in dec',
- 'B01.SR in in pos',
- 'B01.SR turn on',
- 'B01.SR turn off',
- 'B01.SR up',
- 'B01.SR down',
- 'B02.SR out dec',
- 'B02.SR out in pos',
- 'B02.SR in dec',
- 'B02.SR in in pos',
- 'B02.SR turn on',
- 'B02.SR turn off',
- 'B02.SR up',
- 'B02.SR down',
- 'LED.red',
- 'LED.green',
- 'LED.yellow',
- ],
-
+ //瀹氫箟鏁扮粍
+ params: [],
+ xyData: [],
},
@@ -148,8 +59,16 @@
},
created () {
this.init();
+ //this.showdata();
},
methods: {
+ showdata () {
+ console.log(1111);
+ console.log(this.jsonData.sign[0].name);
+ // console.log(this.record.xyData);
+
+ },
+
onButtonClick () {
this.isButtonClicked = true; // 灏嗘寜閽鑹茶缃负钃濊壊
setTimeout(() => {
@@ -158,6 +77,7 @@
},
//鏍规嵁璇诲彇PLC鐨勫�硷紝鏍规嵁鍚嶇О鏀瑰彉棰滆壊
getStatusClass (zhuangtai) {
+ // console.log(this.record.xyData);
if (zhuangtai === 0) {
return "op";
}
@@ -191,18 +111,29 @@
//console.log("鏀跺埌鏁版嵁====" + msg.data);
let obj = JSON.parse(msg.data);
this.record.params[0] = obj.sig[0];
- for (let a = 0; a < this.record.params[0].length; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
- } else {
- this.record.xyData[a].value = this.record.params[0][a];
+ this.record.xyData = this.jsonData.sign;
- }
-
+ for (let a = 0; a < this.record.xyData.length; a++) {
+ this.record.xyData[a].value = this.record.params[0][a];
}
+
+ this.record.xyData = this.jsonData.sign.filter(item => {
+ return item.state != 0;
+ }
+
+ );
+
+
+ const language = this.$i18n.locale;
+ if (language === 'en-US') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.record.xyData];
+ }
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
}.bind(this);
//鍏抽棴浜嬩欢
@@ -215,6 +146,13 @@
}
}
},
+ //璇█杞崲
+ replaceChineseWithEnglish () {
+ const translation = this.$t('Signlang');
+
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value }; });
+ //console.log(translation);
+ }
}
}
@@ -301,4 +239,8 @@
.blue-button {
background-color: skyblue;
}
+
+.dark-theme {
+ display: none;
+}
</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/State.vue b/CanadaMes-ui/src/views/Electrical/State.vue
index bb0a133..e3a4a2d 100644
--- a/CanadaMes-ui/src/views/Electrical/State.vue
+++ b/CanadaMes-ui/src/views/Electrical/State.vue
@@ -16,16 +16,12 @@
</el-breadcrumb>
<div>{{ $t('State') }}</div>
-
-
<el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">
<div class="kuai_div" v-for="item in this.record.xyData" :key="item.name">
<el-input style="width: 60%;" class="in_mc" v-model="item.name" readonly></el-input>
<el-input v-model="item.value" readonly="readonly" style="width: 90px;"></el-input>
</div>
-
-
</el-form>
@@ -37,12 +33,14 @@
<script >
import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/State'
let socket;
export default {
name: "State",
mixins: [LanguageMixin],
data () {
return {
+ jsonData: data,
activeButton: '',
record: {
params: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1,],
@@ -111,11 +109,9 @@
this.record.params[0] = obj.sta[0];
//灏嗚鍙栧埌鐨凱LC鐨勬暟鎹紝涓庡畾涔夌殑xyData锛岀粍鍚堟垚鏂扮殑鏁扮粍
for (let a = 0; a < this.record.params[0].length; a++) {
- if (!this.record.xyData[a]) {
- this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };
- } else {
- this.record.xyData[a].value = this.record.params[0][a];
- }
+
+ this.record.xyData[a].name = this.jsonData.state[a].name;
+ this.record.xyData[a].value = this.record.params[0][a];
}
const language = this.$i18n.locale;
@@ -124,8 +120,8 @@
} else {
this.localizedRoles = [...this.record.xyData];
}
- //console.log(this.localizedRoles);
this.$forceUpdate();
+ this.replaceChineseWithEnglish();
}.bind(this);
//鍏抽棴浜嬩欢
@@ -141,8 +137,9 @@
//璇█杞崲
replaceChineseWithEnglish () {
const translation = this.$t('dvstate');
- this.record.xyData = this.record.xyData.map(item => { return { name: item.name, value: translation[item.value] || item.value }; });
- console.log(translation);
+ const translation1 = this.$t('Statelang');
+ this.record.xyData = this.record.xyData.map(item => { return { name: translation1[item.name] || item.name, value: translation[item.value] || item.value }; });
+ //console.log(translation);
},
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 69e2eed..f6c4317 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -111,9 +111,15 @@
top: 366px; */
}
-.orderbutton {
+.orderbutton1 {
position: absolute;
left: 1070px;
+ top: 70px;
+}
+
+.orderbutton2 {
+ position: absolute;
+ left: 1170px;
top: 70px;
}
@@ -204,29 +210,36 @@
<el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
<el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
<el-table-column :width="150" prop="glassId" :label="$t('Outfeed glass barcode')"></el-table-column>
- <el-table-column :width="130" prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="list" :label="$t('List No')"></el-table-column>
- <el-table-column prop="box" :label="$t('Box No')"></el-table-column>
+ <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
<el-table-column prop="lengthWidth" :label="$t('Dim')"></el-table-column>
<el-table-column :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task') }}</el-button>
+ @click="endtask(1, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ }}</el-button>
</template>
</el-table-column>
</el-table>
<el-table :data="this.tasklist2" border style="width: 100%">
<el-table-column :width="130" prop="cage" :label="$t('Cage No')"></el-table-column>
<el-table-column :width="130" prop="cell" :label="$t('Slot No')"></el-table-column>
- <el-table-column :width="150" prop="glassId" :label="$t('Infeed glass barcode鈥�')"></el-table-column>
- <el-table-column :width="130" prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="list" :label="$t('List No')"></el-table-column>
- <el-table-column prop="box" :label="$t('Box No')"></el-table-column>
- <el-table-column prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-table-column :width="150" prop="glassId" :labelf="$t('Infeed glass barcode')"></el-table-column>
+ <el-table-column :width="130" prop="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="lengthWidth" :label="$t('Dim')">
+ <template slot-scope='scope'>
+ {{ scope.row.north_glass_buffer1s.glasslength }}*{{ scope.row.north_glass_buffer1s.glassheight }}
+ </template>
+ </el-table-column>
+
<el-table-column :label="$t('Terminate Task')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task') }}</el-button>
+ @click="endtask(0, scope.row.glassId, scope.row.cell)">{{ $t('Terminate Task')
+ }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -274,7 +287,8 @@
<div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>
<div class="blocks-img2"></div>
<div class="blocks-img3"></div>
- <el-button class="orderbutton" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>
+ <el-button class="orderbutton1" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>
+ <el-button class="orderbutton2" type="primary" @click="showform6()">{{ $t('Production queue') }}</el-button>
<!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">
<div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"
@@ -304,22 +318,35 @@
</el-footer>
<el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
- <el-form-item :label="$t('Barcodid')">
+ <el-form-item :label="$t('Barcode')">
<el-input style="width:15%;" :placeholder="$t('Enter the glass barcode')" v-model="glassid"></el-input>
<el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
</el-form-item>
- <el-form-item :label="$t('order')">
- <el-input v-model="form.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form.listnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form.boxnumber" readonly autocomplete="off" />
</el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form.glasslengthMm" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form.glassheightMm" readonly autocomplete="off" />
+ </el-form-item>
+
</el-form>
<template #footer>
<span class="dialog-footer">
@@ -334,6 +361,79 @@
</template>
</el-dialog>
+ <el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
+ <el-form :model="form1" label-width="100px" style="padding-right: 30px">
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form1.order" autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Number')">
+ <el-input v-model="form1.number" autocomplete="off" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
+ <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
+ </span>
+ </template>
+ </el-dialog>
+
+ <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
+ <el-table :data="this.alarm" border style="width: 100%;">
+ <el-table-column prop="id" :label="$t('id')"></el-table-column>
+ <el-table-column prop="content" :label="$t('content')"></el-table-column>
+ <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
+ <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
+ </el-table>
+ </el-dialog>
+
+ <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
+ <el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
+ <el-table-column :width="90" prop="cage" :label="$t('Cage No')"></el-table-column>
+ <el-table-column :width="90" prop="cell" :label="$t('Slot No')"></el-table-column>
+ <el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
+ <el-table-column :width="100" prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
+ <el-table-column :width="100" prop="north_glass_buffer1s.listnumber"
+ :label="$t('List No')"></el-table-column>
+ <el-table-column :width="100" prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column :width="170" prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-table-column :width="280" :label="$t('Operate')">
+ <template slot-scope='scope'>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('Out') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">
+ {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>
+ <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
+ @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Increase')
+ }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-dialog>
+
+ <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
+ <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
+ <el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
+ <el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
+ " :height="700" border style="width: 100%;overflow: auto;">
+
+ <el-table-column prop="barcode" :label="$t('Barcode')"></el-table-column>
+ <el-table-column prop="ordernumber" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="listnumber" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>
+ <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
+ </el-table>
+ <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"
+ layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"
+ background style="float: right; margin-top: 20px">
+ </el-pagination>
+ </el-dialog>
<el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
<el-form :model="form" label-width="100px" style="padding-right: 30px">
<div style="display: flex;justify-content: space-around;">
@@ -363,59 +463,87 @@
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form2.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form2.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form4.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form4.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form3.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form3.barcode" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('Barcodid')">
- <el-input v-model="form5.glassId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Barcode')">
+ <el-input v-model="form5.barcode" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
- <el-form-item :label="$t('order')">
- <el-input v-model="form2.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form2.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('order')">
- <el-input v-model="form4.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form4.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('order')">
- <el-input v-model="form3.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form3.ordernumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('order')">
- <el-input v-model="form5.orderId" readonly autocomplete="off" />
+ <el-form-item :label="$t('Order No')">
+ <el-input v-model="form5.ordernumber" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
- <el-form-item :label="$t('length')">
- <el-input v-model="form2.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form2.listnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form4.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form4.listnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form3.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form3.listnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('length')">
- <el-input v-model="form5.height" readonly autocomplete="off" />
+ <el-form-item :label="$t('List No')">
+ <el-input v-model="form5.listnumber" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
- <el-form-item :label="$t('width')">
- <el-input v-model="form2.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form2.boxnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form4.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form4.boxnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form3.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form3.boxnumber" readonly autocomplete="off" />
</el-form-item>
- <el-form-item :label="$t('width')">
- <el-input v-model="form5.width" readonly autocomplete="off" />
+ <el-form-item :label="$t('Box No')">
+ <el-input v-model="form5.boxnumber" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form2.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form4.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form3.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Length')">
+ <el-input v-model="form5.glasslength" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form2.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form4.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form3.glassheight" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Width')">
+ <el-input v-model="form5.glassheight" readonly autocomplete="off" />
</el-form-item>
</div>
<div style="display: flex;justify-content: space-around;">
@@ -431,105 +559,76 @@
</el-form>
<template #footer>
<span class="dialog-footer">
-
<el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
</span>
</template>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
- <el-form :model="form1" label-width="100px" style="padding-right: 30px">
- <el-form-item :label="$t('order')">
- <el-input v-model="form1.order" autocomplete="off" />
- </el-form-item>
- <el-form-item :label="$t('number')">
- <el-input v-model="form1.number" autocomplete="off" />
- </el-form-item>
- </el-form>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>
- <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>
- </span>
- </template>
- </el-dialog>
- <el-dialog :visible.sync="dialogFormVisible2" :title="$t('Alarm Information')">
- <el-table :data="this.alarm" border style="width: 100%;">
- <el-table-column prop="id" :label="$t('id')"></el-table-column>
- <el-table-column prop="content" :label="$t('content')"></el-table-column>
- <el-table-column prop="timeons" :label="$t('timeon')"></el-table-column>
- <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>
- </el-table>
- </el-dialog>
- <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">
- <el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">
- <el-table-column :width="90" prop="cage" :label="$t('Cage No')"></el-table-column>
- <el-table-column :width="90" prop="cell" :label="$t('Slot No')"></el-table-column>
- <el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>
- <el-table-column :width="100" prop="glassId" :label="$t('Barcodid')"></el-table-column>
- <el-table-column :width="100" prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column :width="100" prop="list" :label="$t('List No')"></el-table-column>
- <el-table-column :width="100" prop="box" :label="$t('Box No')"></el-table-column>
- <el-table-column :width="170" prop="lengthWidth" :label="$t('Dim')"></el-table-column>
+ <el-dialog :visible.sync="dialogFormVisible6" :title="$t('Production queue')" top="5vh">
+ <el-button type="primary" @click="showform7()">{{ $t('Increase') }}</el-button>
+ <el-table :data="this.OutSlice" :height="700" border style="width: 100%;overflow: auto;">
+ <el-table-column prop="glassId" :label="$t('Barcode')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.ordernumber" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.listnumber" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="barCode" :label="$t('Frame No')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.glasslength" :label="$t('Length')"></el-table-column>
+ <el-table-column prop="north_glass_buffer1s.glassheight" :label="$t('Width')"></el-table-column>
<el-table-column :width="280" :label="$t('Operate')">
<template slot-scope='scope'>
<el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">
- {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>
- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
- @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('increase')
- }}</el-button>
+ @click="deleteproductionqueueglass(scope.row.id)">{{ $t('Delete') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
- <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">
- <el-input style="width:15%;" :placeholder="$t('Enter the Order No')" v-model="orderid"></el-input>
- <el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>
- <el-table :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
- " :height="700" border style="width: 100%;overflow: auto;">
- <el-table-column prop="glassId" :label="$t('Barcodid')"></el-table-column>
- <el-table-column prop="orderId" :label="$t('Order No')"></el-table-column>
- <el-table-column prop="width" :label="$t('length')"></el-table-column>
- <el-table-column prop="height" :label="$t('width')"></el-table-column>
- </el-table>
+ <el-dialog :visible.sync="dialogFormVisible7" :title="$t('Glass information corresponding to aluminum frame')"
+ top="5vh">
+ <el-input style="width:15%;" :placeholder="$t('Enter the Frame No')" v-model="framebarcode"></el-input>
+ <el-button type="primary" @click="showform7()">{{ $t('Query') }}</el-button>
+ <el-button type="primary" @click="addoutslice()">{{ $t('Increase') }}</el-button>
+ <el-table :data="this.AluminumFrame" :height="700" border style="width: 100%;overflow: auto;">
- <!-- <el-table :data="tableDatas.slice((currentPage - 1) * pagesize, currentPage * pagesize)
- " style="width: 100%">
- <el-table-column label="Date" prop="date"> </el-table-column>
- <el-table-column label="Name" prop="name"> </el-table-column>
- <el-table-column label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Edit</el-button>
- <el-button size="mini" type="danger"
- @click="handleDelete(scope.$index, scope.row)">Delete</el-button>
+ <el-table-column prop="barcode" :label="$t('Barcode')"></el-table-column>
+ <el-table-column prop="ordernumber" :label="$t('Order No')"></el-table-column>
+ <el-table-column prop="listnumber" :label="$t('List No')"></el-table-column>
+ <el-table-column prop="boxnumber" :label="$t('Box No')"></el-table-column>
+ <el-table-column prop="glasslength" :label="$t('Length')"></el-table-column>
+ <el-table-column prop="glassheight" :label="$t('Width')"></el-table-column>
+ <el-table-column prop="storageCage.cage" :label="$t('Cage No')"></el-table-column>
+ <el-table-column prop="storageCage.cell" :label="$t('Slot No')"></el-table-column>
+ <el-table-column prop="storageCage.tier" :label="$t('The Side')"></el-table-column>
+
+ <el-table-column prop="FrameNo" :label="$t('Frame No')"></el-table-column>
+
+ <el-table-column prop="Flip" :label="$t('Flip')"></el-table-column>
+ <el-table-column prop="out_slice.state" :label="$t('In the queue')">
+ <template slot-scope='scope'>
+ {{ scope.row.out_slice != null ? $t('Yes') : $t('No') }}
</template>
</el-table-column>
- </el-table> -->
-
- <!-- 琛ㄦ牸鍒嗛〉 -->
- <!-- pager-count pager-count灞炴�у彲浠ヨ缃渶澶ч〉鐮佹寜閽暟,瓒呭嚭鎶樺彔,榛樿涓�7-->
- <!-- 娉ㄦ剰锛氳嫢鏁版嵁鏄悗绔帴鍙ｈ繑鍥炵殑鍒欐鏃�:total="pageCount"-->
- <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"
- :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"
- layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"
- background style="float: right; margin-top: 20px">
- </el-pagination>
-
-
+
+ <el-table-column prop="storageCage.tier" :label="$t('In the cage')">
+ <template slot-scope='scope'>
+ {{ scope.row.storageCage != null ? $t('Yes') : $t('No') }}
+ </template>
+ </el-table-column>
+ <el-table-column :width="80" :label="$t('Operate')">
+ <template slot-scope='scope'>
+ <el-checkbox label="" :disabled="!(scope.row.storageCage != null&&scope.row.out_slice == null)" :checked="scope.row.isCheck" @change="CheckBoxchange(scope.row.barcode,$event)"></el-checkbox>
+ </template>
+ </el-table-column>
+ </el-table>
</el-dialog>
</el-container>
</template>
<script>
-//:disabled="scope.row.glassId > 0 || scope.row.disabled == 1 ? true : false"
+
import {
home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist,
- SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass
+ SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState, DeleteQueueGlass, SelectGlassNo,
+ SelectAluminumFrameInfoById, SelectProductionqueue, DeleteProductionQueueGlass, AddOutSliceS
} from "../../api/home";
@@ -552,40 +651,19 @@
dialogFormVisible3: false,
dialogFormVisible4: false,
dialogFormVisible5: false,
+ dialogFormVisible6: false,
+ dialogFormVisible7: false,
form: {
orderId: "",
glassId: "",
height: "",
width: ""
},
- form1: {
- order: "NG2210210",
- number: 800,
- },
- form2: {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- },
- form3: {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- },
- form4: {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- },
- form5: {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- },
+ form1: {},
+ form2: {},
+ form3: {},
+ form4: {},
+ form5: {},
alarm: [],
tableData: [],
cagelist1: [],
@@ -618,7 +696,10 @@
disabled1: false,
currentPage: 1, //榛樿鍒濆椤�
pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
- pageCount: 0
+ pageCount: 0,
+ OutSlice: [],
+ AluminumFrame: [],
+ framebarcode: ""
};
},
created() {
@@ -666,7 +747,9 @@
if (obj.zhuangtai != null) {
this.zhuangtai = obj.zhuangtai[0];
}
-
+ if(this.dialogFormVisible7==true){
+ this.showform7();
+ }
// this.glassid1 = obj.queid[0];
// if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 0) {
// this.state = false;
@@ -686,23 +769,14 @@
if (obj.form2 != null && obj.form2 != "") {
this.form2 = obj.form2[0];
} else {
- this.form2 = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
+ this.form2 = {};
}
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 1) {
this.form3 = obj.form3[0];
} else {
- this.form3 = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
+ this.form3 = {};
+
}
if (obj.form3 != null && obj.form3 != "" && obj.state[0] == 0) {
this.form5 = obj.form3[0];
@@ -844,11 +918,10 @@
//鏄剧ず璁㈠崟淇℃伅椤甸潰
showform1() {
if (this.order != "") {
- this.form1 =
- {
- order: "NG2210210",
- number: 800,
- };
+ SelectGlassNo(this.order).then(res => {
+ this.form1.order = this.order;
+ this.form1.number = res.data.count;
+ });
this.dialogFormVisible1 = true;
}
},
@@ -898,6 +971,7 @@
},
selectglassinfo() {
SelectGlass(this.orderid).then(res => {
+ this.currentPage = 1;
this.GlassInfo = res.data.glass;
});
},
@@ -906,6 +980,27 @@
this.GlassInfo = res.data.glass;
});
this.dialogFormVisible4 = true;
+ },
+ showform6() {
+ SelectProductionqueue().then(res => {
+ this.OutSlice = res.data.listoutslice;
+ });
+ this.dialogFormVisible6 = true;
+ },
+ showform7() {
+ SelectAluminumFrameInfoById(this.framebarcode).then(res => {
+ this.AluminumFrame = res.data.listAluminumFrame;
+ this.AluminumFrame.forEach(item => {
+ if(item.storageCage!=null&&item.out_slice==null){
+ item.isCheck = true;
+ }else{
+ item.isCheck = false;
+ }
+ item.Flip=res.data.flip;
+ item.FrameNo=this.framebarcode;
+ });
+ });
+ this.dialogFormVisible7 = true;
},
//鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel() {
@@ -956,6 +1051,7 @@
this.cage = cage;
SelectCageInfo(cage).then(res => {
this.cageinfo = res.data.cageinfo;
+ console.log(this.cageinfo)
this.dialogFormVisible3 = true;
});
},
@@ -1051,7 +1147,7 @@
//鎵嬪姩涓婄墖
FeedInglassid() {
Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {
- if (this.form.glassId != "") {
+ if (this.form.barcode != "") {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
this.dialogFormVisible = false;
@@ -1072,7 +1168,29 @@
}
});
},
- handleEdit(index, row) {
+ //鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ deleteproductionqueueglass(id) {
+ this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {
+ inputType: 'password',
+ inputPlaceholder: this.$t('Please enter the password'),
+ confirmButtonText: this.$t('Yes'),
+ cancelButtonText: this.$t('No'),
+ type: 'warning'
+ }).then(({ value }) => {
+ if (this.password == value) {
+ DeleteProductionQueueGlass(id).then(res => {
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: this.$t('Operation canceled')
+ });
+ });
+ }, handleEdit(index, row) {
console.log(index, row);
},
//琛ㄦ牸鍒犻櫎
@@ -1089,36 +1207,26 @@
},
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
InsertQueueGlass(parameter) {
- if (parameter == 1 && this.form5.glassId != "") {
- if (this.form5.glassId != this.form2.glassId) {
- InsertQueueGlassId(this.form5.glassId, 1).then(res => {
+ if (parameter == 1 && this.form5.barcode != "") {
+ if (this.form5.barcode != this.form2.barcode) {
+ InsertQueueGlassId(this.form5.barcode, 1).then(res => {
if (res.data.message == 200) {
- this.form5 = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
+ this.form5 = {};
this.$message.success(this.$t('Operation successful'));
- }else{
+ } else {
this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
}
});
} else {
this.$message.error(this.$t('The glass ID already exists in the loading queue'));
}
- } else if (parameter == 2 && this.form4.glassId != "") {
- if (this.form4.glassId != this.form3.glassId) {
- InsertQueueGlassId(this.form4.glassId, 2).then(res => {
+ } else if (parameter == 2 && this.form4.barcode != "") {
+ if (this.form4.barcode != this.form3.barcode) {
+ InsertQueueGlassId(this.form4.barcode, 2).then(res => {
if (res.data.message == 200) {
- this.form4 = {
- orderId: "",
- glassId: "",
- height: "",
- width: ""
- };
+ this.form4 = {};
this.$message.success(this.$t('Operation successful'));
- }else{
+ } else {
this.$message.error(this.$t('This glass ID already exists in the sorting cage'));
}
});
@@ -1152,6 +1260,36 @@
this.$message.success(this.$t('Operation successful'));
}
});
+ },
+ CheckBoxchange(glassid,isChecked){
+ this.AluminumFrame.forEach(item=>{item.barcode=glassid;item.isCheck=isChecked})
+ console.log(this.AluminumFrame);
+ },
+ addoutslice(){
+ // var AluminumFrames1=this.AluminumFrame.map(item=>{return item.barcode});
+ // var AluminumFrames2=this.AluminumFrame.map(item=>{return item.isCheck});
+ // var AluminumFrames3=this.AluminumFrame.map(item=>{return item.Flip});
+ var dats_=new Array();
+ this.AluminumFrame.forEach(item => {
+ var dats2_=new Array();
+ dats2_[0]=item.barcode;
+ dats2_[1]=item.isCheck;
+ dats2_[2]=item.Flip;
+ dats2_[3]=item.FrameNo;
+ dats2_[4]=item.glasslengthMm;
+ dats2_[5]=item.glassheightMm;
+ dats_[dats_.length]=dats2_;
+ });
+ console.log(dats_);
+ //var AluminumFrames=this.AluminumFrame.map((item)=>({barcode,isCheck,Flip}) );
+ // console.log(AluminumFrames1);
+ // console.log(AluminumFrames2);
+ // console.log(AluminumFrames3);
+ AddOutSliceS(dats_).then(res=>{
+ if (res.data.message == 200) {
+ this.$message.success(this.$t('Operation successful'));
+ }
+ });
}
}
}
diff --git a/springboot-vue3/pom.xml b/springboot-vue3/pom.xml
index 5c51982..32b4261 100644
--- a/springboot-vue3/pom.xml
+++ b/springboot-vue3/pom.xml
@@ -28,6 +28,18 @@
</properties>
<dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.10.0</version>
+ </dependency>
+ </dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -80,7 +92,7 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId>
- <version>1.8.0</version>
+ <version>1.8.0</version>
</dependency>
<!--mybatis-plus-->
<dependency>
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index c7c8b6a..b5023ae 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -38,6 +38,12 @@
spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ spianService.selectout("1145");
+ //spianService.selectAll2();
+ //澧炲姞闃熷垪琛ㄦ暟鎹�
+ //spianMapper.insertqueue("1",1,1500);
+
+
// 鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�,鍗曠嫭鏁版嵁婧�
// try {
@@ -48,12 +54,20 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
- // spianService.selectAll((short)257);
+
//鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.12", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
-
+ //娴嬭瘯鍚姩鑷畾涔塸rc鍊�
+ // List<Short> datas1List=new ArrayList<>();
+ // datas1List.add((short)1);
+ // List<Short> datas1ListState=new ArrayList<>();
+ // datas1List.add((short)0);
+ // List<Short> datas1ListState2=new ArrayList<>();
+ // datas1List.add((short)0);
+
+
if (datas1List != null && datas1ListState != null) {
// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
@@ -67,11 +81,11 @@
StringBuilder strId=new StringBuilder();
StringBuilder writedstrId=new StringBuilder();
- if(!inglassbegin&!exist1)
+ if(!inglassbegin&!exist1)//褰撹繘鐗囪溅涓嶇┖闂叉椂
{
inglassbegin=true;
}
- if(inglassbegin&exist1)
+ if(inglassbegin&exist1)//褰撹繘鐗囪溅绌洪棽鏃�
{
inglassbegin=false;
spianMapper.Updatetask(1, 0);//绔嬪嵆缁撴潫鏁版嵁搴撹〃涓殑涓婄墖浠诲姟
@@ -83,7 +97,7 @@
if (exist1 == true) {
//鑾峰彇宸蹭笅鍙戠殑杩涚墖id 涓巔lc璇锋眰鐨刬d浣滄瘮杈�
byte[] writedglassidbytes = S7control.getinstance().ReadByte("DB105.16", 1);
- if (writedglassidbytes != null) {
+ if (writedglassidbytes != null) { //
// 鑾峰彇鐜荤拑id
for (byte iditem : writedglassidbytes) {
writedstrId.append(iditem);
@@ -99,9 +113,15 @@
}
if(!writedstrId.toString().equals(strId.toString())) //宸茬粡涓嬪彂鐨刬d涓巔lc璇锋眰鐨刬d涓嶄竴鏍锋椂锛岃涓轰笉鏄噸澶嶇殑浠诲姟锛屾墠鎵ц涓嬪彂浠诲姟鎸囦护
{
- spianService.selectAll(strId.toString());
+
+ int glasslimit=1;//鍒ゆ柇鏄惁鏄鐗囦笂鐗�
+ if(glasslimit==1){
+ spianService.selectAll(strId.toString());
+ }else{
+ spianService.selectAll(strId.toString());
+ }
S7control.getinstance().WriteByte("DB105.16",datas1ListID);//娲惧彂杩涚墖id
-
+
}
//spianService.selectAll(Short.parseShort(strId.toString()));
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index d1109ac..bfdf656 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -1,65 +1,135 @@
package com.example.springboot.component;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
+import java.util.Arrays;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+
+import org.apache.commons.io.FileUtils;
public class PlcParameter extends Thread {
- @Override
- public void run() {
- while (this != null) {
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
+ String name = "";
+ Integer count = 0;
- List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
- List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
- JSONObject jsonObject = new JSONObject();
-// new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
- // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
- jsonObject.append("params", arraylist );
- jsonObject.append("state", state);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ public static String readFileToString(String filePath) throws IOException {
+ File file = new File(filePath);
+ return FileUtils.readFileToString(file, "UTF-8");
+ }
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
+ public void readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Parameter.json");
+ // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
+ InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
+ // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ while ((line = bufferedReader.readLine()) != null) {
+ str += line;
+ }
- String addressList = "DB100.0";
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- System.out.println("messages锛�" + messages);
- String[] parts = lastMessage.split(",");
- List<Short> messageValues = new ArrayList<>();
- for (String part : parts) {
- try {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
- String cleanedPart = part.replaceAll("[^0-9-]", "");
- short value = Short.parseShort(cleanedPart.trim());
- messageValues.add(value);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("address");
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
- e.printStackTrace();
- }
- }
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
- // 灏嗘秷鎭�煎啓鍏� PLC
- S7control.getinstance().WriteWord(addressList, messageValues);
- System.out.println("messageValues锛�" + messageValues);
- System.out.println("addressList锛�" + addressList);
- // 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
- }
- }
- }
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
+ }
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(500);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ this.readValue();
+ String PlcAddress = this.name;
+ Integer Plccount = this.count;
+
+ // System.out.println(stt);
+ // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
+ // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
+ Short[] values1 = { 1, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
+ List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+
+ Short[] values2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ List<Short> state = new ArrayList<>(Arrays.asList(values2));
+
+ JSONObject jsonObject = new JSONObject();
+ // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
+ // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
+
+ jsonObject.append("params", arraylist);
+ jsonObject.append("state", state);
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
+
+ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter");
+ if (webSocketServer != null) {
+ List<String> messages = webSocketServer.getMessages();
+
+ String addressList = "DB100.0";
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ System.out.println("messages锛�" + messages);
+ String[] parts = lastMessage.split(",");
+ List<Short> messageValues = new ArrayList<>();
+ for (String part : parts) {
+ try {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
+ String cleanedPart = part.replaceAll("[^0-9-]", "");
+ short value = Short.parseShort(cleanedPart.trim());
+ messageValues.add(value);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+
+ e.printStackTrace();
+ }
+ }
+
+ // 灏嗘秷鎭�煎啓鍏� PLC
+ S7control.getinstance().WriteWord(addressList, messageValues);
+ System.out.println("messageValues锛�" + messageValues);
+ System.out.println("addressList锛�" + addressList);
+ // 娓呯┖娑堟伅鍒楄〃
+ webSocketServer.clearMessages();
+ }
+ }
+ }
+ }
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index 17b9d6d..f601cbb 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -1,12 +1,61 @@
package com.example.springboot.component;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class Plcaction extends Thread {
+ String name = "";
+ Integer count = 0;
+
+ public void readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Action.json");
+ // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
+ InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
+ // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ while ((line = bufferedReader.readLine()) != null) {
+ str += line;
+ }
+
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
+
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("address");
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
+
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
+
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
@Override
public void run() {
while (this != null) {
@@ -16,23 +65,27 @@
e.printStackTrace();
}
-// List<Boolean> paramlist = S7control.getinstance().ReadBits("DB100.DBW", 12);
-////
-// JSONObject jsonObject = new JSONObject();
-// jsonObject.append("params", new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0});
+ // 璋冪敤鏂规硶锛岃繘琛岃祴鍊�
+ this.readValue();
+ String PlcAddress = this.name;
+ Integer Plccount = this.count;
+ // System.out.println(PlcAddress);
- List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
-// Boolean[] values = {true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,true, true,false, true};
-// List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
- if (paramlist == null) {
+ // List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
+ Boolean[] values = { false, true, true, true, true, true, true, true, true,
+ true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+ true, false, true };
+ List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
- } else {
+ if (paramlist != null) {
+
short[] params = new short[paramlist.size()];
for (int i = 0; i < paramlist.size(); i++) {
boolean value = paramlist.get(i);
params[i] = value ? (short) 1 : (short) 0;
}
+
JSONObject jsonObject = new JSONObject();
jsonObject.append("params", params);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("action");
@@ -41,42 +94,41 @@
}
}
-
WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("action");
if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
+ List<String> messages = webSocketServer.getMessages();
- String addressList = "DB2.0.0";
+ String addressList = "DB2.0.0";
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- System.out.println("messages锛�" + messages);
- String[] parts = lastMessage.split(",");
- List<Integer> messageValues = new ArrayList<>();
- for (String part : parts) {
- try {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
- String cleanedPart = part.replaceAll("[^0-9-]", "");
- Integer value = Integer.parseInt(cleanedPart.trim());
- messageValues.add(value);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
- e.printStackTrace();
- }
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ System.out.println("messages锛�" + messages);
+ String[] parts = lastMessage.split(",");
+ List<Integer> messageValues = new ArrayList<>();
+ for (String part : parts) {
+ try {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
+ String cleanedPart = part.replaceAll("[^0-9-]", "");
+ Integer value = Integer.parseInt(cleanedPart.trim());
+ messageValues.add(value);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
+ e.printStackTrace();
}
+ }
- // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
- List<Boolean> messageBooleans = new ArrayList<>();
- for (Integer value : messageValues) {
- messageBooleans.add(value == 1 ? true : false);
- }
+ // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
+ List<Boolean> messageBooleans = new ArrayList<>();
+ for (Integer value : messageValues) {
+ messageBooleans.add(value == 1 ? true : false);
+ }
- // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
- S7control.getinstance().WriteBit(addressList, messageBooleans);
- System.out.println("messageValues锛�" + messageBooleans);
- System.out.println("addressList锛�" + addressList);
+ // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
+ S7control.getinstance().WriteBit(addressList, messageBooleans);
+ System.out.println("messageValues锛�" + messageBooleans);
+ System.out.println("addressList锛�" + addressList);
// 娓呯┖娑堟伅鍒楄〃
webSocketServer.clearMessages();
}
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 cf088ab..60f5831 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,18 +1,10 @@
package com.example.springboot.component;
import cn.hutool.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-
-import org.springframework.web.bind.annotation.PostMapping;
-
-import com.example.springboot.common.Result;
-import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
+import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.JdbcConnections;
@@ -45,12 +37,18 @@
List<StorageCage> cagelist3 = homeMapper.selectRack3();
List<StorageCage> cagelist4 = homeMapper.selectRack4();
jsonObject.append("cagelist1", cagelist1);
- jsonObject.append("cagelist2", (Object) cagelist2);
+ jsonObject.append("cagelist2", cagelist2);
jsonObject.append("cagelist3", cagelist3);
jsonObject.append("cagelist4", cagelist4);
// 杩涘嚭鐗囦换鍔�
List<StorageCage> tasklist1 = homeMapper.selectinout(3);
List<StorageCage> tasklist2 = homeMapper.selectinout(2);
+ for (StorageCage storageCage : tasklist1) {
+ storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ }
+ for (StorageCage storageCage : tasklist2) {
+ storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
+ }
jsonObject.append("tasklist1", tasklist1);
jsonObject.append("tasklist2", tasklist2);
// 鏌ヨ鎶ヨ淇℃伅
@@ -62,17 +60,18 @@
// addressList.add("DB106.0");
// List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
// if (paramlist != null) {
- // jsonObject.append("params", paramlist);
+ // jsonObject.append("params", paramlist);
// }
// // 鑾峰彇杩涚墖杞︾姸鎬�
- // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
+ // 1);// 鑾峰彇杩涚墖杞︾姸鎬�
// 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);
+ // if (inglassInfo.size() > 0)
+ // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
// }
// 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
String queid = spianMapper.Selectqueueid();
@@ -80,8 +79,10 @@
jsonObject.append("queid", queid);
jsonObject.append("state", state);
// 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- Glass form2 = homeMapper.GetQueueInfo(2);
- Glass form3 = homeMapper.GetQueueInfo(1);
+ String queueglassid2 = homeMapper.GetQueueInfo(2);
+ String queueglassid1 = homeMapper.GetQueueInfo(1);
+ north_glass_buffer1 form2 = homeMapper.SelectGlassByGlassID(queueglassid2);
+ north_glass_buffer1 form3 = homeMapper.SelectGlassByGlassID(queueglassid1);
jsonObject.append("form2", form2);
jsonObject.append("form3", form3);
// List<Short> paramlists = new ArrayList<Short>();
@@ -91,7 +92,6 @@
// paramlists.add(para2);
// System.out.println(paramlists);
-
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
try {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index f91920e..0e503c4 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -1,12 +1,61 @@
package com.example.springboot.component;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
public class Plcsign extends Thread {
+ String name = "";
+ Integer count = 0;
+
+ public void readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/Sign.json");
+ // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
+ InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
+ // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ while ((line = bufferedReader.readLine()) != null) {
+ str += line;
+ }
+
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
+
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("address");
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
+
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
+
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
@Override
public void run() {
while (this != null) {
@@ -16,30 +65,32 @@
e.printStackTrace();
}
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
- List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
+ this.readValue();
+ String PlcAddress = this.name;
+ Integer Plccount = this.count;
+ // System.out.println(PlcAddress);
- // Boolean[] values = { true, false, true, false, true, false, true, false,
- // true, false, true, false, true, false,
- // true, false, true, false, true, false, true, false, true, false, true, false,
- // true, false, true, false, true,
- // false, true, false, true, false,
- // true, false, true, false, true, false, true, false, };
- // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+ // List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44);
+ // List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
- // Boolean[] values2 = { true, false,
- // true, false, true, false, true, false,
- // true, false, true, false, true, };
- // List<Boolean> plclist2 = new ArrayList<>(Arrays.asList(values2));
+ Boolean[] values = { true, true, true, true, true, false, true, false,
+ true, false, true, false, true, false,
+ true, false, true, false, true, false, true, false, true, false, true, false,
+ true, false, true, false, true,
+ false, true, false, true, false,
+ true, false, true, false, true, false, true, false, null,
+ true, false,
+ true, false, true, false, true, false,
+ true, false, true, false, true, };
+ List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
- // 灏唒lclist2鐨勫厓绱犳坊鍔犲埌plclist涓�
- plclist.addAll(plclist2);
- // System.out.println(plclist);
if (plclist != null) {
// 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
List<Integer> Intlist = new ArrayList<>();
for (Boolean value : plclist) {
- Intlist.add(value == true ? 0 : 1);
+ if (value != null) {
+ Intlist.add(value == true ? 0 : 1);
+ }
}
JSONObject jsonObject = new JSONObject();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index a539781..61c28f0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -1,12 +1,61 @@
package com.example.springboot.component;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
public class Plcstate extends Thread {
+ String name = "";
+ Integer count = 0;
+
+ public void readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/State.json");
+ // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
+ InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
+ // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ while ((line = bufferedReader.readLine()) != null) {
+ str += line;
+ }
+
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
+
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("address");
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
+
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
+
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
@Override
public void run() {
while (this != null) {
@@ -16,10 +65,15 @@
e.printStackTrace();
}
- List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
- // Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
- // 1, 0, };
- // List<Short> plclist = new ArrayList<>(Arrays.asList(values));
+ this.readValue();
+ String PlcAddress = this.name;
+ Integer Plccount = this.count;
+ // System.out.println(PlcAddress);
+
+ // List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
+ Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+ 1, 0, };
+ List<Short> plclist = new ArrayList<>(Arrays.asList(values));
if (plclist != null) {
List<String> Intlist = new ArrayList<>();
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 fa0b7d6..9eaa9f7 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
@@ -27,16 +27,16 @@
// new PlcHold().start();
- new Plcaction().start();
+ // new Plcaction().start();
new Plchome().start();
- new PlcParameter().start();
+ // new PlcParameter().start();
- new Plcalarm().start();
+ // new Plcalarm().start();
- new Plcsign().start();
+ // new Plcsign().start();
- new Plcstate().start();
+ // new Plcstate().start();
}
}
\ No newline at end of file
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 3840f68..c773316 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
@@ -1,253 +1,375 @@
package com.example.springboot.controller;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.logging.log4j.util.PropertySource.Comparator;
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
+import com.example.springboot.service.MultiFieldComparator;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
import com.example.springboot.entity.CarPosition;
-import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
+import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.entity.Out_slice;
import org.springframework.web.bind.annotation.*;
+
@RestController
@RequestMapping("/home")
public class HomeController {
- @Autowired
- HomeMapper homeMapper;
+ @Autowired
+ HomeMapper homeMapper;
- @Autowired
- HomeService storageRackService;
+ @Autowired
+ HomeService storageRackService;
- @Autowired
- SpianService spianService;
+ @Autowired
+ SpianService spianService;
- @Autowired
- SpianMapper spianMapper;
-
- //鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
- @GetMapping("/load")
- public Result selectAll() {
- List<StorageCage> storageCagelist = homeMapper.selectAll();
- Map<String, Object> map = new HashMap<>();
- map.put("list", storageCagelist);
- return Result.success(map);
- }
- //鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
- @GetMapping("/loads")
- public Result selectRack() {
- List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
- List<StorageCage> storageCagelist2 = homeMapper.selectRack2();
- List<StorageCage> storageCagelist3 = homeMapper.selectRack3();
- List<StorageCage> storageCagelist4 = homeMapper.selectRack4();
- Map<String, Object> map = new HashMap<>();
- map.put("list1", storageCagelist1);
- map.put("list2", storageCagelist2);
- map.put("list3", storageCagelist3);
- map.put("list4", storageCagelist4);
- return Result.success(map);
- }
- //鏌ヨ杩�/鍑虹墖浠诲姟
- @GetMapping("/loadinout")
- public Result selectinout(Integer types) {
- List<StorageCage> storageCageinout = homeMapper.selectinout(types);
- Map<String, Object> map = new HashMap<>();
- map.put("list", storageCageinout);
- return Result.success(map);
- }
- //鎸夎鍗曞嚭鐗�
- @GetMapping("/InsertOrder")
- public Result InsertOrder(String orderid) {
- short result = homeMapper.SelectOrder(orderid);
- Map<String, Object> map = new HashMap<>();
- if (result > 0) {
- homeMapper.updateOrder();
- homeMapper.InsertOrder(orderid);
- map.put("message", "200");
- } else {
- map.put("message", "500");
- }
- return Result.success(map);
- }
- //鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
- @GetMapping("/Addglassid")
- public Result Addglassid(String glassid) {
- Map<String, Object> map = new HashMap<>();
- short taskno = homeMapper.SelectInTask();
- if (taskno > 0) {
- map.put("message2", "500");
- } else {
- // 璋冪敤浼嶄笂鐗囧嚱鏁�
- short results = spianService.selectAll(glassid);
- if (results == 200) {
- map.put("message2", "200");
- } else if (results == 300) {
- map.put("message2", "300");
- } else if (results == 400) {
- map.put("message2", "400");
- }
- }
- return Result.success(map);
- }
- //鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟
- @GetMapping("/UpdateTask")
- public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
- Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types);
- StorageCage glass = homeMapper.SelectGlassInfo(glassid);
- if (types == 0) {
- // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
- homeMapper.UpdateCageTask1(glassid);
- S7control.getinstance().WriteWord("DB105.14", (short) 0);
- } else {
+ @Autowired
+ SpianMapper spianMapper;
- spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
- homeMapper.UpdateCageTask2(glassid);
- S7control.getinstance().WriteWord("DB105.12", (short) 0);
- }
- map.put("message3", "200");
- return Result.success(map);
- }
- //鏌ヨ鎶ヨ淇℃伅
- @GetMapping("/SelectAlarmmgInfo")
- public Result SelectAlarmmgInfo() {
- List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
- Map<String, Object> map = new HashMap<>();
- map.put("alarmmg", alarmmg);
- return Result.success(map);
- }
- //鏌ヨ鐞嗙墖绗艰鎯�
- @GetMapping("/SelectCageInfo")
- public Result SelectCageInfo(short cage) {
- List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
- Map<String, Object> map = new HashMap<>();
- map.put("cageinfo", cageinfo);
- return Result.success(map);
- }
- //鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
- @GetMapping("/DeleteByGlassID")
- public Result DeleteByGlassID(String glassid) {
- StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
- spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
- homeMapper.DeleteByGlassID(glassid);
- Map<String, Object> map = new HashMap<>();
- map.put("message3", "200");
- return Result.success(map);
- }
- //鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
- @GetMapping("/OutByGlassID")
- public Result OutByGlassID(String glassid) {
- Map<String, Object> map = new HashMap<>();
- // 璋冪敤浼嶄笂鐗囧嚱鏁�
- short result = homeMapper.SelectStorageByGlassId(glassid);
- if (result > 0) {
- Short results = spianService.selectout2(glassid);
- if (results == 200) {
- map.put("message2", "200");
- } else if (results == 300) {
- map.put("message2", "300");
- }
- }else{
- map.put("message2", "500");
- }
+ // 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
+ @GetMapping("/load")
+ public Result selectAll() {
+ List<StorageCage> storageCagelist = homeMapper.selectAll();
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", storageCagelist);
+ return Result.success(map);
+ }
- return Result.success(map);
+ // 鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
+ @GetMapping("/loads")
+ public Result selectRack() {
+ List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
+ List<StorageCage> storageCagelist2 = homeMapper.selectRack2();
+ List<StorageCage> storageCagelist3 = homeMapper.selectRack3();
+ List<StorageCage> storageCagelist4 = homeMapper.selectRack4();
+ Map<String, Object> map = new HashMap<>();
+ map.put("list1", storageCagelist1);
+ map.put("list2", storageCagelist2);
+ map.put("list3", storageCagelist3);
+ map.put("list4", storageCagelist4);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ杩�/鍑虹墖浠诲姟
+ @GetMapping("/loadinout")
+ public Result selectinout(Integer types) {
+ List<StorageCage> storageCageinout = homeMapper.selectinout(types);
+ for (StorageCage storageCage : storageCageinout) {
+ storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
}
- //鍔犺浇灏忚溅浣嶇疆
- @GetMapping("/Loadcarlist")
- public Result Loadcarlist() {
- List<CarPosition> carlist = homeMapper.Loadcarlist();
- Map<String, Object> map = new HashMap<>();
- map.put("carlist", carlist);
- return Result.success(map);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", storageCageinout);
+ return Result.success(map);
+ }
+
+ // 鎸夎鍗曞嚭鐗�
+ @GetMapping("/InsertOrder")
+ public Result InsertOrder(String orderid) {
+ short result = homeMapper.SelectOrder(orderid);
+ Map<String, Object> map = new HashMap<>();
+ if (result > 0) {
+ homeMapper.updateOrder();
+ homeMapper.InsertOrder(orderid);
+ map.put("message", "200");
+ } else {
+ map.put("message", "500");
}
- //鏌ヨ纭瀵嗙爜
- @GetMapping("/SelectPassword")
- public Result SelectPassword() {
- String pwdct = homeMapper.SelectPassword();
- Map<String, Object> map = new HashMap<>();
- map.put("password", pwdct);
- return Result.success(map);
+ return Result.success(map);
+ }
+
+ // 鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
+ @GetMapping("/Addglassid")
+ public Result Addglassid(String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ short taskno = homeMapper.SelectInTask();
+ if (taskno > 0) {
+ map.put("message2", "500");
+ } else {
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ short results = spianService.selectAll(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ } else if (results == 400) {
+ map.put("message2", "400");
+ }
}
- //鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
- @GetMapping("/SelectGlassByGlassID")
- public Result SelectGlassByGlassID(String glassid) {
- Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
- Map<String, Object> map = new HashMap<>();
- map.put("form", Glass);
- return Result.success(map);
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟
+ @GetMapping("/UpdateTask")
+ public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ homeMapper.UpdateTask(types);
+ StorageCage glass = homeMapper.SelectGlassInfo(glassid);
+ if (types == 0) {
+ homeMapper.UpdateCageTask1(glassid);
+ S7control.getinstance().WriteWord("DB105.14", (short) 0);
+ } else {
+ spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+ homeMapper.UpdateCageTask2(glassid);
+ S7control.getinstance().WriteWord("DB105.12", (short) 0);
}
- //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
- @GetMapping("/Disabled")
- public Result Disabled(short cage, short cell, short disabled) {
- homeMapper.Disabled(cage, cell, disabled);
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
+ map.put("message3", "200");
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鎶ヨ淇℃伅
+ @GetMapping("/SelectAlarmmgInfo")
+ public Result SelectAlarmmgInfo() {
+ List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
+ Map<String, Object> map = new HashMap<>();
+ map.put("alarmmg", alarmmg);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鐞嗙墖绗艰鎯�
+ @GetMapping("/SelectCageInfo")
+ public Result SelectCageInfo(short cage) {
+ List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
+ for (StorageCage storageCage : cageinfo) {
+ storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
}
- //鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
- @PostMapping("/Inglassid")
- public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
- Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
- if (result > 0) {
- map.put("message", "300");
- } else {
- homeMapper.Inglassid(glass, cage, cell, tier);
- spianMapper.UpdataAddCage1(glass.getwidth(), cage, cell);
- }
- return Result.success(map);
+ Map<String, Object> map = new HashMap<>();
+ map.put("cageinfo", cageinfo);
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
+ @GetMapping("/DeleteByGlassID")
+ public Result DeleteByGlassID(String glassid) {
+ StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
+ spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
+ homeMapper.DeleteByGlassID(glassid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message3", "200");
+ return Result.success(map);
+ }
+
+ // 鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
+ @GetMapping("/OutByGlassID")
+ public Result OutByGlassID(String glassid) {
+ Map<String, Object> map = new HashMap<>();
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ short result = homeMapper.SelectStorageByGlassId(glassid);
+ if (result > 0) {
+ Short results = spianService.selectout2(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ }
+ } else {
+ map.put("message2", "500");
}
- //鏌ヨ鐜荤拑淇℃伅
- @PostMapping("/SelectGlass")
- public Result SelectGlass(String orderid) {
- Map<String, Object> map = new HashMap<>();
- List<Glass> glass=homeMapper.SelectGlass(orderid);
- map.put("glass", glass);
- return Result.success(map);
- }
+ return Result.success(map);
+ }
- //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
- @PostMapping("/InsertQueueGlassId")
- public Result InsertQueueGlassId(String glassid,Short id) {
- Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(glassid);
- if (result > 0) {
- map.put("message", "300");
- }else{
- homeMapper.InsertQueueGlassId(glassid,id);
- map.put("message", "200");
- }
- return Result.success(map);
+ // 鍔犺浇灏忚溅浣嶇疆
+ @GetMapping("/Loadcarlist")
+ public Result Loadcarlist() {
+ List<CarPosition> carlist = homeMapper.Loadcarlist();
+ Map<String, Object> map = new HashMap<>();
+ map.put("carlist", carlist);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ纭瀵嗙爜
+ @GetMapping("/SelectPassword")
+ public Result SelectPassword() {
+ String pwdct = homeMapper.SelectPassword();
+ Map<String, Object> map = new HashMap<>();
+ map.put("password", pwdct);
+ return Result.success(map);
+ }
+
+ // 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
+ @GetMapping("/SelectGlassByGlassID")
+ public Result SelectGlassByGlassID(String glassid) {
+ north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("form", north_glass_buffer1s);
+ return Result.success(map);
+ }
+
+ // 鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
+ @GetMapping("/Disabled")
+ public Result Disabled(short cage, short cell, short disabled) {
+ homeMapper.Disabled(cage, cell, disabled);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
+ @PostMapping("/Inglassid")
+ public Result Inglassid(short cage, short cell, short tier, @RequestBody north_glass_buffer1 north_glass_buffer1s) {
+ Map<String, Object> map = new HashMap<>();
+ short result = homeMapper.SelectStorageByGlassId(north_glass_buffer1s.getbarcode());
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
+ spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage, cell);
+ }
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鐜荤拑淇℃伅
+ @PostMapping("/SelectGlass")
+ public Result SelectGlass(String orderid) {
+ Map<String, Object> map = new HashMap<>();
+ List<north_glass_buffer1> glass = homeMapper.SelectGlass(orderid);
+ map.put("glass", glass);
+ return Result.success(map);
+ }
+
+ // 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ @PostMapping("/InsertQueueGlassId")
+ public Result InsertQueueGlassId(String glassid, Short id) {
+ Map<String, Object> map = new HashMap<>();
+ short result = homeMapper.SelectStorageByGlassId(glassid);
+ if (result > 0) {
+ map.put("message", "300");
+ } else {
+ homeMapper.InsertQueueGlassId(glassid, id);
+ //璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianMapper.selectAll(glassid);
+ map.put("message", "200");
+ }
+ return Result.success(map);
+ }
+
+ // 纭鎵爜浣嶇幓鐠冧俊鎭�
+ @PostMapping("/UpdateQueueState")
+ public Result UpdateQueueState() {
+ homeMapper.UpdateQueueState();
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 娓呴櫎涓婄墖闃熷垪鐜荤拑
+ @PostMapping("/DeleteQueueGlass")
+ public Result DeleteQueueGlass(String id) {
+ homeMapper.DeleteQueueGlass(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
+ @PostMapping("/SelectGlassNo")
+ public Result SelectGlassNo(String orderid) {
+ Short count = homeMapper.SelectGlassNo(orderid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("count", count);
+ return Result.success(map);
+ }
+
+ // 鏍规嵁閾濇id鑾峰彇瀵瑰簲鐜荤拑淇℃伅
+ @PostMapping("/SelectAluminumFrameInfoById")
+ public Result SelectAluminumFrameInfoById(String FrameBarcode) {
+ List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
+ String flip=homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
+ for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
+ north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
+ north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("listAluminumFrame", listAluminumFrame);
+ map.put("flip", flip);
+ return Result.success(map);
+ }
+
+
+
+ // 鏌ヨ鍑虹墖闃熷垪鏁版嵁
+ @PostMapping("/SelectProductionqueue")
+ public Result SelectProductionqueue() {
+ List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
+ for (Out_slice out_slice : listoutslice) {
+ out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(out_slice.getGlassId()));
+ out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
- //纭鎵爜浣嶇幓鐠冧俊鎭�
- @PostMapping("/UpdateQueueState")
- public Result UpdateQueueState() {
- homeMapper.UpdateQueueState();
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
- }
+ //HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
+ // HashMap map=new HashMap<>();
+ // for (Out_slice out_slice : listoutslice) {
+ // String key_=out_slice.getState()+"-";
+ // if (map.get(key_)==null) {
+ // List<Out_slice> lists=new ArrayList<Out_slice>();
+ // lists.add(out_slice);
+ // map.put(key_, lists);
+ // }else{
+ // List<Out_slice> lists=(List<Out_slice>)map.get(key_);
+ // lists.add(out_slice);
+ // map.put(key_,lists);
+ // }
+ // }
+ // System.out.println(map);
- //娓呴櫎涓婄墖闃熷垪鐜荤拑
- @PostMapping("/DeleteQueueGlass")
- public Result DeleteQueueGlass(String id) {
- homeMapper.DeleteQueueGlass(id);
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- return Result.success(map);
+ // List<Out_slice> listskey=(List<Out_slice>)map.get("1-");
+ // List<Out_slice> list=new ArrayList<Out_slice>();
+ // for (Out_slice out_slice : listskey) {
+ // if (list.isEmpty()) {
+ // list.add(out_slice);
+ // }else{
+ // for (int i=0;i<list.size();i++) {
+ // Out_slice out_slice2=list.get(i);
+ // if(out_slice.getID()>out_slice2.getID()){
+ // continue;
+ // }else{
+ // list.add(i,out_slice2);
+ // }
+ // }
+ // }
+ // }
+ //Collections.sort(listoutslice,new MultiFieldComparator());
+
+ Map<String, Object> maps = new HashMap<>();
+ maps.put("listoutslice", listoutslice);
+ return Result.success(maps);
+ }
+
+ // 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ @PostMapping("/DeleteProductionQueueGlass")
+ public Result DeleteProductionQueueGlass(Short id) {
+ homeMapper.DeleteProductionQueueGlass(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ //
+ @PostMapping("/AddOutSliceS")
+ public Result AddOutSliceS(@RequestBody String[][] AluminumFrames ) {
+ for (String[] item : AluminumFrames) {
+ if(item[1]=="true"){
+ homeMapper.AddOutSliceS(item[0],item[2],item[3],item[4],item[5]);
+ }
}
-
-
+ System.out.println(AluminumFrames);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
index f66d895..1e448ec 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
@@ -1,57 +1,58 @@
package com.example.springboot.entity;
-public class Glass{
- private Integer id;
- private String orderId;
- private double width;
- private double height;
- private String glassId;
-
-
+public class Glass {
+ private Integer id;
+ private String orderId;
+ private double width;
+ private double height;
+ private String glassId;
- public Integer id() {
- return id;
- }
- public void setId(Integer id) {
- this.id = id;
- }
- public Integer getId() {
- return id;
- }
+ public Integer id() {
+ return id;
+ }
- public String getOrderId() {
- return orderId;
- }
+ public void setId(Integer id) {
+ this.id = id;
+ }
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
-
- public double getwidth() {
- return width;
- }
+ public Integer getId() {
+ return id;
+ }
- public void setHeight(double height) {
- this.height = height;
- }
+ public String getOrderId() {
+ return orderId;
+ }
- public double getHeight() {
- return height;
- }
+ public void setOrderId(String orderId) {
+ this.orderId = orderId;
+ }
- public void setWidth(double width) {
- this.width = width;
- }
+ public double getwidth() {
+ return width;
+ }
- public String getGlassId() {
- return glassId;
- }
+ public void setHeight(double height) {
+ this.height = height;
+ }
- public void setGlassId(String glassId) {
- this.glassId = glassId;
- }
+ public double getHeight() {
+ return height;
+ }
-
-
+ public void setWidth(double width) {
+ this.width = width;
+ }
+
+ public void getWidth(double width) {
+ this.width = width;
+ }
+
+ public String getGlassId() {
+ return glassId;
+ }
+
+ public void setGlassId(String glassId) {
+ this.glassId = glassId;
+ }
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java b/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java
new file mode 100644
index 0000000..84e3004
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java
@@ -0,0 +1,101 @@
+package com.example.springboot.entity;
+
+public class Out_slice {
+ private int id;
+ private String glassId;
+ private String barcode;
+ private double glasswidth;
+ private double glassheight;
+ private int state;
+ private String time;
+
+ private north_glass_buffer1 north_glass_buffer1s;
+
+ public void setnorth_glass_buffer1s(north_glass_buffer1 north_glass_buffer1s) {
+ this.north_glass_buffer1s = north_glass_buffer1s;
+ }
+
+ public north_glass_buffer1 getnorth_glass_buffer1s() {
+ return north_glass_buffer1s;
+ }
+
+ private StorageCage storageCage;
+
+ public void setstorageCage(StorageCage storageCage) {
+ this.storageCage = storageCage;
+ }
+
+ public StorageCage getstorageCage() {
+ return storageCage;
+ }
+
+ public Out_slice() {
+ }
+
+ public Out_slice(int ID, String glassId, String barCode, double glasswidth, double glassheight, int state, String time) {
+ this.id = ID;
+ this.glassId = glassId;
+ this.barcode = barCode;
+ this.glasswidth = glasswidth;
+ this.glassheight = glassheight;
+ this.state = state;
+ this.time = time;
+ }
+
+ public int getID() {
+ return id;
+ }
+
+ public String getGlassId() {
+ return glassId;
+ }
+
+ public String getBarCode() {
+ return barcode;
+ }
+
+ public double getGlasswidth() {
+ return glasswidth;
+ }
+
+ public double getGlassheight() {
+ return glassheight;
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setID(int ID) {
+ this.id = ID;
+ }
+
+ public void setGlassId(String glassId) {
+ this.glassId = glassId;
+ }
+
+public void setBarCode(String barCode) {
+ barcode = barCode;
+ }
+
+ public void setGlasswidth(double glasswidth) {
+ this.glasswidth = glasswidth;
+ }
+
+ public void setGlassheight(double glassheight) {
+ this.glassheight = glassheight;
+ }
+
+ public void setState(int state) {
+ this.state = state;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
index 2c952ab..30e8ff6 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java
@@ -1,5 +1,7 @@
package com.example.springboot.entity;
+
+
public class StorageCage {
private Integer id;
private Integer prcId;
@@ -14,6 +16,28 @@
private String orderId;
private Integer disabled;
private String lengthWidth;
+ private String listno;
+ private String boxno;
+
+ private north_glass_buffer1 north_glass_buffer1s;
+
+ public void setnorth_glass_buffer1s(north_glass_buffer1 north_glass_buffer1s) {
+ this.north_glass_buffer1s = north_glass_buffer1s;
+ }
+
+ public north_glass_buffer1 getnorth_glass_buffer1s() {
+ return north_glass_buffer1s;
+ }
+
+ private Out_slice outSlice;
+
+ public void setout_slice(Out_slice outSlice) {
+ this.outSlice = outSlice;
+ }
+
+ public Out_slice getout_slice() {
+ return outSlice;
+ }
public Integer id() {
return id;
@@ -122,4 +146,22 @@
public void setLengthWidth(String lengthWidth) {
this.lengthWidth = lengthWidth;
}
+
+ public String getListno() {
+ return listno;
+ }
+
+ public void setListno(String listno) {
+ this.listno = listno;
+ }
+
+ public String getBoxno() {
+ return boxno;
+ }
+
+ public void setBoxno(String boxno) {
+ this.boxno = boxno;
+ }
+
+
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java b/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
index e1380ba..a9128ea 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/alarmmg.java
@@ -2,7 +2,6 @@
import java.util.Date;
-
public class alarmmg {
private Integer id;
private String content;
@@ -11,6 +10,7 @@
private String timeons;
+ // 鑷id
public void setid(Integer id) {
this.id = id;
}
@@ -19,6 +19,7 @@
return id;
}
+ // 鎶ヨ鍐呭
public void setontent(String content) {
this.content = content;
}
@@ -27,6 +28,7 @@
return content;
}
+ // 鎶ヨ寮�濮嬫椂闂�
public void settimeon(Date timeon) {
this.timeon = timeon;
}
@@ -35,6 +37,7 @@
return timeon;
}
+ // 鎶ヨ缁撴潫鏃堕棿
public void setendTime(Date endTime) {
this.endTime = endTime;
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
new file mode 100644
index 0000000..638e8c7
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
@@ -0,0 +1,104 @@
+package com.example.springboot.entity;
+
+public class north_glass_buffer1 {
+ private Integer id; //鑷id
+ private String ordernumber;//璁㈠崟id
+ private String listnumber;//闆嗗悎id
+ private String boxnumber;//绠卞瓙id
+ private String barcode;//鐜荤拑id
+ private double glasslength;//鐜荤拑瀹�
+ private double glassheight;//鐜荤拑楂�
+ private double glasslengthMm;//鐜荤拑瀹絤m
+ private double glassheightMm;//鐜荤拑楂榤m
+
+ private StorageCage storageCage;
+
+ public void setstorageCage(StorageCage storageCage) {
+ this.storageCage = storageCage;
+ }
+
+ public StorageCage getstorageCage() {
+ return storageCage;
+ }
+
+ private Out_slice out_slice;
+
+ public void setOut_slice(Out_slice out_slice) {
+ this.out_slice = out_slice;
+ }
+
+ public Out_slice getOut_slice() {
+ return out_slice;
+ }
+
+ public Integer id() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+ public String getordernumber() {
+ return ordernumber;
+ }
+ public void setordernumber(String ordernumber) {
+ this.ordernumber = ordernumber;
+ }
+ public String getlistnumber() {
+ return listnumber;
+ }
+ public void setlistnumber(String listnumber) {
+ this.listnumber = listnumber;
+ }
+
+ public String getboxnumber() {
+ return boxnumber;
+ }
+ public void setboxnumber(String boxnumber) {
+ this.boxnumber = boxnumber;
+ }
+
+
+ public String getbarcode() {
+ return barcode;
+ }
+ public void setbarcode(String barcode) {
+ this.barcode = barcode;
+ }
+
+
+ public Double getglasslength() {
+ return glasslength;
+ }
+ public void setglasslength(Double glasslength) {
+ this.glasslength = glasslength;
+ }
+
+ public Double getglassheight() {
+ return glassheight;
+ }
+ public void setglassheight(Double glassheight) {
+ this.glassheight = glassheight;
+ }
+
+ public Double getglasslengthMm() {
+ return glasslengthMm;
+ }
+ public void setglasslengthMm(Double glasslengthMm) {
+ this.glasslengthMm = glasslengthMm;
+ }
+
+ public Double getglassheightMm() {
+ return glassheightMm;
+ }
+ public void setglassheight_mm(Double glassheightMm) {
+ this.glassheightMm = glassheightMm;
+ }
+
+
+
+}
\ No newline at end of file
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 730ca3b..d6236e3 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
@@ -6,6 +6,9 @@
import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
+import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.entity.north_glass_buffer1_frames;
+import com.example.springboot.entity.Out_slice;
import java.util.List;
@@ -32,7 +35,7 @@
List<StorageCage> selectRack4();
// 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
- @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type} limit 1")
+ @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type}")
List<StorageCage> selectinout(@Param("task_type") Integer task_type);
// 鏌ヨ鏄惁瀛樺湪姝よ鍗�
@@ -68,7 +71,7 @@
List<alarmmg> SelectAlarmmgInfo();
//鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
- @Select("select *,concat(round(a.glasswidth*b.Conversionrate,2),' x ',round(a.glassheight*b.Conversionrate,2)) as lengthwidth from storage_cage as a,glass as b ")
+ @Select("select *,concat(round(a.glasswidth),' x ',round(a.glassheight)) as lengthwidth from storage_cage as a")
List<StorageCage> SelectCageInfo(short cage);
@Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
@@ -88,32 +91,28 @@
//鏌ヨ鐜荤拑淇℃伅
// @Select("select * from glass where glassid=#{glassid}")
- @Select("SELECT id,glassid,orderid,\n" +
- " ROUND(width * Conversionrate, 2) AS width,\n" +
- " ROUND(height * Conversionrate, 2) AS height\n" +
- "FROM glass\n" +
- "where glassid=#{glassid};")
- Glass SelectGlassByGlassID(String glassid);
+ @Select("SELECT ordernumber,listnumber,boxnumber,barcode,glasslength,glassheight,glasslength_mm,glassheight_mm FROM north_glass_buffer1 where barcode=#{barcode}")
+ north_glass_buffer1 SelectGlassByGlassID(String barcode);
//鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
@Update("update storage_cage set disabled=#{disabled} where cage=#{cage} and cell=#{cell}")
void Disabled(short cage, short cell, short disabled);
//鐞嗙墖绗兼柊澧炵幓鐠�
- @Update("update storage_cage set state=1,glass_id=#{glass.glassId},order_id=#{glass.orderId},glasswidth=#{glass.width},glassheight=#{glass.height} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
- void Inglassid(Glass glass, short cage, short cell, short tier);
+ @Update("update storage_cage set state=1,glass_id=#{glass.barcode},order_id=#{glass.ordernumber},glasswidth=#{glass.glasslengthMm},glassheight=#{glass.glassheightMm} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
+ void Inglassid(north_glass_buffer1 glass, short cage, short cell, short tier);
//鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑
@Select("select count(*) from storage_cage where glass_id=#{glassId}")
short SelectStorageByGlassId(String glassId);
//鏍规嵁璁㈠崟鏌ヨ鐜荤拑淇℃伅
- @Select("select * from glass where position(#{orderid} in orderid)")
- List<Glass> SelectGlass(String orderid);
+ @Select("select * from north_glass_buffer1 where position(#{orderid} in ordernumber)")
+ List<north_glass_buffer1> SelectGlass(String orderid);
//鑾峰彇涓婄墖闃熷垪淇℃伅
- @Select("select gl.* from queue qe inner join glass gl on qe.glassid=gl.glassid where qe.id=#{id}")
- Glass GetQueueInfo(int id);
+ @Select("select glassid from queue where id=#{id}")
+ String GetQueueInfo(int id);
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@Select("update queue set glassid=#{glassid},state=1 where id=#{id}")
@@ -124,8 +123,48 @@
void UpdateQueueState();
//鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
- @Select("update queue set glassid='' where id=#{id}")
+ @Select("update queue set glassid='',state=0 where id=#{id}")
void DeleteQueueGlass(String id);
-
+ //鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
+ @Select("select count(*) from storage_cage where order_id=#{orderid}")
+ Short SelectGlassNo(String orderid);
+
+ //鏍规嵁鐜荤拑id浠庡鎴疯〃鏌ヨ鏁版嵁
+ @Select("select * from north_glass_buffer1 where barcode=#{glassid}")
+ north_glass_buffer1 SelectBoxNo(String glassid);
+
+ //鏌ヨ鍑虹墖闃熷垪淇℃伅
+ @Select("select * from out_slice where state=0 or state=1")
+ List<Out_slice> SelectProductionqueue();
+
+ //鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅
+ @Select("select * from storage_cage where glass_id=#{glassid}")
+ StorageCage SelectStorageGlassById(String glassid);
+
+
+ //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ @Select("update out_slice set state=3 where id=#{id}")
+ void DeleteProductionQueueGlass(Short id);
+
+ //鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅
+ @Select("select * from north_glass_buffer1 where FrameBarcode=#{FrameBarcode}")
+ List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode);
+
+ //鏌ヨ鏍规嵁id鏌ヨ
+ @Select("select b.* from storage_cage a inner join out_slice b on a.glass_id=b.glassId where b.glassId=#{glassId}")
+ List<Out_slice> SelectOutSliceById(String glassId);
+
+ //鏌ヨ鐜荤拑id鏄惁
+ @Select("select Flip from north_glass_buffer1_frames where Barcode=#{frameBarcode} limit 1")
+ String SelectFlipByFrameBarcode(String frameBarcode);
+
+ //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
+ @Select("select * from out_slice where glassid=#{getbarcode} and (state=0 or state=1)")
+ Out_slice SelectQueueByglassid(String getbarcode);
+
+ //鏌ヨ鐜荤拑鏄惁宸插瓨鍦ㄤ簬鍑虹墖闃熷垪
+ @Select("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, 0, #{flip});")
+ void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm);
+
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 858f9ec..301ab96 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -1,11 +1,10 @@
package com.example.springboot.mapper;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.*;
import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.StorageTask;
-
import java.util.List;
@@ -14,100 +13,170 @@
@Mapper
public interface SpianMapper {
- //鍒ゆ柇鐩搁偦绗煎瓙鏄惁鏈夌┖鏍�
- @Select("select COUNT(if(a.state1=0,cell,null))as cell,ROUND(id/2)as id from (select *,max(state)as state1 from storage_cage a GROUP BY cage,cell)as a where (a.cage=#{cage1}-1 or a.cage=#{cage1}+1)and if(a.cage<6,a.cage>0 and a.cage<6,a.cage>5) GROUP BY cage ORDER BY cell desc LIMIT 1")
- int selectCage(int cage1);
-
- //@Select("(select*from storage_cage as a where a.state=0 and cage%2=0 ORDER BY id LIMIT 1)union (select a.* from storage_cage a inner join (select cage,if(shu2=1,shu3,shu5) as gezi from ( select cage, count(case when state1=1 and state2=0 then cell else null end)as shu1, count(case when state1=0 then cell else null end) as shu2, min(case when state1=1 and state2=0 then cell else null end) as shu3, min(case when state1=0 then cell else null end) as shu4, min(case when state1=0 or state2=0 then cell else null end) as shu5 from (select *,max(state) as state1,min(state) as state2 from storage_cage group by cage,cell) as a where cage%2!=0 GROUP BY cage HAVING shu2>1 or (shu2=1 and shu1>0) ) as sss limit 1)as b on a.cage=b.cage and a.cell=b.gezi and a.state=0 order by tier limit 1) ORDER BY id LIMIT 1;")
- //鑾峰彇璁㈠崟鍙锋帓搴忕殑绌鸿鍗曠瀛�
- @Select("select cage,COUNT(if(order_id=#{orderids},order_id,null))as orderid,cell,min(state)as state1 from storage_cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY orderid desc; ")
- List<StorageCage> selectAll(Short orderids);
+ // 鍒ゆ柇鐩搁偦绗煎瓙鏄惁鏈夌┖鏍�
+ @Select("select COUNT(if(a.state1=0,cell,null))as cell,ROUND(id/2)as id from (select *,max(state)as state1 from storage_cage a GROUP BY cage,cell)as a where (a.cage=#{cage1}-1 or a.cage=#{cage1}+1)and if(a.cage<6,a.cage>0 and a.cage<6,a.cage>5) GROUP BY cage ORDER BY cell desc LIMIT 1")
+ int selectCage(int cage1);
- //鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚搴︾┖鏍�
- @Select("select cage,cell,tier,id,ROUND(id/2)as prcId,width from storage_cage where cage=#{cage1} and cell=#{cell} and state=0 and width>=#{width} ORDER BY cell asc,tier desc LIMIT 1")
- StorageCage selectCage1(int cage1,int cell,double width);
- //鍒ゆ柇绗煎瓙鍐呯幓鐠冩暟
- @Select("select COUNT(tier)as tier from storage_cage where cage=#{cage} and cell=#{cell} and state=1;")
- int selectsum(int cage,int cell);
+ // @Select("(select*from storage_cage as a where a.state=0 and cage%2=0 ORDER BY
+ // id LIMIT 1)union (select a.* from storage_cage a inner join (select
+ // cage,if(shu2=1,shu3,shu5) as gezi from ( select cage, count(case when
+ // state1=1 and state2=0 then cell else null end)as shu1, count(case when
+ // state1=0 then cell else null end) as shu2, min(case when state1=1 and
+ // state2=0 then cell else null end) as shu3, min(case when state1=0 then cell
+ // else null end) as shu4, min(case when state1=0 or state2=0 then cell else
+ // null end) as shu5 from (select *,max(state) as state1,min(state) as state2
+ // from storage_cage group by cage,cell) as a where cage%2!=0 GROUP BY cage
+ // HAVING shu2>1 or (shu2=1 and shu1>0) ) as sss limit 1)as b on a.cage=b.cage
+ // and a.cell=b.gezi and a.state=0 order by tier limit 1) ORDER BY id LIMIT 1;")
+ // 鑾峰彇璁㈠崟鍙锋帓搴忕殑绌鸿鍗曠瀛�
+ @Select("select a.cage,COUNT(if(a.order_id=#{orderids},a.order_id,null))as orderid,b.shu,c.shu2,a.cell,min(a.state)as state1 from storage_cage a left join (select COUNT(*)shu,cage from storage_cage where order_id=#{orderids} GROUP BY cage)as b on a.cage=b.cage left join(select cage ,COUNT(glass_id)as shu2 from storage_cage GROUP BY cage)c on a.cage=c.cage where (order_id=#{orderids} or ''='') GROUP BY cage,cell HAVING state1=0 ORDER BY shu desc,shu2,cage asc; ")
+ List<StorageCage> selectAll(String orderids);
- //@Update("update longzi set glass_id = #{glass_id}, width = #{width}, state = #{state} where cell = #{cell}")
- @Update("update longzi set glass_id =123, width =1600, state =1 where cell =24")
- void update();
- //鑾峰彇鐜荤拑淇℃伅
- @Select("select orderid,width from glass where glassid=#{glassid}")
- Glass selectGlass(String glassid);
-
- @Insert("insert into storage_task(task_type,task_state,shelf_rack,load_rack)values(#{storage_task},#{task_state},#{shelf_rack},#{load_rack})")
- void insert(StorageTask storageTask);
-
- //鍑虹墖浠诲姟鏌ヨ
- @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id,glass_id from storage_cage as a where a.order_id=#{orderId} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
- StorageCage selectOut(String orderId);
- //鎸夌幓鐠僆D鍑虹墖浠诲姟鏌ヨ
- @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.glass_id=#{glassid} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
- StorageCage selectOut2(String glassid);
+ // 鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚搴︾┖鏍�
+ @Select("select cage,cell,tier,id,ROUND(id/2)as prcId,width from storage_cage where cage=#{cage1} and cell=#{cell} and state=0 and width>=#{width} ORDER BY cell asc,tier desc LIMIT 1")
+ StorageCage selectCage1(int cage1, int cell, double width);
- //鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
- @Select("select state from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
- int selectGlassState(int cage,int cell);
+ // 鍒ゆ柇绗煎瓙鍐呯幓鐠冩暟
+ @Select("select COUNT(tier)as tier from storage_cage where cage=#{cage} and cell=#{cell} and state=1;")
+ int selectsum(int cage, int cell);
- //鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
- @Select("select glass_id,cage,cell,max(state)as shu,ROUND(id/2)as prcid,id from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage) limit 1;")
- StorageCage selectGlassCage(int cage,double width,int cage1,int cage2);
+ // @Update("update longzi set glass_id = #{glass_id}, width = #{width}, state =
+ // #{state} where cell = #{cell}")
+ @Update("update longzi set glass_id =123, width =1600, state =1 where cell =24")
+ void update();
- //鍒犻櫎绗煎瓙淇℃伅(鍑虹墖)
- @Update("update storage_cage as a set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=0 where cage=#{cage} and cell=#{cell} and tier=#{tier};")
- void UpdataGlassCage(String orderid,String glassid,double width,int cage,int cell,int tier,int state);
+ // 鑾峰彇鐜荤拑淇℃伅
+ @Select("select orderid,width from glass where glassid=#{glassid}")
+ Glass selectGlass(String glassid);
- //淇敼绗煎瓙淇℃伅(杩涚墖)
- @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where id=#{id};")
- void UpdataAddCage(Short orderid,String glassid,double width,int cage,int cell,int id,int state);
- //淇敼鍚岀瀛愭牸瀛愬搴�
- @Update("update storage_cage set width=width-#{width} where cage=#{cage} and cell=#{cell};")
- void UpdataAddCage1(double width,int cage,int cell);
- //淇敼鍚岀瀛愭牸瀛愬搴�
- @Update("update storage_cage set state=#{state} where state=#{oldstate};")
- void UpdataAddCageState(int state,int oldstate);
- //淇敼鍚岀瀛愭牸瀛愬搴�(鍑虹墖)
- @Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
- void UpdataOutCage1(double width,int cage,int cell);
- //璋冩嫧鏇存崲绗煎瓙淇℃伅
- @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth where a.id=#{id1}")
- void UpdateDBCage(int id1,int cage,int cell);
- // @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
- // void insert (Spian spian);
- //鏂板浠诲姟琛�
- @Insert("INSERT INTO `canadames`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`,start_time,glass_id) VALUES (#{tasktype},#{taskstate},#{shelfrack},#{loadrack},now(),#{glassid});")
- void Inserttask(int tasktype,int taskstate,int shelfrack,int loadrack,String glassid);
- //淇敼浠诲姟琛�
- @Update("update storage_task set task_state=#{state} where task_type=#{type} and task_state=0;")
- void Updatetask(int state,int type);
- //淇敼浠诲姟琛�
- @Update("update storage_task set task_state=1 where (task_type=1 or task_type=2) and task_state=0;")
- void UpdatetaskOut();
- //鏌ヨ鎸夎鍗曞嚭鐗�
- @Select("select order_id state from order_out where state=0")
- String SelectOrderout();
- //鍐呭鐗囪皟鎹�
- @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth where a.cage=#{cage} and a.cell=#{cell} and a.tier=1")
- void UpdateDBCage1(int cage,int cell);
- //娓呴櫎鍐呯墖鏁版嵁
- @Update("update storage_cage set glass_id='',order_id='',state=0,glasswidth=0 where a.cage=#{cage} and a.cell=#{cell} and a.tier=1;")
- void UpdateDBCage2(int cage,int cell);
- //鍒ゆ柇鏄惁鏈夎皟鎷ㄥ畬鍚庡嚭鐗囩殑浠诲姟
- @Select("select COUNT(*)as id,glass_id from storage_task where (task_type=1 or task_type=2) and task_state=0;")
- Glass SelectDBOut();
- //鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
- @Select("select glass_id from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
- String SelectGlassid(int cage,int cell);
- //鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
- @Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
- Integer Selectoutstate();
- //鑾峰彇杩涚墖闃熷垪id
- @Select("select glassid from queue where type=1")
- String Selectqueueid();
- //鑾峰彇杩涚墖闃熷垪id
- @Select("select state from queue where type=1")
- String Selectqueuestate();
+ @Insert("insert into storage_task(task_type,task_state,shelf_rack,load_rack)values(#{storage_task},#{task_state},#{shelf_rack},#{load_rack})")
+ void insert(StorageTask storageTask);
+
+ // 鍑虹墖浠诲姟鏌ヨ
+ @Select("select COUNT(order_id)order_id,cage,cell,glasswidth,tier,ROUND(id/2)as prcId,glass_id from storage_cage a where a.order_id=#{orderId} GROUP BY cage,cell ORDER BY cage desc,order_id desc,cell desc,glasswidth desc limit 1")
+ StorageCage selectOut(String orderId);
+
+ // @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id,glass_id
+ // from storage_cage as a where a.order_id=#{orderId} and state=1 order by cage
+ // desc,tier desc,cell desc LIMIT 1")
+ // StorageCage selectOut(String orderId);
+ // 鎸夌幓鐠僆D鍑虹墖浠诲姟鏌ヨ
+ @Select("select cage,cell,tier,glasswidth,ROUND(id/2)as prcId,id from storage_cage as a where a.glass_id=#{glassid} and state=1 order by cage desc,tier desc,cell desc LIMIT 1")
+ StorageCage selectOut2(String glassid);
+
+ // 鍒ゆ柇鍑虹墖涓�1鏃讹紝鏄惁鍙洿鎺ュ嚭鐗�
+ @Select("select COUNT(state) from storage_cage where cage=#{cage} and cell=#{cell}")
+ int selectGlassState(int cage, int cell);
+
+ // 鍒ゆ柇璇ヨ皟鎷ㄧ殑绗煎瓙
+ @Select("select glass_id,cage,cell,max(state)as shu,ROUND(id/2)as prcid,id from storage_cage where width>=#{width} and cage>#{cage1} and cage<#{cage2} GROUP BY cage,cell HAVING shu=0 order by abs(#{cage} - cage) limit 1;")
+ StorageCage selectGlassCage(int cage, double width, int cage1, int cage2);
+
+ // 鍒犻櫎绗煎瓙淇℃伅(鍑虹墖)
+ @Update("update storage_cage as a set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=0 where cage=#{cage} and cell=#{cell} and tier=#{tier};")
+ void UpdataGlassCage(String orderid, String glassid, double width, int cage, int cell, int tier, int state);
+
+ // 淇敼绗煎瓙淇℃伅(杩涚墖)
+ @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where id=#{id};")
+ void UpdataAddCage(String orderid, String glassid, double width, int cage, int cell, int id, int state);
+
+ // 淇敼绗煎瓙淇℃伅(澶氱墖杩涚墖)
+ @Update("update storage_cage set state=#{state},glass_id=#{glassid},order_id=#{orderid},glasswidth=#{width} where cage=#{cage} and cell=#{cell} and tier=#{tier};")
+ void UpdataAddqueCage(String orderid, String glassid, double width, int cage, int cell, int tier, int state);
+
+ // 淇敼鍚岀瀛愭牸瀛愬搴�
+ @Update("update storage_cage set width=width-#{width} where cage=#{cage} and cell=#{cell};")
+ void UpdataAddCage1(double width, int cage, int cell);
+
+ // 淇敼鍚岀瀛愭牸瀛愬搴�
+ @Update("update storage_cage set state=#{state} where state=#{oldstate};")
+ void UpdataAddCageState(int state, int oldstate);
+
+ // 淇敼鍚岀瀛愭牸瀛愬搴�(鍑虹墖)
+ @Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
+ void UpdataOutCage1(double width, int cage, int cell);
+
+ // 璋冩嫧鏇存崲绗煎瓙淇℃伅
+ @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth where a.id=#{id1}")
+ void UpdateDBCage(int id1, int cage, int cell);
+
+ // @Insert("insert into user(name, date, address, user_no) values (#{name},
+ // #{date}, #{address}, #{userNo})")
+ // void insert (Spian spian);
+ // 鏂板浠诲姟琛�
+ @Insert("INSERT INTO `canadames`.`storage_task`(`task_type`, `task_state`, `shelf_rack`, `load_rack`,start_time,glass_id) VALUES (#{tasktype},#{taskstate},#{shelfrack},#{loadrack},now(),#{glassid});")
+ void Inserttask(int tasktype, int taskstate, int shelfrack, int loadrack, String glassid);
+
+ // 淇敼浠诲姟琛�
+ @Update("update storage_task set task_state=#{state} where task_type=#{type} and task_state=0;")
+ void Updatetask(int state, int type);
+
+ // 淇敼浠诲姟琛�
+ @Update("update storage_task set task_state=1 where (task_type=1 or task_type=2) and task_state=0;")
+ void UpdatetaskOut();
+
+ // 鏌ヨ鎸夎鍗曞嚭鐗�
+ @Select("select order_id state from order_out where state=0")
+ String SelectOrderout();
+
+ // 鍐呭鐗囪皟鎹�
+ @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1,a.glasswidth=b.glasswidth where a.cage=#{cage} and a.cell=#{cell} and a.tier=1")
+ void UpdateDBCage1(int cage, int cell);
+
+ // 娓呴櫎鍐呯墖鏁版嵁
+ @Update("update storage_cage set glass_id='',order_id='',state=0,glasswidth=0 where a.cage=#{cage} and a.cell=#{cell} and a.tier=1;")
+ void UpdateDBCage2(int cage, int cell);
+
+ // 鍒ゆ柇鏄惁鏈夎皟鎷ㄥ畬鍚庡嚭鐗囩殑浠诲姟
+ @Select("select COUNT(*)as id,glass_id from storage_task where (task_type=1 or task_type=2) and task_state=0;")
+ Glass SelectDBOut();
+
+ // 鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
+ @Select("select glass_id from storage_cage where cage=#{cage} and cell=#{cell} and tier=2;")
+ String SelectGlassid(int cage, int cell);
+
+ // 鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
+ @Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
+ Integer Selectoutstate();
+
+ // 娣诲姞浠诲姟搴忓垪
+ // 鑾峰彇杩涚墖闃熷垪id
+ @Insert("INSERT INTO `canadames`.`queue`(`glassid`, `type`, `state`,width) VALUES (#{glassid},#{type},0,#{width});")
+ void insertqueue(String glassid, int type, double width);
+
+ // 鑾峰彇浠诲姟搴忓垪
+ @Select("select glassid,orderid,width,type from queue where state=#{state}")
+ StorageCage SelectQueue(int state);
+
+ // 鑾峰彇搴忓垪琛ㄧ殑鐜荤拑瀹�
+ @Select("select sum(width)+400 as width,orderid from queue where state=0 limit 1")
+ StorageCage SelectQueueWidth();
+
+ // 鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚畬鏁寸┖鏍�
+ @Select("select cage,cell,tier,id,ROUND(id/2)as prcId,width,max(state)state1 from storage_cage where cage=#{cage1} and cell=#{cell} and state=0 and width>=#{width} HAVING state1=0 ORDER BY cell asc,tier desc LIMIT 1")
+ StorageCage selectqueCage1(int cage1, int cell, double width);
+
+ // 鑾峰彇搴忓垪琛ㄧ殑鐜荤拑
+ @Select("select glassid,orderid,width from queue where state=0 and type=#{type}")
+ Glass SelectQueueGlass(int type);
+
+ // 澶氱墖鍑哄簱娓呴櫎涓�鏁翠釜绌烘牸
+ @Update("update storage_cage set glass_id='',order_id='',glasswidth=0,width=2750,state=0 where cage=#{cage} and cell=#{cell}")
+ void UpdatequeOut(int cage, int cell);
+
+ // 鍒ゆ柇搴忓垪琛ㄩ噷鐨勭幓鐠冩槸鍚︽槸鍚屼竴璁㈠崟
+ @Select("select COUNT(distinct orderid) from queue ")
+ int SelectQueOrder();
+
+ // 瀵绘壘鍙互澶氱墖鍑虹墖鐨勭幓鐠�
+ @Select("select cage,cell,ROUND(id/2)as prcId,width,count(glass_id)shu from storage_cage where order_id=#{orderid} and (cage!=#{cage} or cell!=#{cell}) GROUP BY cage,cell HAVING shu=1 ORDER BY cage desc,cell desc limit 1")
+ StorageCage SelectQueout(String orderid, int cage, int cell);
+ // 鑾峰彇杩涚墖闃熷垪id
+
+ @Select("select glassid from queue where type=1")
+ String Selectqueueid();
+
+ // 鑾峰彇杩涚墖闃熷垪id
+ @Select("select state from queue where type=1")
+ String Selectqueuestate();
}
-
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/security/config/ShiroConfig.java b/springboot-vue3/src/main/java/com/example/springboot/security/config/ShiroConfig.java
index 3e7a55a..52ad80c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/security/config/ShiroConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/security/config/ShiroConfig.java
@@ -1,5 +1,5 @@
package com.example.springboot.security.config;
-
+
import com.example.springboot.security.JWTRealm;
import com.example.springboot.security.NoSessionFilter;
import com.example.springboot.security.StatelessDefaultSubjectFactory;
@@ -18,17 +18,17 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
-
+
import javax.servlet.Filter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-
+
@Configuration
public class ShiroConfig {
-
-
+
+
/**
* Shiro鐢熷懡鍛ㄦ湡澶勭悊鍣�
*
@@ -38,7 +38,7 @@
public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
return new LifecycleBeanPostProcessor();
}
-
+
/**
* 寮�鍚疭hiro鐨勬敞瑙�(濡侤RequiresRoles,@RequiresPermissions),闇�鍊熷姪SpringAOP鎵弿浣跨敤Shiro娉ㄨВ鐨勭被,骞跺湪蹇呰鏃惰繘琛屽畨鍏ㄩ�昏緫楠岃瘉
* DefaultAdvisorAutoProxyCreator鐨勯『搴忓繀椤诲湪shiroFilterFactoryBean涔嬪墠锛屼笉鐒禨ecurityUtils.getSubject().getPrincipal()鑾峰彇涓嶅埌鍙傛暟
@@ -52,24 +52,24 @@
advisorAutoProxyCreator.setProxyTargetClass(true);
return advisorAutoProxyCreator;
}
-
+
@Bean
public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor() {
AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor = new AuthorizationAttributeSourceAdvisor();
authorizationAttributeSourceAdvisor.setSecurityManager(defaultSecurityManager());
return authorizationAttributeSourceAdvisor;
}
-
+
@Bean(name = "shiroFilterFactoryBean")
public ShiroFilterFactoryBean shiroFilterFactoryBean() {
ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();
shiroFilterFactoryBean.setSecurityManager(defaultSecurityManager());
-
+
// 杩囨护瑙勫垯
Map<String, String> linkedHashMap = new LinkedHashMap<>();
// 鏃犵姸鎬佺櫥褰曟儏鍐典笅鍏抽棴浜唖hiro涓殑session锛屽鑷存墍鏈夐渶瑕佸姞涓奱uthc鎺ュ彛璇锋眰鏃跺�欓兘浼氭姤閿欙紝
// 鎵�浠ヤ娇鐢ˊRequiresRoles,@RequiresPermissions娉ㄨВ,aop鏂瑰紡瀹炵幇鎺ュ彛鐨勬潈闄愭牎楠�
-
+
/* 娣诲姞shiro鐨勫唴缃繃婊ゅ櫒锛岃嚜瀹氫箟url瑙勫垯
* Shiro鑷甫鎷︽埅鍣ㄩ厤缃鍒�
* rest锛氭瘮濡�/admins/user/**=rest[user],鏍规嵁璇锋眰鐨勬柟娉曪紝鐩稿綋浜�/admins/user/**=perms[user锛歮ethod] ,鍏朵腑method涓簆ost锛実et锛宒elete绛�
@@ -110,7 +110,7 @@
// // 鎺堟潈鐨勬潈闄�
// linkedHashMap.put("/api/rolePermission/saveOrUpdate", "perms[rolePermission:add]");
// linkedHashMap.put("/api/rolePermission/removeByIds", "perms[rolePermission:delete]");
-
+
// 鑷畾涔夎繃婊ゅ櫒
HashMap<String, Filter> filterHashMap = new HashMap<>();
filterHashMap.put("jwt", new NoSessionFilter());
@@ -120,7 +120,7 @@
shiroFilterFactoryBean.setFilterChainDefinitionMap(linkedHashMap);
return shiroFilterFactoryBean;
}
-
+
@Bean
public DefaultWebSecurityManager defaultSecurityManager() {
DefaultWebSecurityManager defaultWebSecurityManager = new DefaultWebSecurityManager();
@@ -134,7 +134,7 @@
defaultWebSecurityManager.setSubjectFactory(subjectFactory());
return defaultWebSecurityManager;
}
-
+
/**
* 鐧诲綍鐨勮璇佸拰鎺堟潈
*
@@ -146,7 +146,7 @@
userRealm.setCredentialsMatcher(hashedCredentialsMatcher());
return userRealm;
}
-
+
/**
* token鐨勮璇佸拰鎺堟潈
*
@@ -156,12 +156,12 @@
public JWTRealm jwtRealm() {
return new JWTRealm();
}
-
+
@Bean
public StatelessDefaultSubjectFactory subjectFactory() {
return new StatelessDefaultSubjectFactory();
}
-
+
/*
* 鍑瘉鍖归厤鍣� 鐢变簬鎴戜滑鐨勫瘑鐮佹牎楠屼氦缁橲hiro鐨凷impleAuthenticationInfo杩涜澶勭悊浜�
*/
@@ -172,7 +172,7 @@
hashedCredentialsMatcher.setHashIterations(1024);// 鏁ｅ垪鐨勬鏁帮紝姣斿鏁ｅ垪涓ゆ锛岀浉褰撲簬MD5(MD5(""));
return hashedCredentialsMatcher;
}
-
+
@Bean
public CookieRememberMeManager cookieRememberMeManager() {
CookieRememberMeManager cookieRememberMeManager = new CookieRememberMeManager();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
index 5a5c756..6dc8f99 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -32,7 +32,7 @@
ps.setInt(1, glassid);
rs= ps.executeQuery();
while (rs.next()) {
- glass.setOrderId(rs.getShort("orderid"));
+ glass.setOrderId(rs.getString("orderid"));
}
conn.close();
return glass;
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java b/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java
new file mode 100644
index 0000000..13764dd
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java
@@ -0,0 +1,66 @@
+package com.example.springboot.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import com.example.springboot.entity.Out_slice;
+
+public class OutSlice {
+
+ // public static List<Out_slice> Groupbyresult(List<Out_slice> out_slices) {
+ // // 浼犲叆涓�涓泦鍚� 杩涜鍒嗙粍鏉′欢鍒嗙粍
+ // List<Out_slice> resultlist = new ArrayList<Out_slice>();
+ // HashMap map = new HashMap<>();
+ // // HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
+ // for (Out_slice out_slice : out_slices) {
+ // String key_ = out_slice.getState() + "-";
+ // if (map.get(key_) == null) {
+ // List<Out_slice> lists = new ArrayList<Out_slice>();
+ // lists.add(out_slice);
+ // map.put(key_, lists);
+ // } else {
+ // List<Out_slice> lists = (List<Out_slice>) map.get(key_);
+ // lists.add(out_slice);
+ // map.put(key_, lists);
+ // }
+ // }
+ // return resultlist;
+ // }
+
+ // public static List<Out_slice> Orderbyresult(List<Out_slice> out_slices, int orders) {
+ // // orders 鎺掑簭妯″紡
+ // List<Out_slice> list = new ArrayList<Out_slice>();
+ // for (Out_slice out_slice : out_slices) {
+ // if (list.isEmpty()) {
+ // list.add(out_slice);
+ // } else {
+ // for (int i = 0; i < list.size(); i++) {
+ // Out_slice out_slice2 = list.get(i);
+ // if (out_slice.getID() > out_slice2.getID()) {
+ // continue;
+ // } else {
+ // list.add(i, out_slice2);
+ // }
+ // }
+ // }
+ // }
+ // }
+
+ // public static void f() {
+ // HashMap map = new HashMap<>();
+ // for (Out_slice out_slice : listoutslice) {
+ // String key_ = out_slice.getState() + "-";
+ // if (map.get(key_) == null) {
+ // List<Out_slice> lists = new ArrayList<Out_slice>();
+ // lists.add(out_slice);
+ // map.put(key_, lists);
+ // } else {
+ // List<Out_slice> lists = (List<Out_slice>) map.get(key_);
+ // lists.add(out_slice);
+ // map.put(key_, lists);
+ // }
+ // }
+ // }
+
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index d37ea94..9a6cb6a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -19,134 +19,6 @@
@Autowired
private SpianMapper spianMapper;
- // @GetMapping("/all2")
- public Result selectout(String orderid) {
-
- //spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔★紝鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
- // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
- List<String> adddresslist = new ArrayList<>();
- adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
- adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
- adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
- List<Short> datas = new ArrayList<>();
- // 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
- StorageCage cageout = spianMapper.selectOut(orderid);
- if(cageout==null){
- return Result.success("200");
- }
-
-
-
-
- int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
- int cell = cageout.getCell();// 鍑虹墖鏍煎彿
- int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
- int prcid = cageout.getPrcId();// prcid
- String glassid=cageout.getGlassId();
- int prcid2;
- int ids;
- int cages;
- int cells;
- double glasswidth = cageout.getGlassWidth();
- // 鍒ゆ柇鐜荤拑鍐呭鐗�
- if (tier == 2) {
- // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
- // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
- datas.add((short) prcid);
- datas.add((short) 1000);
- datas.add((short) 1);
- datas.add((short) 1);
-
- spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
- spianMapper.Inserttask(1, 0,cageout.getId(),1000,orderid);//鏂板浠诲姟
- S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid);//娲惧彂鍑虹墖ID
- return Result.success(datas);//缁撴潫
- } else {
- // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
- int state = spianMapper.selectGlassState(cage, cell);
- // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
- if (state == 0) {
- //spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
- datas.add((short) prcid);
- datas.add((short) 1000);
- datas.add((short) 1);
- datas.add((short) 1);
- spianMapper.Inserttask(1, 0,cageout.getId(),1000,orderid);//鏂板浠诲姟
- spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
- S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid);//娲惧彂鍑虹墖ID
- //spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
- return Result.success(datas);//缁撴潫
-
- } else {
- // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
- if (cage < 6) {
- StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
- if (cagecell == null) {
- return Result.success(cagecell);
- }
- // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
- prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
- ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
- cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
- cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
-
- // 濉叆璋冩嫧鏁版嵁
- datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
- datas.add((short) prcid2);
- datas.add((short) 2);
- datas.add((short) 1);
- // 鏇存崲鐜荤拑鐨勭瀛�
- String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
- spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
- spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
- spianMapper.Inserttask(2, 0,cageout.getId(),ids,orderid);//鏂板璋冨害浠诲姟
- // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
- S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
- System.out.println(datas);
- outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID
- return Result.success(cagecell); //缁撴潫
-
- } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
- StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
- if (cagecell == null) {
- return Result.success(cagecell);
- }
- // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
- prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
- ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
- cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
- cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
- // 濉叆璋冩嫧鏁版嵁
- datas.add((short) prcid);
- datas.add((short) prcid2);
- datas.add((short) 2);
- datas.add((short) 1);
- String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
- spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.Inserttask(2, 0,cageout.getId(),ids,orderid);//鏂板璋冨害浠诲姟
- spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
- spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
- // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
- S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-
- outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID
- return Result.success(cagecell); //缁撴潫
-
- }
-
- }
- }
-
- }
-
// @GetMapping("/all")
// 杩涚墖浠诲姟,浼犺鍗昳d
// 鎸夎鍗曚紭鍏堣繘鐗�
@@ -159,14 +31,14 @@
int tiers;
int prctier;
double width;
- double minwidth=0;
- //spianMapper.Updatetask(1, 0);//瀹屾垚浠诲姟,鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
- Glass glasslist = spianMapper.selectGlass(glassid);
- if(glasslist==null){
- return (300);
+ double minwidth = 0;
+
+ Glass glasslist = spianMapper.selectGlass(glassid); // 鑾峰彇鐜荤拑鍙傛暟
+ if (glasslist == null) {
+ return (300);
}
- double widths = glasslist.getWidth();
- Short orderids = glasslist.getOrderId();
+ double widths = glasslist.getwidth();
+ String orderids = glasslist.getOrderId();
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
@@ -177,7 +49,7 @@
// String orderid="A001";
// 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
- List<StorageCage> storageCage = spianMapper.selectAll(orderids);
+ List<StorageCage> storageCage = spianMapper.selectAll(orderids.toString());
if (storageCage == null) {
return (400);
}
@@ -186,38 +58,38 @@
cage1 = storageCage2.getCage();
// 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
int cages = spianMapper.selectCage(cage1);
- StorageCage cages1 ;
- //鍒ゆ柇鏄惁鏄浜岀墖闇�瑕佸姞闂撮殧鐗�
+ StorageCage cages1;
+ // 鍒ゆ柇鏄惁鏄浜岀墖闇�瑕佸姞闂撮殧鐗�
prctier = spianMapper.selectsum(cage1, storageCage2.getCell());// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
- if(prctier>0){
- cages1 = spianMapper.selectCage1(cage1,storageCage2.getCell(),widths+400);
- }else{
- cages1 = spianMapper.selectCage1(cage1,storageCage2.getCell(),widths);
- }
+ if (prctier > 0) {
+ cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths + 400);
+ } else {
+ cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths);
+ }
// 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
- // 鏈夊悎閫傜┖鏍兼椂杩涚墖
- if (cages1 != null&&cages>=1) {
+ // 鏈夊悎閫傜┖鏍兼椂杩涚墖
+ if (cages1 != null && cages >= 1) {
ids = cages1.getId();// 鏁版嵁搴揑D
tiers = cages1.getTier();// 鍐呭鐗�
cells = cages1.getCell();// 鏍煎瓙鍙�
prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
- width=cages1.getWidth();//鏍煎瓙鍓╀綑瀹藉害
- widths=glasslist.getWidth();
+ width = cages1.getWidth();// 鏍煎瓙鍓╀綑瀹藉害
+ widths = glasslist.getwidth();
- // 鎵ц杩涚墖
- datas.add((short) 1000);
- datas.add((short) prcid);
- datas.add((short) prctier);
- datas.add((short) 1);
- // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
- spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 2);
- spianMapper.UpdataAddCage1(widths, cage1, cells);//鍑忓皯鏍煎瓙瀹藉害
- spianMapper.Inserttask(0, 0, 1000, ids,glassid.toString());//鏂板浠诲姟
- S7control.getinstance().WriteWord(adddresslist, datas);
-
- // S7control.getinstance().WriteByte("DB105.16",glassid);
- return (200);
-
+ // 鎵ц杩涚墖
+ datas.add((short) 1000);
+ datas.add((short) prcid);
+ datas.add((short) prctier);
+ datas.add((short) 1);
+ // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
+ spianMapper.UpdataAddCage(orderids.toString(), glassid, widths, cage1, cells, ids, 2);
+ spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+ spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString());// 鏂板浠诲姟
+ S7control.getinstance().WriteWord(adddresslist, datas);
+
+ // S7control.getinstance().WriteByte("DB105.16",glassid);
+ return (200);
+
}
}
@@ -225,9 +97,285 @@
}
+ public Short selectAll2() { // 澶氱墖涓婄墖
+ int cage1;
+ int cells;
+ int ids;
+ int prcid;
+ int tiers;
+ int prctier;
+ double width;
+ double minwidth = 0;
+ List<String> adddresslist = new ArrayList<>();
+ adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.4");// 杩涚墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.12");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+ List<Short> datas = new ArrayList<>();
+
+ // 鑾峰彇澶氱墖搴忓垪鐜荤拑瀹藉害
+ StorageCage queGlass = spianMapper.SelectQueueWidth();
+ double widths = queGlass.getWidth();
+ String orderids = queGlass.getOrderId();
+ int num = spianMapper.SelectQueOrder();
+
+ if (num == 1) {
+
+ // 鑾峰彇璁㈠崟鐩稿叧搴︽渶楂樼殑绗煎瓙鎺掑簭
+ List<StorageCage> storageCage = spianMapper.selectAll(orderids);
+ if (storageCage == null) {
+ return (400);
+ }
+ for (StorageCage storageCage2 : storageCage) {
+ // 淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
+ cage1 = storageCage2.getCage();
+ // 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
+ int cages = spianMapper.selectCage(cage1);
+ StorageCage cages1;
+ // 鍒ゆ柇鏄惁鏈夊悎閫傚畬鏁寸┖鏍�
+ cages1 = spianMapper.selectqueCage1(cage1, storageCage2.getCell(), widths);
+ // 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
+ // 鏈夊悎閫傜┖鏍兼椂杩涚墖
+ if (cages1 != null && cages >= 1) {
+ ids = cages1.getId();// 鏁版嵁搴揑D
+ cells = cages1.getCell();// 鏍煎瓙鍙�
+ prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+ // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
+ for (int i = 2; i > 0; i--) {
+ Glass qglass = spianMapper.SelectQueueGlass(i);
+ width = qglass.getwidth();// 鏍煎瓙鍓╀綑瀹藉害
+ spianMapper.UpdataAddqueCage(qglass.getOrderId(), qglass.getGlassId(), width, cage1, cells, i,
+ 1);
+ spianMapper.UpdataAddCage1(width, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+ spianMapper.Inserttask(0, 0, 1000, ids, qglass.getGlassId().toString());// 鏂板浠诲姟
+ }
+ // 鎵ц杩涚墖
+ datas.add((short) 1000);
+ datas.add((short) prcid);
+ datas.add((short) 0);
+ datas.add((short) 1);
+ S7control.getinstance().WriteWord(adddresslist, datas);
+
+ return (200);
+
+ }
+ }
+
+ } else {
+ for (int i = 2; i > 0; i--) {
+ Glass qglass = spianMapper.SelectQueueGlass(i);
+ String orderid = qglass.getOrderId().toString();
+ String glassid = qglass.getGlassId();
+ widths = qglass.getwidth();
+ List<StorageCage> storageCage = spianMapper.selectAll(orderid);
+ if (storageCage == null) {
+ return (400);
+ }
+ for (StorageCage storageCage2 : storageCage) {
+ // 淇濆瓨璁㈠崟浼樺厛椤哄簭绗煎瓙鍙�
+ cage1 = storageCage2.getCage();
+ // 鍒ゆ柇璇ョ瀛愬彿鐩搁偦鏈�澶х殑绌烘牸鏁�
+ int cages = spianMapper.selectCage(cage1);
+ StorageCage cages1;
+ // 鍒ゆ柇鏄惁鏄浜岀墖闇�瑕佸姞闂撮殧鐗�
+ prctier = spianMapper.selectsum(cage1, storageCage2.getCell());// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
+ if (prctier > 0) {
+ cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths + 400);
+ } else {
+ cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths);
+ }
+ // 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
+ // 鏈夊悎閫傜┖鏍兼椂杩涚墖
+ if (cages1 != null && cages >= 1) {
+ ids = cages1.getId();// 鏁版嵁搴揑D
+ tiers = cages1.getTier();// 鍐呭鐗�
+ cells = cages1.getCell();// 鏍煎瓙鍙�
+ prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+ width = cages1.getWidth();// 鏍煎瓙鍓╀綑瀹藉害
+ widths = qglass.getwidth();
+
+ // 鎵ц杩涚墖
+ datas.add((short) 1000);
+ datas.add((short) prcid);
+ datas.add((short) prctier);
+ datas.add((short) 1);
+ // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
+ spianMapper.UpdataAddCage(orderid, glassid, widths, cage1, cells, ids, 2);
+ spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+ spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString());// 鏂板浠诲姟
+ // S7control.getinstance().WriteWord(adddresslist, datas);
+ break;
+ // S7control.getinstance().WriteByte("DB105.16",glassid);
+
+ }
+
+ }
+
+ }
+
+ }
+ return (400);
+
+ }
+
+ // 鎸夎鍗曞嚭鐗�
+ public Result selectout(String orderid) {
+
+ // spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔★紝鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
+ // 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
+ List<String> adddresslist = new ArrayList<>();
+ adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+ List<Short> datas = new ArrayList<>();
+ // 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
+ StorageCage cageout = spianMapper.selectOut(orderid);
+ if (cageout == null) {
+ return Result.success("200");
+ }
+ // 鍒ゆ柇鏄惁鍚屼竴鏍煎唴閮戒负鍚屼竴璁㈠崟
+
+ int orders = Integer.valueOf(cageout.getOrderId()).intValue();
+
+ int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
+ int cell = cageout.getCell();// 鍑虹墖鏍煎彿
+ int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
+ int prcid = cageout.getPrcId();// prcid
+ String glassid = cageout.getGlassId();
+ int prcid2;
+ int ids;
+ int cages;
+ int cells;
+ double glasswidth = cageout.getGlassWidth();
+ // 褰撲竴鏍煎唴閮戒负鍚屼竴璁㈠崟鏃�
+
+ if (orders == 2) {
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 2);
+ datas.add((short) 1);
+ spianMapper.UpdatequeOut(cage, cell);
+ return Result.success("200");
+ } else {
+ // 鍒ゆ柇鏄惁闄ゆ鏍煎瓙鍐呰繕鏈夊叾浠栨牸瀛愭湁鍗曠嫭鐨勮鍗曠幓鐠�
+ StorageCage pd = spianMapper.SelectQueout(orderid,cage, cell);
+ // 鍒ゆ柇鐜荤拑鍐呭鐗�
+ if (tier == 2) {
+
+ // 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
+ // 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, orderid);// 鏂板浠诲姟
+ S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+ outmesid(glassid);// 娲惧彂鍑虹墖ID
+ if (pd != null) {
+ cage = pd.getCage();
+ cell = pd.getCage();
+ // 娓呴櫎鏈牸鏁版嵁鍑虹墖
+ spianMapper.UpdatequeOut(cage, cell);
+ return Result.success("200");
+ }
+ return Result.success(datas);// 缁撴潫
+ } else {
+ // 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
+ int state = spianMapper.selectGlassState(cage, cell);
+ // 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
+ if (state == 1) {
+ // spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ spianMapper.Inserttask(1, 0,prcid, 1000, orderid);// 鏂板浠诲姟
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ //S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+ //outmesid(glassid);// 娲惧彂鍑虹墖ID
+ if (pd != null) {
+ cage = pd.getCage();
+ cell = pd.getCage();
+ // 娓呴櫎鏈牸鏁版嵁鍑虹墖
+ spianMapper.UpdatequeOut(cage, cell);
+ return Result.success("200");
+ }
+ return Result.success(datas);// 缁撴潫
+
+ } else {
+ // 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
+ if (cage < 6) {
+ StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
+ if (cagecell == null) {
+ return Result.success(cagecell);
+ }
+ // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
+ ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛�
+ cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛�
+
+ // 濉叆璋冩嫧鏁版嵁
+ datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
+ datas.add((short) prcid2);
+ datas.add((short) 2);
+ datas.add((short) 1);
+ // 鏇存崲鐜荤拑鐨勭瀛�
+ String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.Inserttask(2, 0, cageout.getId(), ids, orderid);// 鏂板璋冨害浠诲姟
+ // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+ System.out.println(datas);
+ outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ return Result.success(cagecell); // 缁撴潫
+
+ } else {// 绗煎瓙鍙峰ぇ浜�5鏃�
+ StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
+ if (cagecell == null) {
+ return Result.success(cagecell);
+ }
+ // 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
+ prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
+ ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛�
+ cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛�
+ // 濉叆璋冩嫧鏁版嵁
+ datas.add((short) prcid);
+ datas.add((short) prcid2);
+ datas.add((short) 2);
+ datas.add((short) 1);
+ String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.Inserttask(2, 0, cageout.getId(), ids, orderid);// 鏂板璋冨害浠诲姟
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ // 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+
+ outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ return Result.success(cagecell); // 缁撴潫
+
+ }
+ }
+
+ }
+ }
+
+ }
+
// @GetMapping("/all2")
public Short selectout2(String glassid) {
- //spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�,鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
+ // spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�,鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
@@ -237,12 +385,9 @@
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut2(glassid);
- if(cageout==null){
- return (300);
+ if (cageout == null) {
+ return (300);
}
-
-
-
int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
int cell = cageout.getCell();// 鍑虹墖鏍煎彿
@@ -251,49 +396,47 @@
int prcid2;
int ids;
int cages;
- int cells;
+ int cells;
double glasswidth = cageout.getGlassWidth();
// 鍒ゆ柇鐜荤拑鍐呭鐗�
if (tier == 2) {
- int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
+ int state = spianMapper.selectGlassState(cage, cell);// 鑾峰彇鏍煎瓙鏁伴噺
// 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
// 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) state);
datas.add((short) 1);
-
- spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
- spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//鏂板浠诲姟
- //int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
- if(state==2){
+
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
+ // int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
+ if (state == 2) {
spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
}
- S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid);//娲惧彂鍑虹墖ID
-
-
- return (200);//缁撴潫
+ S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+ //outmesid(glassid);// 娲惧彂鍑虹墖ID
+
+ return (200);// 缁撴潫
} else {
// 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
int state = spianMapper.selectGlassState(cage, cell);
// 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
if (state == 0) {
- //spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);
+ // spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
- spianMapper.Inserttask(1, 0,cageout.getId(),1000 ,glassid);//鏂板浠诲姟
- spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
- outmesid(glassid);//娲惧彂鍑虹墖ID
- S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-
-
- return (200);//缁撴潫
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ //outmesid(glassid);// 娲惧彂鍑虹墖ID
+ S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+
+ return (200);// 缁撴潫
} else {
// 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
@@ -305,28 +448,27 @@
// 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
- cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
- cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
-
-
+ cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛�
+ cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛�
+
// 濉叆璋冩嫧鏁版嵁
datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
datas.add((short) prcid2);
datas.add((short) 2);
datas.add((short) 1);
- // 鏇存崲鐜荤拑鐨勭瀛�
- String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
- spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
- spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
- spianMapper.Inserttask(2, 0,cageout.getId(),ids,glassid);//鏂板璋冨害浠诲姟
- spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//鏂板鍑虹墖浠诲姟
+ // 鏇存崲鐜荤拑鐨勭瀛�
+ String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassid);// 鏂板璋冨害浠诲姟
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
- S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-
- outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID
- return (200); //缁撴潫
+ S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+
+ outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ return (200); // 缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
@@ -336,25 +478,25 @@
// 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
- cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
- cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
+ cages = cagecell.getCage();// 璋冩嫧鐩爣浣嶇瀛�
+ cells = cagecell.getCell();// 璋冩嫧鐩爣浣嶆牸瀛�
// 濉叆璋冩嫧鏁版嵁
datas.add((short) prcid);
datas.add((short) prcid2);
datas.add((short) 2);
datas.add((short) 1);
- String glassids=spianMapper.SelectGlassid(cage, cell); //鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
- spianMapper.Inserttask(2, 0,cageout.getId()+1,ids,glassid);//鏂板璋冨害浠诲姟
- spianMapper.Inserttask(1, 0,cageout.getId(),1000,glassid);//鏂板鍑虹墖浠诲姟
+ String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
+ spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassid);// 鏂板璋冨害浠诲姟
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
- spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
- S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
-
- outmesid(glassids);//娲惧彂璋冩嫧鐜荤拑ID
- return (200);//缁撴潫
+ S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
+
+ outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ return (200);// 缁撴潫
}
}
@@ -363,14 +505,14 @@
}
public void outmesid(String glassid) {
- System.out.println("outmesid:"+glassid);
- List<Byte> glassidlist=new ArrayList();
- for (char iditem : glassid.toCharArray()) {
- glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
- }
- byte[] bytes= Bytes.toArray(glassidlist);
- System.out.println("outmesidbytes:"+bytes.length);
- S7control.getinstance().WriteByte("DB105.30", bytes);//娲惧彂鍑虹墖id
+ System.out.println("outmesid:" + glassid);
+ List<Byte> glassidlist = new ArrayList();
+ for (char iditem : glassid.toCharArray()) {
+ glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
+ }
+ byte[] bytes = Bytes.toArray(glassidlist);
+ System.out.println("outmesidbytes:" + bytes.length);
+ S7control.getinstance().WriteByte("DB105.30", bytes);// 娲惧彂鍑虹墖id
}
/*** 淇敼鐢ㄦ埛* @throws SQLException */
@@ -392,4 +534,3 @@
// }
}
-
--
Gitblit v1.8.0