From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/lang/zh.js |  208 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 193 insertions(+), 15 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 5ed246a..e97f90b 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -69,8 +69,17 @@
         partiallySelected:'閮ㄥ垎閫変腑',
         unchecked :'鏈�変腑',
         copy:'澶嶅埗',
+
+        orderRemarks:'璁㈠崟澶囨敞',
+        filmNumber:'浜у搧澶囨敞',
+        remarks1:'澶囨敞1',
+        remarks2:'澶囨敞2',
+        remarks3:'澶囨敞3',
+        remarks4:'澶囨敞4',
+        otherColumns:'鍏朵粬鍒�',
         msg:{
             max255:"鏈�澶氳緭鍏�255涓瓧绗�",
+            max10:"鏈�澶氳緭鍏�10涓瓧绗�",
             range99999Dec2:
                 "璇疯緭鍏�0-99999涔嬮棿鐨勬暟瀛楋紝鏈�澶氫繚鐣欎袱浣嶅皬鏁�",
             range99999Dec3:
@@ -95,6 +104,10 @@
             range9999Dec: "璇疯緭鍏ュ洓浣嶆暣鏁�",
             quantityError: "鏁伴噺閿欒锛岃鍒锋柊鍐嶄繚瀛�",
             dataDoesNotExist: "鏁版嵁涓嶅瓨鍦�",
+            greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�",
+            greater0Msg:"璇疯緭鍏ュぇ浜�0鐨勬暟瀛�",
+            notExport:"璇ユ牸寮忎笉鏀寔瀵煎嚭",
+            notUpdate:"鍙傛暟鏈慨鏀�",
         }
     },
     product:{
@@ -165,6 +178,8 @@
 
            productAbbreviation:'浜у搧绠�绉�',
            productDuplication:'浜у搧閲嶅',
+           msg1:'鍒涘缓浜烘槸锛�',
+           msg2:'鏃犳硶鎿嶄綔锛�',
        }
     },
     order:{
@@ -241,10 +256,10 @@
         orderHasBeenReceived:'璁㈠崟宸插叆搴�',
         printingNumber:'鎵撳嵃娆℃暟',
         processingOrder:'鍔犲伐鍗�',
-        sheet2:'妯増-澶氬眰鏄庣粏',
-        sheet4:'鐢熶骇鍔犲伐鍗曠旱鐗�',
+        sheet2:'妯増-澶氬眰鏄庣粏(鎺ㄨ崘)',
+        sheet4:'绾电増-鎴愬搧淇℃伅',
         sheet3:'娴忚鍙戣揣淇℃伅',
-        sheet5:'鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)',
+        sheet5:'绾电増-鍗曠墖寮挗',
         oneClickStorage:'涓�閿畬宸�',
         oneClickReturn:'涓�閿��鍥�',
 
@@ -260,11 +275,17 @@
         vertical:'绔�',
         exportDXF:'瀵煎嚭dxf',
         selectFile:'閫夋嫨鏂囦欢',
+        left:'宸�',
+        right:'鍙�',
+        edgeAngleCurvature:'杈硅寮у害',
+        cuttingCorners:'鍒囪竟瑙�',
+        fourCornerExcavation:'鍥涜鎸栫己',
 
         ownerForProduction:'鐢熶骇閮ㄩ棬璐熻矗浜�',
         surtax:'闄勫姞绋�',
         valueAddedTax:'澧炲�肩◣',
         cuttingTransport:'杩愯緭娑堝噺',
+        colourCeramicGlaze:'褰╅噳鍥惧彿',
         transferPage:{
             oldOrderId:'鍘熻鍗曞彿',
             newOrderId:'鏂拌鍗曞彿',
@@ -307,7 +328,24 @@
             updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
             updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
             updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
-            updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒'
+            updateOrderError:'姝よ鍗曞凡宸ヨ壓瀹℃牳鎴栦慨鏀规棤娉曞啀娆′慨鏀�,椤甸潰灏嗚嚜鍔ㄥ埛鏂帮紒',
+            pleaseProcessType:'璇烽�夋嫨纾ㄨ竟绫诲瀷',
+            pleaseUploadPicture1:"璇峰厛閫夋嫨瑕佷笂浼犵殑DWG鏂囦欢鎴栧浘鐗囨枃浠�",
+            pleaseUploadPicture2:"鍑嗗涓婁紶...",
+            pleaseUploadPicture3:"涓婁紶涓�...",
+            pleaseUploadPicture4:"涓婁紶瀹屾垚!",
+            pleaseUploadPicture5:"涓婁紶澶辫触!",
+            pleaseUploadPicture6:"璇烽�夋嫨DWG鏂囦欢鎴朖PG銆丳NG鏍煎紡鐨勫浘鐗囨枃浠�",
+            pleaseUploadPicture7:"鏂囦欢澶у皬涓嶈兘瓒呰繃50MB",
+            pleaseUploadPicture8:"宸查�夋嫨鏂囦欢:",
+            pleaseUploadPicture9:"鏂囦欢涓婁紶",
+            pleaseUploadPicture10:"鎷栨嫿鏂囦欢鍒版澶勬垨",
+            pleaseUploadPicture11:"鐐瑰嚮閫夋嫨鏂囦欢",
+            pleaseUploadPicture12:"浠呮敮鎸� .dwg銆�.jpg銆�.png 鏍煎紡鏂囦欢锛屼笖鏂囦欢澶у皬涓嶈秴杩�50MB",
+            pleaseUploadPicture13:"涓婁紶杩涘害",
+            pleaseUploadPicture14:"涓婁紶缁撴灉",
+            pleaseUploadPicture15:"鏂囦欢宸叉垚鍔熻浆鏍煎紡",
+            pleaseUploadPicture16:"涓嬭浇",
         },
         preciseMode:'绮剧‘妯″紡',
         ambiguityModels:'妯$硦妯″紡',
@@ -315,7 +353,9 @@
         glassQuantity:'灏忕墖鏁伴噺',
         merge:'瀹屾暣妯″紡',
         layer:'鍗曠墖妯″紡',
-        notFinish:'寰呭畬鎴�'
+        notFinish:'寰呭畬鎴�',
+        processCardCollect:'娴佺▼鍗℃眹鎬�',
+        fileUpload:'鏂囦欢涓婁紶'
 
     },
     searchOrder:{
@@ -343,7 +383,8 @@
             isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
             isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
             isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
-            BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?"
+            BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+            filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
         },
         updateOrderId:"淇敼璁㈠崟鍙�",
         reportingTransfer:'鎶ュ伐杞Щ'
@@ -374,7 +415,7 @@
         TrademarkAttribute:'鍟嗘爣鍙傛暟',
         TrademarkOptions:'鍟嗘爣閫夐」',
         xImage:'X杞撮暅鍍�',
-        yImage:'y杞撮暅鍍�',
+        yImage:'Y杞撮暅鍍�',
         modifyTrademark:'淇敼鍟嗘爣',
         tag:'鎵撴爣浣胯兘',
         tag2:'浜岀淮鐮佹墦鍗�1',
@@ -383,7 +424,10 @@
         yMargin:'楂樻柟鍚戝潗鏍�',
         location:'鍟嗘爣浣嶇疆',
         sort:'鐜荤拑鍙嶅集',
-        archRise:'鎷遍珮'
+        archRise:'鎷遍珮',
+        qr1Local:'浜岀淮鐮�1浣嶇疆',
+        qr2Local:'浜岀淮鐮�2浣嶇疆',
+        default:'榛樿'
 
     },
 
@@ -416,6 +460,11 @@
             selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
 
         },
+        yesTitle:'鏈夋爣棰樻墦鍗�',
+        noTitle:'鏃犳爣棰樻墦鍗�',
+        buildingNumber:'妤煎彿',
+        longSide:'闀胯竟',
+        shortSide:'鐭竟',
         printCompound:'闇�瑕佸悓鏋剁殑灞�',
         flashback:'鍊掑簭',
         processId:'娴佺▼鍗″彿',
@@ -507,7 +556,7 @@
         mergePrinting:'鍚堝苟鎵撳嵃',
         printStatus:'鎵撳嵃娆℃暟',
         labelPrinting2:'鏍囩鎵撳嵃2',
-        finishedProductPrinting2:'鎴愬搧鎵撳嵃2',
+        finishedProductPrinting2:'鎵撳嵃',
         editablePrinting:'鏍囩鑷畾涔夋墦鍗�',
         invertSelection:'鍙嶉��',
         sortSummary:'鎺掑簭姹囨��',
@@ -545,7 +594,27 @@
         noFlowCard:'鏈垎鏋�',
         mainWidth:'瀹介珮',
         mainHeight:'楂樺',
+        terminationQuantity:'鐢熶骇缁堟鏁伴噺',
+        terminationMsg:'璇疯緭鍏ユ纭殑鍙慨鏀规暟閲�',
+        maxCompleted:'缁堟鏁伴噺',
+        terminationNo:'鍙栨秷缁堟',
+        updateProcessMsg:'淇濆瓨澶辫触锛佽妫�鏌ュ彉鏇村伐搴忔槸鍚︽姤宸�',
+        termination:'缁堟',
 
+        quantity:'宸ョ▼鐢ㄦ暟閲�',
+        print1:'11鍒�4琛�',
+        print2:'6琛�3鍒�',
+        glassId:'鐜荤拑缂栧彿',
+        polysId:'灏忕墖搴忓彿',
+        msg:{
+            msg1:'娴佺▼鍗″垱寤哄け璐�',
+            msg2:'璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧',
+            msg3:'鎵�閫夋暟鎹殑鏁伴噺鎬诲拰',
+            msg4:'涓庤鍗曟暟閲�',
+            msg5:'涓嶅尮閰嶏紝璇锋鏌ュ悗閲嶈瘯锛�',
+            msg6:'鏄惁鍚堝苟?',
+            msg7:'鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�',
+        }
     },
     reportingWorks:{
         page:{
@@ -632,7 +701,8 @@
         changeFailed:'淇敼澶辫触锛岃妫�鏌ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟',
         hiddenVal:'闅愯棌',
 
-
+        futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+        longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
         selectResponsibleTeam:'璇烽�夋嫨璐d换鐝粍',
         selectWorkReportingTeam:'璇烽�夋嫨璐d换鐝粍',
         successfulModificationOfWorkApplication:'鎶ュ伐淇敼鎴愬姛',
@@ -663,6 +733,18 @@
         pleaseNumber12:'鏈伐搴忔姤宸ユ暟:',
         pleaseNumber13:'涓嬪伐搴忔姤宸ユ暟:',
         pleaseNumber14:'鏈伐搴忎慨鏀规暟涓嶈兘灏忎簬涓嬪伐搴忔姤宸ユ暟',
+        pleaseNumber15:'宸插叆搴撴暟閲忎笉鑳藉ぇ浜庡凡瀹屽伐鏁伴噺',
+
+        pleaseNumber16:'璇烽�夋嫨鏈�鍚庡伐搴忔姤宸ュ叆搴�',
+
+        woodenBox:'鏈ㄧ:',
+        brandreth:'閾佹灦',
+        tilting:'鍊掓灦',
+        secondaryBreakage:'搴忓彿娆$牬鐩稿悓',
+        checkedBreakage:'閫変腑娆$牬鐩稿悓',
+        unreviewed:'鏈鏍�',
+        notunreviewed:'瀹℃牳鏈�氳繃',
+        notQualified:'鏃犻渶璐ㄦ',
     },
     productStock:{
         page:{
@@ -768,8 +850,13 @@
         boxNumber:'绠卞彿',
         msg1:'鍙戣揣鍗曞凡鍑哄簱璇峰埛鏂扮晫闈�',
         msg2:'鍙戣揣鍗曞簱瀛樻暟涓嶅瓨鍦�',
-        msg3:'鍏ュ簱鏁伴噺涓嶈兘瓒呰繃璁㈠崟鎬绘暟',
+        msg3:'鍏ュ簱鏁伴噺涓嶈兘瓒呰繃娴佺▼鍗℃�绘暟',
         boxingPrinting:'瑁呯鎵撳嵃',
+        packing:'瑁呯璋冩灦',
+        msgPacking:'瑁呯璋冩灦鎴愬姛',
+        boxNumberOrRemarks:'绠卞彿鎴栧娉�',
+        msg4:'鍙戣揣鍗曞凡鍒涘缓',
+        msg5:'鐗╂枡鍙兘瀛樺湪瑁呯璋冩灦锛屾棤娉曢��鍥�',
     },
     customer:{
         page:{
@@ -815,7 +902,7 @@
         produce:'鐢熶骇',
         traveler:'娴佺▼鍗�',
         warehousing:'鍏ュ簱',
-        unpaidQuantity:"鏈彂鏁伴噺 ",
+        unpaidQuantity:"璁㈠崟鏈彂鏁伴噺 ",
         availableStock:'鍙敤搴撳瓨',
         deliveryQuantity:'鍙戣揣鏁伴噺',
         pleaseEnterTheAmountOfFunds:'璇疯緭鍏ラ」鐩悕绉�',
@@ -847,6 +934,9 @@
         freightQuantity:'杩愯垂鏁伴噺',
         freight:'杩愯垂閲戦',
         pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
+        print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
+        print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
+        orderAdd:'璁㈠崟娣诲姞',
 
     },
     replenish:{
@@ -864,7 +954,8 @@
         sliceMarking:'鐗囨爣璁�',
         printPatchesMsg1:'璇烽�夋嫨鏍囩妯℃澘',
         labelTemplate:'鏍囩妯℃澘锛�',
-        listLabelTemplates:'鏍囩妯℃澘鍒楄〃'
+        listLabelTemplates:'鏍囩妯℃澘鍒楄〃',
+        label:'灏忕墖鏍囩',
     },
     rework:{
         page:{
@@ -885,6 +976,7 @@
         PleaseSelectAReworkTeam:'璇烽�夋嫨杩斿伐鐝粍',
         TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'杩斿伐鏁伴噺涓嶈兘澶т簬娆$牬鏁伴噺',
         reworkQuantityCannotBeEmptyOr0:'杩斿伐鏁伴噺涓嶈兘涓虹┖鎴栬�呮槸0',
+        msg1:'璇峰~鍏ラ渶瑕佸悎骞剁殑灞�',
     },
 
 
@@ -930,10 +1022,19 @@
         changeUserName:'淇敼鐢ㄦ埛鍚嶇О',
         userNameCannotBeEmpty:'鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖',
     },
+    userLog:{
+        page:{
+            userListLog:'鏃ュ織棣栭〉',
+        },
+        loginName:'鐧诲綍鍚�',
+        userName:'鐢ㄦ埛鍚�',
+        loginDate:'鐧诲綍鏃堕棿',
+    },
     orderBasicData:{
         page:{
             searchOrderBasicData:'鍩虹绫诲瀷',
             searchGlassType:'鐜荤拑绫诲埆',
+            searchProcessAttributeConfig:'宸ヨ壓灞炴�х被鍒�',
         },
         glassCategory:'鐜荤拑绫诲埆',
         order:'璁㈠崟',
@@ -974,6 +1075,9 @@
         laminatingProcessB:'涓┖鍚庡悎鐗囧伐搴�',
         laminatingProcessC:'澶硅兌宸ュ簭',
         laminatingProcessD:'涓┖宸ュ簭',
+        please1:'璇烽�夋嫨绫诲埆',
+        please2:'璇疯緭鍏ュ悕绉�',
+        please3:'璇疯緭鍏ュ埆鍚�',
     },
     machine:{
         page:{
@@ -1037,16 +1141,20 @@
             finishedProductReport :'鎴愬搧鎶ヨ〃',
             orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
         },
+        allProcess:'鍏ㄩ儴',
         teamsGroupsName:'涓婂伐搴忔姤宸�',
         productionReport:'鐢熶骇鎶ヨ〃',
         workInProgressReport:'鍦ㄥ埗鍝佹槑缁嗘姤琛�',
         WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
+        processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
         processToBeCompleted:'宸ュ簭寰呭畬鎴愭姤琛�',
         productionAndShippingProgress:'鐢熶骇鍙戣揣杩涘害鎶ヨ〃',
         processCardProgress:'娴佺▼鍗¤繘搴︽姤琛�',
         orderPlanDecomposition:'璁㈠崟璁″垝鍒嗚В鎶ヨ〃',
         secondaryBrokenReport:'娆$牬鎶ヨ〃',
         crossProcessBreakdown:'璺ㄥ伐搴忔鐮存姤琛�',
+        notCrossProcessBreakdown:'闈炶法宸ュ簭娆$牬鎶ヨ〃',
+        secondaryBrokenTotal:'娆$牬鎬绘姤琛�',
         teamOutput:'鐝粍浜ч噺鎶ヨ〃',
         splittingDetails:'鍒嗘灦鏄庣粏鎶ヨ〃',
         TaskCompletionStatus:'浠诲姟瀹屾垚鎯呭喌鎶ヨ〃',
@@ -1054,11 +1162,13 @@
         qualityReport:'鍝佽川鎶ヨ〃',
         productionScheduling:'鎺掍骇璁″垝鎶ヨ〃',
         yieldReport:'鎴愬搧鐜囨姤琛�',
+        yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
         workingProcedure:'宸ュ簭',
         inventoryArea:'搴撳瓨闈㈢Н',
         pleaseSelectADateFirst:'璇峰厛閫夋嫨鏃ユ湡',
         pleaseSelectAProcessFirst:'璇峰厛閫夋嫨宸ュ簭',
         theFilteringTimeForExportCannotExceed180Days:'瀵煎嚭鐨勭瓫閫夋椂闂翠笉鑳借秴杩�180澶�',
+        theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
         orderTime :'涓嬪崟鏃堕棿',
         deliveryDate:'浜よ揣鏃ユ湡',
         completedQuantity:'宸插畬鎴愭暟閲�',
@@ -1082,6 +1192,10 @@
         finished :'鎴愬搧鐜�',
         finishedProductReport :'鎴愬搧鎶ヨ〃',
         workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+        StorageArea:'鍏ュ簱闈㈢Н',
+        shippedArea:'鍙戣揣闈㈢Н',
+        thicknessArea:'骞虫柟姣背'
+
     },
     productionBasicData:{
         page:{
@@ -1116,6 +1230,7 @@
         pleaseEnter :'璇疯緭鍏�',
         msg1 :'搴撳瓨宸插瓨鍦ㄦ鐗╂枡涓嶈兘鍒犻櫎',
         unit :'鍗曚綅',
+        msg2 :'璇ョ墿鏂欏凡瀛樺湪',
     },
     ingredientsStock:{
         page:{
@@ -1169,7 +1284,11 @@
         surplusMaterialManagement :'浣欐枡绠$悊',
         additionOfSurplusMaterials :'浣欐枡鏂板',
         excessMaterialOutflow :'浣欐枡鍑哄簱',
-        pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷'
+        pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷',
+        pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�',
+        msg1:'搴撳瓨瀛樺湪澶氭潯',
+        msg2:'鏁伴噺涓嶅璇锋鏌�',
+        msg3:'搴撳瓨涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ鏉�',
     },
     warehouseBasicData:{
         page:{
@@ -1197,6 +1316,8 @@
         materialReturnReport:"鐗╂枡杩斿簱鎶ヨ〃",
         optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
         optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+        finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+        finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
     },
     components:{
         addNewSignature :'鏂板鏍囩鍚�',
@@ -1247,7 +1368,9 @@
         role :'瑙掕壊鏉冮檺',
         userPassWord :'淇敼瀵嗙爜',
         glassPrice:'鐜荤拑浠锋牸',
-        glassOptimize:'鐜荤拑浼樺寲'
+        glassOptimize:'鐜荤拑浼樺寲',
+        finishedGlassShelf:'鎴愬搧鏂欐灦',
+        userLog:'鐧诲綍鏃ュ織'
     },
 
     glassPrice:{
@@ -1267,6 +1390,61 @@
         addProduce:'閫夋嫨浜у搧',
         reorder:'杞鍗�',
         unit:'鍏�/m虏'
+    },
+
+    finishedGlassShelf:{
+        finishedGlassShelfInformation:'鏂欐灦搴撳瓨',
+        finishedGlassShelfEmit:'鏂欐灦鍑哄簱',
+        finishedGlassShelfWithdraw:'鏂欐灦鍏ュ簱',
+        createFinishedGlassShelf:'鏂欐灦鏂板',
+        msg:{
+            errorNotNull1:'搴撳瓨鍖哄煙涓嶈兘涓虹┖',
+            errorNotNull2:'鏂欐灦鍚嶇О涓嶈兘涓虹┖',
+            errorNotNull3:'鏁伴噺涓嶈兘涓虹┖',
+            errorNotNull4:'鍗曚环涓嶈兘涓虹┖',
+            errorNotNull5:'鍗曚綅涓嶈兘涓虹┖',
+            errorNotNull6:'鏈�澶ф壙閲嶄笉鑳戒负绌�',
+            errorNotNull7:'鏈�澶у涓嶈兘涓虹┖',
+            errorNotNull8:'鏈�澶ч珮涓嶈兘涓虹┖',
+            pleaseWithdrawTime:'璇疯緭鍏ュ綊杩樻棩鏈�',
+            error1:'宸插瓨鍦ㄥ綊杩樻暟鎹棤娉曞垹闄�!',
+            error2:'璇烽�変腑涓�琛屾暟鎹�!',
+            error3:'宸插叏閮ㄥ綊杩�!',
+
+        },
+        glassShelfNumber:'鏂欐灦缂栧彿',
+        glassShelfName:'鏂欐灦鍚嶇О',
+        availableQuantity:'鍙敤鏁伴噺',
+        totalQuantity:'鎬绘暟閲�',
+        maxWidth:'鏈�澶у',
+        maxHeight:'鏈�澶ч珮',
+        maxWeight:'鏈�澶ф壙閲�',
+        withdrawQuantity:'褰掕繕鏁伴噺',
+        withdrawTime:'褰掕繕鏃ユ湡',
+        operator:'缁忓姙浜�',
+        withdraw:'褰掕繕',
+        emitId:'鍑哄簱缂栧彿',
+        withdrawId:'鍏ュ簱缂栧彿',
+        returnDelivery:'杩斿洖鍙戣揣',
+        withdrawQuantity1:'寰呭綊杩樻暟閲�',
+        summary:'姹囨��',
+        detail:'鏄庣粏',
+    },
+    bom:{
+        orderBOM:'璁㈠崟BOM',
+        productBOM:'浜у搧BOM',
+        materialBOM:'鐗╂枡BOM',
+        msg:{
+            msg1:'璇峰厛閫夋嫨涓�涓骇鍝佹爣绛�',
+        },
+        bomType:'绫诲瀷',
+        consume:'娑堣�楅噺',
+        price:'浣跨敤浠锋牸',
+        price1:'浠锋牸',
+        usageType:'浣跨敤绫诲瀷',
+        bomPrice:'BOM鎴愭湰',
+        other:'鍏跺畠',
+
     }
 
 

--
Gitblit v1.8.0