From 1c26bd4ac7453b5f4a29f0e428893b5247a8fde8 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期二, 24 十月 2023 10:18:57 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- CanadaMes-ui/src/lang/locales/zh-CN.json | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json index 865e5ec..20c1032 100644 --- a/CanadaMes-ui/src/lang/locales/zh-CN.json +++ b/CanadaMes-ui/src/lang/locales/zh-CN.json @@ -223,7 +223,7 @@ "Enter the glass lD":"杈撳叆鐜荤拑id", - "Manually feed the glass":"鎵嬪姩涓婄墖", + "Infeed barcodid":"鎵嬪姩涓婄墖", "Enter the order number":"杈撳叆璁㈠崟鍙�", "Exit the glass by order number":"鎸夎鍗曞嚭鐗�", "Please confirm the glass information":"璇风‘璁ょ幓鐠冧俊鎭�", @@ -233,28 +233,29 @@ "order":"璁㈠崟", "length":"闀�", "width":"瀹�", - "coating":"娑傚眰", "Operate":"鎿嶄綔", "end task":"瀹屾垚浠诲姟", - "cancal":"鍙栨秷", + "cancel":"鍙栨秷", "confirm":"纭", "number":"鏁伴噺", - "Coming out glass ID":"鍑虹墖鐜荤拑id", - "Incoming glass ID":"杩涚墖鐜荤拑id", + "Outfeed Barcodid":"鍑虹墖鐜荤拑id", + "Infeed Barcodid":"杩涚墖鐜荤拑id", "The Cage number being used":"绗煎瓙", - "The Grille number being used":"鏍煎瓙", + "The Slot number being used":"鏍煎瓙", "Order Nmuber":"璁㈠崟缂栧彿", - "Length and width":"灏哄", + "List Number":"鍒楄〃缂栧彿", + "Box Number":"绠卞瓙缂栧彿", + "Length and Width":"灏哄", "id":"id", "content":"鍐呭", "timeon":"鎶ヨ鏃堕棿", "endTime":"缁撴潫鏃堕棿", "The Cage number":"绗煎瓙", - "tier":"灞�", - "cell":"鏍煎瓙", - "glassid":"鐜荤拑id", - "order number":"璁㈠崟", + "The Side":"鍐呭渚�", + "The Slot Number":"鏍煎瓙", + "Barcodid":"鐜荤拑id", + "Order Number":"璁㈠崟", "delete":"鍒犻櫎", "out":"鍑虹墖", @@ -283,6 +284,17 @@ "Please enter the password":"璇疯緭鍏ュ瘑鐮�", "Password error":"瀵嗙爜閿欒", "DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�", - "Distribute parameters":"涓嬪彂鍙傛暟" + "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":"鏉冮檺缂栬緫" } \ No newline at end of file -- Gitblit v1.8.0