From a8d31b3d7b6e0d60b8045ace9be49cdfb590696f Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期四, 09 十一月 2023 15:46:37 +0800
Subject: [PATCH] 拉取后对应翻译没了，部分代码报错，修改后提交
---
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 284 ++++++++------
springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java | 89 ++--
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 443 ++++++++++++-----------
CanadaMes-ui/src/lang/locales/zh-CN.json | 284 ++++++++++----
4 files changed, 627 insertions(+), 473 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index fa58c91..0b55a8b 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,67 +208,60 @@
"addUserSuccess": "娣诲姞鐢ㄦ埛鎴愬姛",
"editUserSuccess": "淇敼鐢ㄦ埛鎴愬姛",
"effective": "鏈夋晥",
-"invalid": "鏃犳晥",
-
-"addSuccessMessage": "娣诲姞鎴愬姛",
-"deleteConfirmMessage": "纭畾瑕佸垹闄よ鏉冮檺鍚楋紵",
-
-"confirmButtonText": "纭畾",
-"cancelButtonText": "鍙栨秷",
-"deleteSuccessMessage": "鍒犻櫎鎴愬姛",
-"deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
-
-
-
- "Enter the glass lD":"杈撳叆鐜荤拑id",
- "Infeed barcodid":"鎵嬪姩涓婄墖",
- "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":"鎿嶄綔",
- "end task":"瀹屾垚浠诲姟",
- "cancel":"鍙栨秷",
- "confirm":"纭",
- "number":"鏁伴噺",
- "Outfeed Barcodid":"鍑虹墖鐜荤拑id",
- "Infeed Barcodid":"杩涚墖鐜荤拑id",
- "The Cage number being used":"绗煎瓙",
- "The Slot number being used":"鏍煎瓙",
- "Order Nmuber":"璁㈠崟缂栧彿",
- "List Number":"鍒楄〃缂栧彿",
- "Box Number":"绠卞瓙缂栧彿",
- "Length and Width":"灏哄",
- "id":"id",
- "content":"鍐呭",
- "timeon":"鎶ヨ鏃堕棿",
- "endTime":"缁撴潫鏃堕棿",
-
- "The Cage number":"绗煎瓙",
- "The Side":"鍐呭渚�",
- "The Slot Number":"鏍煎瓙",
- "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 lD": "杈撳叆鐜荤拑id",
+ "Infeed barcodid": "鎵嬪姩涓婄墖",
+ "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": "鎿嶄綔",
+ "end task": "瀹屾垚浠诲姟",
+ "cancel": "鍙栨秷",
+ "confirm": "纭",
+ "number": "鏁伴噺",
+ "Outfeed Barcodid": "鍑虹墖鐜荤拑id",
+ "Infeed Barcodid": "杩涚墖鐜荤拑id",
+ "The Cage number being used": "绗煎瓙",
+ "The Slot number being used": "鏍煎瓙",
+ "Order Nmuber": "璁㈠崟缂栧彿",
+ "List Number": "鍒楄〃缂栧彿",
+ "Box Number": "绠卞瓙缂栧彿",
+ "Length and Width": "灏哄",
+ "id": "id",
+ "content": "鍐呭",
+ "timeon": "鎶ヨ鏃堕棿",
+ "endTime": "缁撴潫鏃堕棿",
+ "The Cage number": "绗煎瓙",
+ "The Side": "鍐呭渚�",
+ "The Slot Number": "鏍煎瓙",
+ "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": "鍚�",
"today": "浠婂ぉ",
"yesterday": "鏄ㄥぉ",
"week": "涓�鍛ㄥ墠",
@@ -280,31 +271,142 @@
"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 lD":"璇疯緭鍏ヨ鍗昳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 lD": "璇疯緭鍏ヨ鍗昳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",
+ "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/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 0024641..04444d3 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
@@ -22,232 +22,245 @@
@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);
+ 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("/Loadcarlist")
- public Result Loadcarlist() {
- List<CarPosition> carlist = homeMapper.Loadcarlist();
- Map<String, Object> map = new HashMap<>();
- map.put("carlist", carlist);
- 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");
+ }
}
- //鏌ヨ纭瀵嗙爜
- @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);
+ }
+
+ // 鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟
+ @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 {
+
+ spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+ homeMapper.UpdateCageTask2(glassid);
+ S7control.getinstance().WriteWord("DB105.12", (short) 0);
}
- //鏍规嵁鐜荤拑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);
- }
- //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
- @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 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.getGlassWidth(), cage, cell);
- }
- 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);
+ 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);
- }
-
- //纭鎵爜浣嶇幓鐠冧俊鎭�
- @PostMapping("/UpdateQueueState")
- public Result UpdateQueueState() {
- homeMapper.UpdateQueueState();
- Map<String, Object> map = new HashMap<>();
- 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);
+ }
- //娓呴櫎涓婄墖闃熷垪鐜荤拑
- @PostMapping("/DeleteQueueGlass")
- public Result DeleteQueueGlass(String id) {
- homeMapper.DeleteQueueGlass(id);
- Map<String, Object> map = new HashMap<>();
- map.put("message", "200");
- 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) {
+ Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("form", Glass);
+ 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 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);
+ }
+
+ // 鏌ヨ鐜荤拑淇℃伅
+ @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);
+ }
+
+ // 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ @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);
+ }
+
+ // 纭鎵爜浣嶇幓鐠冧俊鎭�
+ @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);
+ }
+
}
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/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 6903be8..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,131 +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 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);
+ // 鍒ゆ柇鐩搁偦绗煎瓙鏄惁鏈夌┖鏍�
+ @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 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);
+ // 鍒ゆ柇璇ョ瀛愭槸鍚︽湁鍚堥�傚搴︾┖鏍�
+ @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 COUNT(state) from storage_cage where cage=#{cage} and cell=#{cell}")
- 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(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 and state=0;")
- @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
--
Gitblit v1.8.0