From d33a7f7c7e7c218a4cb71cb039249b75bcfeef42 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 三月 2025 15:31:00 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/lang/ar.js |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index fa8c0c4..cabc109 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -275,7 +275,13 @@
 
             pleaseCancelTheFilteringFirst:'賷乇噩賶 廿賱睾丕亍 丕賱丕禺鬲賷丕乇 兀賵賱丕賸',
             grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
-            differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵'
+            differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵',
+            updateOrderIdErrorGtMaxId:'杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿',
+            updateOrderIdErrorIsExist:'杈撳叆璁㈠崟鍙峰凡瀛樺湪',
+            updateOrderIdErrorIsSame:'杈撳叆璁㈠崟鍙风浉鍚�',
+            updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
+            updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
+            updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
         }
 
     },
@@ -301,7 +307,9 @@
         copyTitle:'賳爻禺 丕賱毓賳賵丕賳',
         msgList:{
             checkOrder:'賱賲 賷鬲賲 丕賱毓孬賵乇 毓賱賶 賲毓賱賵賲丕鬲 丕賱胤賱亘貙 賷乇噩賷 鬲丨丿賷丿 丕賱胤賱亘 丕賵賱丕賸',
-        }
+        },
+        updateOrderId:"淇敼璁㈠崟鍙�",
+        reportingTransfer:'鎶ュ伐杞Щ'
     },
     craft:{
         glassAddress:'賵囟毓 毓賱丕賲丞 丕賱夭噩丕噩',

--
Gitblit v1.8.0