From 1de312a18d164c2fa3718a1a975b8c5804723bcf Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 13:46:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 8d4f7e1..314cee4 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -215,8 +215,8 @@
"cancelButtonText": "鍙栨秷",
"deleteSuccessMessage": "鍒犻櫎鎴愬姛",
"deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
- "Enter the glass lD": "杈撳叆鐜荤拑id",
- "Infeed barcodid": "鎵嬪姩涓婄墖",
+ "Enter the glass barcode": "杈撳叆鐜荤拑id",
+ "Infeed Barcodeid": "鎵嬪姩涓婄墖",
"Enter the order number": "杈撳叆璁㈠崟鍙�",
"Exit the glass by order number": "鎸夎鍗曞嚭鐗�",
"Please confirm the glass information": "璇风‘璁ょ幓鐠冧俊鎭�",
@@ -224,32 +224,28 @@
"Alarm Information": "鎶ヨ淇℃伅",
"Cage Details": "鐞嗙墖绗艰鎯�",
"order": "璁㈠崟",
- "length": "闀�",
- "width": "瀹�",
+ "Length": "闀�",
+ "Width": "瀹�",
"Operate": "鎿嶄綔",
+ "Terminate Task":"缁撴潫浠诲姟",
"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": "灏哄",
+ "Number": "鏁伴噺",
+ "Outfeed glass barcode": "鍑虹墖鐜荤拑id",
+ "Infeed glass barcode": "杩涚墖鐜荤拑id",
+ "Order No": "璁㈠崟缂栧彿",
+ "List No": "鍒楄〃缂栧彿",
+ "Box No": "绠卞瓙缂栧彿",
+ "Dim": "灏哄",
"id": "id",
"content": "鍐呭",
"timeon": "鎶ヨ鏃堕棿",
"endTime": "缁撴潫鏃堕棿",
- "The Cage number": "绗煎瓙",
+ "Cage No": "绗煎瓙",
"The Side": "鍐呭渚�",
- "The Slot Number": "鏍煎瓙",
- "Barcodid": "鐜荤拑id",
- "Order Number": "璁㈠崟",
- "delete": "鍒犻櫎",
- "out": "鍑虹墖",
+ "Slot No": "鏍煎瓙",
+ "Barcode": "鐜荤拑id",
+ "Delete": "鍒犻櫎",
+ "Out": "鍑虹墖",
"Operation successful": "鎿嶄綔鎴愬姛",
"Operation canceled": "鎿嶄綔鍙栨秷",
"There is no such order": "娌℃湁姝よ鍗曠殑鐜荤拑",
@@ -276,13 +272,13 @@
"DataBase Connection failed": "鏁版嵁搴撹繛鎺ュけ璐�",
"Distribute parameters": "涓嬪彂鍙傛暟",
"The glass size is not within the range": "鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
- "increase": "娣诲姞",
+ "Increase": "娣诲姞",
"Enable": "鍚敤",
"Disable": "绂佺敤",
"Usage": "浣跨敤鐜�",
"Space (Pieces)": "绌洪棿(鐗囨暟)",
"This glass is already in the cage": "绗煎瓙閲屽凡鏈夋鐜荤拑",
- "Enter the Order lD": "璇疯緭鍏ヨ鍗昳d",
+ "Enter the Order No": "璇疯緭鍏ヨ鍗昳d",
"OrderInfo": "璁㈠崟淇℃伅",
"Query": "鏌ヨ",
"permission update": "鏉冮檺缂栬緫",
@@ -296,6 +292,15 @@
"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)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
--
Gitblit v1.8.0