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/en.js |  612 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 580 insertions(+), 32 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 93be06e..3131fbd 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -57,10 +57,35 @@
         print:'Print',
         export:'Derive',
         empty:'Clear',
+
+        incrementalAll:'Increase successively after selecting',
+        incrementalChecked:'Selected and increased successively',
+        true:'Yes',
+        false:'No',
+        computedSize:'Scientific counting',
+        paste:'Paste',
+
+        selected:'selected',
+        partiallySelected:'partially selected',
+        unchecked :'unchecked',
+        copy:'Copy',
+
+        orderRemarks:'璁㈠崟澶囨敞',
+        filmNumber:'浜у搧澶囨敞',
+        remarks1:'澶囨敞1',
+        remarks2:'澶囨敞2',
+        remarks3:'澶囨敞3',
+        remarks4:'澶囨敞4',
+        otherColumns:'鍏朵粬鍒�',
         msg:{
             max255:"The value contains a maximum of 255 characters",
+            max10:"鏈�澶氳緭鍏�10涓瓧绗�",
             range99999Dec2:
                 "Please enter a number between 0 and 99999 with a maximum of two decimals",
+            range99999Dec3:
+                "Please enter a number between 0 and 99999 with a maximum of three decimals",
+            range999999Dec2:
+                "Please enter a number between 0 and 999999 with a maximum of two decimals",
             greater0:"Please enter an integer greater than 0",
             checkoutLose:'Check fail',
             saveSuccess:'save successfully',
@@ -72,15 +97,24 @@
             deleteSuccess:'Deletion success',
             deleteFail:'Deletion failure',
             cancelReviewFail:'Review failure',
+            cancelReviewFailWork:'Counter-audit failed please check whether to report',
             reviewFail:'Audit failure',
             noProductDataInTheTable:'There is no product data in the table',
             tableDataExceedsMaximumLimit:'The table data exceeds the maximum limit',
             range9999Dec: "Please enter a four digit integer",
+            quantityError: "Quantity Error",
+            dataDoesNotExist: "Data Does Not Exist",
+            greater0Sec1:"璇疯緭鍏ュぇ浜�0鐨勬暣鏁版垨鑰呬繚鐣欎竴浣嶅皬鏁�",
+            greater0Msg:"璇疯緭鍏ュぇ浜�0鐨勬暟瀛�",
+            notExport:"璇ユ牸寮忎笉鏀寔瀵煎嚭",
+            notUpdate:"鍙傛暟鏈慨鏀�",
         }
     },
     product:{
-        ProductHomePage:'Product home page',
-        create:'Creat',
+        page:{
+            selectProduct:'Product home page',
+            createProduct:'Creat',
+        },
         coloredGlaze:'Coloured glaze',
         frostedSand:'Frosted glass',
         coating:'Coating film',
@@ -115,12 +149,12 @@
             hollowThickness:'* Hollow thickness',
             hollowGasType:'* Inflation mode',
             hollowType:'* Sealing compound',
-            hollowGlueDepth:'* Default glue depth',
+            hollowGlueDepth:'Default glue depth',
             hollow:'Hollow spacer',
             hollowUpdate:'Hollow spacers modified',
             interlayerThickness:'*Lamination thickness',
             interlayerType:'* Type',
-            interlayerColor:'* Color',
+            interlayerColor:'Color',
             interlayer:'Lamination  spacer',
             interlayerUpdate:'Lamination  spacer modified',
             glassAttribute:'Monolithic glass properties',
@@ -143,11 +177,20 @@
             theProductHasBeenReviewedAndCannotBeDeleted:'The product has been reviewed and cannot be removed',
 
             productAbbreviation:'Product abbreviation',
+            productDuplication:'Product repetition',
+            msg1:'鍒涘缓浜烘槸锛�',
+            msg2:'鏃犳硶鎿嶄綔锛�',
         }
     },
     order:{
-        orderHomePage:'Order Home Page',
-        orderReport:'Order Detail Report',
+        page:{
+            selectOrder:'Order Home Page',
+            create: 'Create',
+            orderReport:'Order Detail Report',
+            orderSummaryReport:'Order Summary Report',
+            orderDetailsSummary:'Order Detail Summary',
+            updateOrderCraft:'Update Order Craft'
+        },
         project:'Project',
         orderId:'Order ID',
         money:'Total Amount',
@@ -193,7 +236,7 @@
         areaAmountPerPiece:'Area amount (single piece)',
         areaAmountAge:'Area amount (total area)',
         errorValue:'Error value',
-        orderDetailsSummary:'Order detail summary',
+
         details:'Details',
         workmanship:'Technology',
         processCard:'Flow card',
@@ -208,6 +251,51 @@
         orderDetailsSummaryReport:'Order details summary report',
         buildingNumber:'Floor number',
         saveHeader:'Save header',
+
+        orderNotApproved:'Order not reviewed',
+        orderHasBeenReceived:'The order is in stock',
+        printingNumber:'Print times',
+        processingOrder:'Processing sheet',
+        sheet2:'Horizontal - multi-layer details',
+        sheet4:'Production and processing of single vertical plate',
+        sheet3:'View shipping information',
+        sheet5:'Production and processing of single curved glass (single sheet)',
+        oneClickStorage:'One-click completion',
+        oneClickReturn:'涓�閿��鍥�',
+
+        quantityMount:'Quantity and Amount',
+        allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
+        orderTransfer:'璁㈠崟鎶ュ伐杞Щ',
+
+        graphic:'graphic',
+        drawingNo:'drawingNo',
+        upper:'upper',
+        down:'down',
+        horizontal:'horizontal',
+        vertical:'vertical',
+        exportDXF:'exportDXF',
+        selectFile:'閫夋嫨鏂囦欢',
+        left:'宸�',
+        right:'鍙�',
+        edgeAngleCurvature:'杈硅寮у害',
+        cuttingCorners:'鍒囪竟瑙�',
+        fourCornerExcavation:'鍥涜鎸栫己',
+
+        ownerForProduction:'鐢熶骇閮ㄩ棬璐熻矗浜�',
+        surtax:'闄勫姞绋�',
+        valueAddedTax:'澧炲�肩◣',
+        cuttingTransport:'杩愯緭娑堝噺',
+        colourCeramicGlaze:'褰╅噳鍥惧彿',
+        transferPage:{
+            oldOrderId:'鍘熻鍗曞彿',
+            newOrderId:'鏂拌鍗曞彿',
+            oldOrderNumber:'鍘熻鍗曞簭鍙�',
+            newOrderNumber:'鏂拌鍗曞簭鍙�',
+            confirmTitle:'纭疄杞Щ姝ゅ簭鍙风殑娴佺▼鍗℃姤宸ユ暟鎹�?',
+            errorToMes:'涓巑es閫氳寮傚父'
+
+        },
+
         msg:{
             productCheck:'Please select a product',
             tableLengthNot:'No table data',
@@ -230,7 +318,44 @@
             calculationAreaPrompt4:'Calculate',
             warning:'Tips',
             calculationAreaPrompt5:'Do you want to continue creating duplicate orders',
-        }
+
+            pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
+            grossAreaIsNot0:'There is an actual total area equal to0',
+            differentSize:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵',
+            updateOrderIdErrorGtMaxId:'杈撳叆璁㈠崟鍙蜂笉鑳藉ぇ浜庢渶澶ц鍗曞彿',
+            updateOrderIdErrorIsExist:'杈撳叆璁㈠崟鍙峰凡瀛樺湪',
+            updateOrderIdErrorIsSame:'杈撳叆璁㈠崟鍙风浉鍚�',
+            updateOrderIdErrorDiscrepancyInLength:'杈撳叆璁㈠崟鍙烽暱搴︿笉绗�',
+            updateOrderIdErrorInputNumber:'璇疯緭鍏ユ暟瀛�',
+            updateOrderIdErrorNotNo1:'涓嶈兘淇敼绗竴涓崟瀛�',
+            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:'妯$硦妯″紡',
+        glassSizeRange:'鐜荤拑灏哄鑼冨洿',
+        glassQuantity:'灏忕墖鏁伴噺',
+        merge:'瀹屾暣妯″紡',
+        layer:'鍗曠墖妯″紡',
+        notFinish:'寰呭畬鎴�',
+        processCardCollect:'娴佺▼鍗℃眹鎬�',
+        fileUpload:'鏂囦欢涓婁紶'
 
     },
     searchOrder:{
@@ -254,8 +379,15 @@
         copy:'Copy',
         copyTitle:'Copy Title',
         msgList:{
-            checkOrder:'No order information is found. Please click Order first'
-        }
+            checkOrder:'No order information is found. Please click Order first',
+            isOptimize:'姝よ鍗曞凡杞紭鍖栵紝鍥為��澶辫触锛�',
+            isReportingWork:'姝よ鍗曞凡鎶ュ伐锛屽洖閫�澶辫触锛�',
+            isStorage:'姝よ鍗曞凡鍏ュ簱锛屽洖閫�澶辫触锛�',
+            BackSure:"纭畾涓�閿��鍥炵浉搴旀祦绋�?",
+            filterError:'璇疯緭鍏ユ纭牸寮忕殑绛涢�夋潯浠�'
+        },
+        updateOrderId:"淇敼璁㈠崟鍙�",
+        reportingTransfer:'鎶ュ伐杞Щ'
     },
     craft:{
         glassAddress:'Glass Address',
@@ -265,6 +397,7 @@
         totalArea:'TotalArea',
         childWidth:'Child Width',
         childHeight:'Child Height',
+        arc:'arc',
         area:'Area',
         process:'Process',
         orderDetail:'Order Detail',
@@ -290,11 +423,19 @@
         xMargin:'X axis margin',
         yMargin:'Y-axis margin',
         location:'Trademark position',
+        sort:'鐜荤拑鍙嶅集',
+        archRise:'鎷遍珮',
+        qr1Local:'浜岀淮鐮�1浣嶇疆',
+        qr2Local:'浜岀淮鐮�2浣嶇疆',
+        default:'榛樿'
 
     },
 
     workOrder:{
-        workOrder:'Work Order Management',
+        page:{
+            selectWorkOrder:'Work order',
+            addWorkOrder:'Forward production order'
+        },
         productionId:'Production Order Number',
         convert:'Convert',
         unConverted:'UnConverted',
@@ -302,9 +443,29 @@
         transferOrder:'Transfer Order',
         perimeter:'perimeter',
         deleteNo:'Delete failed Check whether the shelf has been splited',
+        msg:'Please select all data',
+        msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
 
     },
     processCard:{
+        page:{
+            selectProcessCard:'Process Card',
+            selectAddProcess:'Rack Allocation',
+            productionScheduling:'Production Scheduling',
+            selectPrintProject:'Engineering Printing',
+            selectPrintFlowCard:"print",
+            splittingDetails:"Frame query",
+            addProcessCard:"Split-frame addition",
+            printFlowCard:"Process card printing",
+            selectDetailProcessCard:"Process card details query"
+        },
+        yesTitle:'鏈夋爣棰樻墦鍗�',
+        noTitle:'鏃犳爣棰樻墦鍗�',
+        buildingNumber:'妤煎彿',
+        longSide:'闀胯竟',
+        shortSide:'鐭竟',
+        printCompound:'闇�瑕佸悓鏋剁殑灞�',
+        flashback:'鍊掑簭',
         processId:'Process Card Number',
         founder:'Divider',
         layoutStatus:'Type Setting',
@@ -318,6 +479,7 @@
         weight:'Weight',
         selectedQuantity:'Select Quantity',
         establishProcessCards:'Add',
+        createBySequenceNumber:'By Sequence Number',
         return:'Return',
         ProductionSchedulingOk:'Scheduled Production',
         ProductionSchedulingNo:'Unscheduled Production',
@@ -331,6 +493,7 @@
         reviewedState:'Review Status',
         reviewed:'Reviewer',
         schedulingId:'Production Scheduling Number',
+        notes:'袩褉懈屑械褔邪薪懈褟',
         scheduling:'Production Scheduling',
         schedulingOk:'Please select the data on the right first',
         schedulingNo:'Please enter a positive integer',
@@ -351,6 +514,7 @@
         composingOk:'Can Be Typesetter',
         composingNo:'Non Typesetting',
         typesetter:'typesetter',
+        revoke:'鎾ら攢鍙帓鐗�',
         scheduledStartTime:'Scheduled Start Time',
         planEndTime:'Plan End Time',
         customerId:'Customer Id',
@@ -372,10 +536,14 @@
         deleteNo:'Failed to delete Check whether the flow card has been reported (feedback)',
         deleteNoProcedure:'Delete failed Check whether the next operation has been reported',
         pleaseCheckTheRequiredData:'Please check the required data',
+        notSelectTheOptionData:'璇峰嬁鍕鹃�夊凡鎺掔増鏁版嵁',
+        landingSequence:'Landing sequence',
 
         labelStyle:'Label Style',
+        detailPrinting:'Detail Printing',
+        detailsPrintedSeparately:'Details Printed Separately',
         customLabelPrinting:'Custom label printing',
-        labelPrinting:'Label printing',
+        labelPrinting:'Lable Printing',
         sortingSuccessful:'Sorting successful',
         sorting:'Sorting',
         pleaseSelect:'Please select',
@@ -386,9 +554,78 @@
         halfProductLabel:'Half-finished product label',
         pleaseSelectCustomPrintLabelStyle:'Please select a custom print label style',
         mergePrinting:'Merge printing',
+        printStatus:'Print times',
+        labelPrinting2:'Label printing 2',
+        finishedProductPrinting2:'Finished Product Printing2',
+        editablePrinting:'Editable Printing',
+        invertSelection:'Invert Selection',
+        sortSummary:'Sort Summary',
+        addAutomatically:'Auto fill',
+        selectFill:'Selected fill',
+        engineeringPrinting:'Engineering Printing',
+        pleaseSelectProject:'Please Select Project',
+        mergeState:'Merge State',
+        merge:'Merge',
+        printQuantity:'Print Quantity',
+        printWarn1:'The print quantity cannot be greater than the order quantity',
+        depthShelf:"鏋跺瓙绾垫繁(mm)",
+        shelfCapacity:"鏋跺瓙鎵块噸(KG)",
+        IntervalThickness:"闂撮殧鍘氬害(mm)",
+        LongestLargestMax:"闀胯竟鏈�澶�(mm)",
+        LongestShortestMax:"闀胯竟鏈�鐭�(mm)",
+        quantityMax:"鏈�澶ф暟閲�",
+        shortestLongest:"鐭竟鏈�澶�(mm)",
+        shortestSide:"鐭竟鏈�鐭�(mm)",
+        intelligentBranching:"鏅鸿兘鍒嗘灦",
+        reset:"閲嶇疆",
+        combinedFrame:"鍚堟灦",
+        shelfNumber:'鏋跺彿',
+        totalSequenceNumber:'鎬诲簭鍙�',
+        cancelMerger:'鍙栨秷鍚堝苟',
+        projectMsg1:'璇烽�夋嫨宸ョ▼瀵瑰簲鐨勭増鍥惧彿',
+        orderPrint:'璁㈠崟鎵撳嵃',
+        numberLabelPrintingOperations:'鏍囩鎵撳嵃娆℃暟',
+        numberTimesProcessCardPrinted:'娴佺▼鍗℃墦鍗版鏁�',
+        projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
+        layoutNumber:'鐗堝浘鍙�',
+        addFlowCardMsg1:'璇烽�夋嫨宸插垎鏋惰鍗曟墦鍗�',
+        addFlowCardMsg2:'璇烽�夋嫨鏈垎鏋惰鍗曟墦鍗�',
+        okFlowCard:'宸插垎鏋�',
+        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:{
-        glassNumber:'number',
+        page:{
+            selectReportingWorks:"Work Reporting Management",
+            addReportingWork:"New Work Reporting",
+            qualityInspectionReview:"Quality Inspection Review",
+        },
+        msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+        saveWorkStorage:'鎶ュ伐鍏ュ簱',
+        mannerPacking:'鍖呰鏂瑰紡',
+        glassNumber:'Code',
         glassAddress:'Glass Address',
         WorkReportingManagement:'Work Reporting Management ',
         addReportingWorks:'New Work Reporting',
@@ -460,8 +697,12 @@
         thisCompletedQuantity:'This Completed Quantity',
         thisWornQuantity:'This Worn Quantity',
         passAudit:'Pass The Audit',
+        patchCondition:'Patch Condition',
+        changeFailed:'淇敼澶辫触锛岃妫�鏌ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟',
+        hiddenVal:'闅愯棌',
 
-
+        futureTime:'鎶ュ伐鏃堕棿涓嶈兘澶т簬褰撳墠鏃堕棿',
+        longTime:'鎶ュ伐鏃堕棿涓庡綋鍓嶆椂闂磋秴杩�13涓湀',
         selectResponsibleTeam:'Please select a responsible team',
         selectWorkReportingTeam:'Please select a responsible team',
         successfulModificationOfWorkApplication:'Report modification succeeded',
@@ -487,10 +728,35 @@
         pleaseNumber7:'The quantity cannot be greater than the quantity of the previous process',
         pleaseNumber8:'Please enter serial number',
         pleaseNumber9:'Correct number of completions or breakdowns',
+        pleaseNumber10:'The number of completions cannot be greater than the number of process cards',
+        pleaseNumber11:'瀹屽伐+娆$牬鏁伴噺涓嶈兘澶т簬鍙畬宸ユ暟閲�',
+        pleaseNumber12:'鏈伐搴忔姤宸ユ暟:',
+        pleaseNumber13:'涓嬪伐搴忔姤宸ユ暟:',
+        pleaseNumber14:'鏈伐搴忎慨鏀规暟涓嶈兘灏忎簬涓嬪伐搴忔姤宸ユ暟',
+        pleaseNumber15:'宸插叆搴撴暟閲忎笉鑳藉ぇ浜庡凡瀹屽伐鏁伴噺',
 
+        pleaseNumber16:'璇烽�夋嫨鏈�鍚庡伐搴忔姤宸ュ叆搴�',
+
+        woodenBox:'鏈ㄧ:',
+        brandreth:'閾佹灦',
+        tilting:'鍊掓灦',
+        secondaryBreakage:'搴忓彿娆$牬鐩稿悓',
+        checkedBreakage:'閫変腑娆$牬鐩稿悓',
+        unreviewed:'鏈鏍�',
+        notunreviewed:'瀹℃牳鏈�氳繃',
+        notQualified:'鏃犻渶璐ㄦ',
     },
-
     productStock:{
+        page:{
+            productStockList:"Stock Inquiry",
+            createProductStock:"Finished product Into Stock",
+            storageRecord:"Entry and exit records",
+            orderAllocation:'Order Allocation',
+            finishedProductOut:'Finished Product Out Of Stock',
+            finishedGoodsIssue:'Finished Goods Delivery',
+            transferRecord:'Mutual Exchange Records',
+            takeOutRecord:'Take Out Records'
+        },
         inventoryQuery:'Stock Inquiry',
         finishedProductWarehousing:"Finished product Into Stock ",
         finishedProductOutbound:'Finished Product Out Of Stock',
@@ -566,7 +832,6 @@
         singlePieceArea:'Single Piece Area',
         perimeter:'Perimeter',
         returnToWarehouse:'Return To Warehouse',
-
         entryFailure:'Put in storage failure',
         entry:'Put in storage',
         failedToRetrieve:'Take out failure',
@@ -580,10 +845,25 @@
         staterOperationOrderNumber:'Transfer the sales order number',
         endOperationOrderNumber:'Transfer sequence number',
         typeClaim:'Take out type',
+        pleaseEnterTheBoxNumber:'Please enter the box number',
 
-
+        boxNumber:'Case number',
+        msg1:'The invoice is out of the warehouse. Please refresh the interface',
+        msg2:'Invoice inventory number does not exist',
+        msg3:'The quantity of incoming orders shall not exceed the total number of orders',
+        boxingPrinting:'瑁呯鎵撳嵃',
+        packing:'瑁呯璋冩灦',
+        msgPacking:'瑁呯璋冩灦鎴愬姛',
+        boxNumberOrRemarks:'绠卞彿鎴栧娉�',
+        msg4:'鍙戣揣鍗曞凡鍒涘缓',
+        msg5:'鐗╂枡鍙兘瀛樺湪瑁呯璋冩灦锛屾棤娉曢��鍥�',
     },
     customer:{
+        page:{
+            selectCustomer:'Customer Homepage',
+            createCustomer:'Increase Customers',
+            selectCustomerOrder:'Customer Order'
+        },
         pleaseEnterTheCustomerName:'Please enter the customer name',
         pleaseEnterCustomerLevel:"Please enter customer level ",
         pleaseEnterTheAmountOfFunds:'Please enter the amount of funds',
@@ -597,23 +877,32 @@
         telephone:"Telephone ",
         customerNumber:'Customer Id',
         customerName:"Customer",
-        customerHomePage:'Customer Homepage',
-        increaseCustomers:'Increase Customers',
         resetting:'Revoke',
         customerOrders:'Customer order',
         orderAmount:'Order amount',
 
         customerAbbreviation:'Customer abbreviation',
         pleaseEnterTheCustomerAbbreviation:'Please enter the customers abbreviation',
+        msgList:{
+            notCustomerInfo:'鏈煡璇㈠埌瀹㈡埛淇℃伅',
+        }
     },
     delivery:{
+        page:{
+            selectDelivery:'Shipping Homepage',
+            selectOrderList:"Order Shipment",
+            shipmentDetailsReport:"Delivery detail report  ",
+            shipmentProductClassificationReport:"Category report of shipped products ",
+            createDelivery:'Create delivery',
+            deliveryReport:'Delivery report',
+        },
         delivery:'Delivery',
         place :'Place',
         technology:'Technology',
         produce:'Produce',
         traveler:'Traveler',
         warehousing:'Warehousing',
-        unpaidQuantity:"Unpaid  Quantity ",
+        unpaidQuantity:"Quantity not shipped",
         availableStock:'Available Stock',
         deliveryQuantity:'Delivery Quantity',
         pleaseEnterTheAmountOfFunds:'Please enter the project name',
@@ -631,29 +920,49 @@
         shippingAddress:'Shipping Address',
         deliveryReportDate:'Delivery Report Date',
         shipper:"Shipper ",
-        shippingHomepage:'Shipping Homepage',
-        orderShipment:"Order Shipment ",
         deliveryNoteId:'Delivery Note Id',
         deliveryNoteNumber:'Delivery Note Number',
         deliveryDate:"Delivery Date ",
-        shipmentDetailsReport:"Delivery detail report ",
-        shipmentProductClassificationReport:"Category report of shipped products ",
         contacts:'Contact person',
         contactNumber:'Contact number',
         salesman:'Salesman',
         money:'Amount',
 
+        pleaseSelectTheSameCustomerProject:'Please select the project for the same customer',
+        noMoney:'No money',
+        freightPrice:'Freight Price',
+        freightQuantity:'Freight Quantity',
+        freight:'Freight Money',
+        pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',
+        print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
+        print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
+        orderAdd:'璁㈠崟娣诲姞',
+
     },
     replenish:{
+        page:{
+            selectReplenish:"Patch Management",
+            addReplenish:"Add Patches",
+            printReplenishFlowCard:"Print Patches"
+        },
+
         patchManagement:'Patch Management',
         addPatches:"Add Patches ",
         printPatches:'Print Patches',
         patchNumber:'Patch Number',
         mark:'Mark',
         sliceMarking:'Slice Marking',
+        printPatchesMsg1:'璇烽�夋嫨鏍囩妯℃澘',
+        labelTemplate:'鏍囩妯℃澘锛�',
+        listLabelTemplates:'鏍囩妯℃澘鍒楄〃'
 
     },
     rework:{
+        page:{
+            selectRework:"Rework Management",
+            addRework:"Add Rework",
+            printReworkFlowCard:"Print Rework"
+        },
         reworkManagement:'Rework Management',
         addRework:"Add Rework ",
         printRework:'Print Rework',
@@ -663,19 +972,24 @@
         reworkProcess:'Rework Process',
         reworkType:'Rework Type',
         reworkArea:'Rework Area',
+        responsibilityInformation:'responsibility Information',
         PleaseSelectAReworkTeam:'Please select a rework team',
         TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'The rework quantity cannot be greater than the second break quantity',
         reworkQuantityCannotBeEmptyOr0:'Rework quantity cannot be empty or 0',
+        msg1:'璇峰~鍏ラ渶瑕佸悎骞剁殑灞�',
     },
 
 
     role:{
+        page:{
+            roleList:'Role Home',
+        },
         id:'ID',
         characterHomepage:'Role Home',
         role:'Character',
         roleAdd:'Role addition',
         menu:'Menu',
-        page:'Page',
+        page1:'Page',
         permission:'Limits of authority',
         rolePermissions:'Role authority',
         permissionSelection:'Permission selection',
@@ -685,10 +999,13 @@
         CannotBeEmptyAndTheLengthCannotExceed255:'The value cannot be empty and cannot exceed 255 characters',
     },
     user:{
+        page:{
+            userList:'User home page',
+        },
         userId:'User ID',
-        userHomepage:'User home page',
         user:'User',
         setUpRoles:'Set a role',
+        setProcess:'璁剧疆宸ュ簭',
         changePassword:'Change password',
         OldPassword:'Old password',
         TheNewPassword:'New password',
@@ -699,8 +1016,27 @@
         ConfirmPasswordCannotBeEmpty:'Confirm that the password cannot be empty',
         TheTwoPasswordsAreNotTheSame:'Two different passwords',
         OldPasswordError:'Old password error',
+        roleSelection:'Role Selection',
+
+        userName:'User name',
+        changeUserName:'Modifying a user name',
+        userNameCannotBeEmpty:'The user name cannot be empty',
+    },
+    userLog:{
+        page:{
+            userListLog:'鏃ュ織棣栭〉',
+        },
+        loginName:'鐧诲綍鍚�',
+        userName:'鐢ㄦ埛鍚�',
+        loginDate:'鐧诲綍鏃堕棿',
     },
     orderBasicData:{
+        page:{
+            searchOrderBasicData:'Base type',
+            searchGlassType:'Type of glass',
+            searchProcessAttributeConfig:'宸ヨ壓灞炴�х被鍒�',
+        },
+        glassCategory:'Type of glass',
         order:'Order',
         orderType:'Order type',
         orderClassify:'Order classification',
@@ -725,15 +1061,31 @@
         paymentTerms:'Payment terms',
         payMethod:'Payment method',
         delivery:'Deliver goods',
-        basicType:'Base type',
         name:'Name',
-        glassCategory:'Type of glass',
         level:'Class level',
         firstLevel:'Primary class',
         towLevel:'Secondary class',
         alias:'alias',
+        msg1:'Upload picture size can not exceed 5MB!',
+        msg2:'Upload picture can only be JPG or PNG format!',
+        selectFile:'Selecting file',
+        msg3:'Only jpg/png files can be uploaded and the size does not exceed 5 MB',
+        commonProcess:'鏅�氬伐搴�',
+        laminatingProcessA:'澶硅兌鍚庡悎鐗囧伐搴�',
+        laminatingProcessB:'涓┖鍚庡悎鐗囧伐搴�',
+        laminatingProcessC:'澶硅兌宸ュ簭',
+        laminatingProcessD:'涓┖宸ュ簭',
+        please1:'璇烽�夋嫨绫诲埆',
+        please2:'璇疯緭鍏ュ悕绉�',
+        please3:'璇疯緭鍏ュ埆鍚�',
     },
     machine:{
+        page:{
+            selectMachine:'Equipment management',
+            addMachine:"Device addition",
+            maintenanceAndRepair:"Maintenance and repair",
+            addMaintenanceAndRepair:"Maintenance and repair added"
+        },
         basicId:'Equipment number',
         basicName:'Device name',
         basicCategory:'Working procedure',
@@ -770,6 +1122,29 @@
         tempering:'Tempering',
     },
     report:{
+        page:{
+            productionReport:'Production report',
+            workInProgress:'Product in process report',
+            processToBeCompleted:'Process to be completed report',
+            productionSchedule:'Production and delivery progress report',
+            processCardProgress:'Flow card progress report',
+            orderPlanDecomposition:'Flow card progress report',
+            damageReport:'Breakage statement',
+            crossProcessBreaking:'Cross process breakage report',
+            teamOutput:'Team production report',
+            splittingDetailsOutside:'Separate frame detail report',
+            taskCompletionStatus:'Task completion report',
+            rawMaterialRequisition:'Raw material requisition report',
+            qualityReport:'Quality statement',
+            productionScheduling:'Production scheduling report',
+            yield:'Yield report',
+            finishedProductReport :'Finished product report',
+            orderWorkReportForm :'璁㈠崟鎶ュ伐鎶ヨ〃',
+        },
+        allProcess:'鍏ㄩ儴',
+        teamsGroupsName:'涓婂伐搴忔姤宸�',
+        WorkInProgressCombination:'鍦ㄥ埗鍝佹眹鎬绘姤琛�',
+        processCompleted:'宸ュ簭寰呭畬鎴愭眹鎬绘姤琛�',
         productionReport:'Production report',
         workInProgressReport:'Product in process report',
         processToBeCompleted:'Process to be completed report',
@@ -783,12 +1158,15 @@
         TaskCompletionStatus:'Task completion report',
         rawMaterialRequisition:'Raw material requisition report',
         qualityReport:'Quality statement',
+        productionScheduling:'Production scheduling report',
         yieldReport:'Yield report',
+        yieldProcessReport:'鎴愬搧鐜囧伐搴忔眹鎬绘姤琛�',
         workingProcedure:'Process',
-        inventoryArea:'Stock area',
+        inventoryArea:'Stock area锛坢虏锛�',
         pleaseSelectADateFirst:'Please select the date first',
         pleaseSelectAProcessFirst:'Please select the process first',
         theFilteringTimeForExportCannotExceed180Days:'The export filtering period cannot exceed 180 days',
+        theTimeLimitCannotExceed180Days:'閫夋嫨鐨勬椂闂翠笉鑳借秴杩�180澶�',
         orderTime :'Order time',
         deliveryDate:'Delivery date',
         completedQuantity:'Quantity completed',
@@ -811,8 +1189,19 @@
         patchNum :'Patch number',
         finished :'Rate of finished product',
         finishedProductReport :'Finished product report',
+        workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+        StorageArea:'鍏ュ簱闈㈢Н',
+        shippedArea:'鍙戣揣闈㈢Н',
+        thicknessArea:'骞虫柟姣背'
+
     },
     productionBasicData:{
+        page:{
+            selectProductionBasicData:"Basic data query",
+            addBreakageType:"New secondary break type",
+            addBreakageReason:"Secondary failure cause added",
+            addTeamGroup:"Group Added Added"
+        },
         basicDataQuery :'Basic data query',
         newTypeOfSecondaryDamageAdded :'New secondary break type',
         reasonForSecondaryFailureAdded :'Secondary failure cause added',
@@ -823,7 +1212,11 @@
         teamName:'Squad name',
         processInvolved:'Working procedure',
     },
-    mainIngredient:{
+    ingredients:{
+        page:{
+            selectIngredients:"Material data",
+            createIngredients:"Material addition"
+        },
         materialInformation :'Material data',
         materialAddition :'Material addition',
         originalFilm :'Original glass',
@@ -833,8 +1226,19 @@
         films :'Coating Type',
         pleaseEnterData :'Please enter data',
         pleaseEnter :'Please enter',
+        msg1 :'This material is already in stock and cannot be deleted',
+        unit :'unit',
+        msg2 :'璇ョ墿鏂欏凡瀛樺湪',
     },
-    mainIngredientStock:{
+    ingredientsStock:{
+        page:{
+            selectIngredientsStock:"Material inventory",
+            materialOutbound:"Material delivery",
+            returnToStorage:"Return to the warehouse",
+            selectSurplusMaterials:"Waste material management",
+            createOutbound:'New material delivery',
+            returnToStorageCreate:'Returned warehouse addition'
+        },
         materialName :'Material name',
         producer :'Place of origin',
         dateOfManufacture :'Production date',
@@ -874,13 +1278,44 @@
         returnQuantity :'Quantity returned to storage',
         materialReturnType :'Material return type',
         createTime :'Returned warehouse date',
+
+        surplusMaterialManagement :'Waste material management',
+        additionOfSurplusMaterials :'Surplus addition',
+        excessMaterialOutflow :'Residual materials out of storage',
+        pleaseSelectTheTypeOfReturnToStock:'Please select a return type',
+        pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�',
+        msg1:'搴撳瓨瀛樺湪澶氭潯',
+        msg2:'鏁伴噺涓嶅璇锋鏌�',
+        msg3:'搴撳瓨涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ鏉�',
     },
-    mainBasicData:{
+    warehouseBasicData:{
+        page:{
+            warehouseSearchBasicData:"Warehouse Basic Data"
+        },
         BasicData :'Basic data',
         operateTypeName :'Name',
         operateType :'Another name',
         type :'Type',
         takeOut :'Take out',
+    },
+    stockReport:{
+        page:{
+            warehouseReport:"Warehouse Basic Data",
+            finishedProductReport:"Finished product report",
+            materialReport:"Material statement",
+
+        },
+        finishedProductInventoryReport:"Finished product receipt report",
+        finishedProductOutboundReport:"Finished product delivery report",
+        finishedProductTransferReport:"Finished product transfer report",
+        finishedProductDeliveryReport:"Finished product take-out report",
+        materialAdditionReport:"Material addition report",
+        materialOutboundReport:"Material delivery report",
+        materialReturnReport:"Material return report",
+        optimizeOutboundReport:"浼樺寲鍑哄簱鎶ヨ〃",
+        optimizeQuantity:"浼樺寲浣跨敤鏁伴噺",
+        finishedGlassShelfEmitReport:"鏂欐灦鍑哄簱鎶ヨ〃",
+        finishedGlassShelfWithdrawReport:"鏂欐灦鍏ュ簱鎶ヨ〃",
     },
     components:{
         addNewSignature :'Add label name',
@@ -895,6 +1330,119 @@
         inconsistentParameters :'The required parameters are inconsistent',
         strip :'Piece',
         exportSelected :'Export selected',
+    },
+
+    menu:{
+        "1" :'Sales and Distribution',
+        "2" :'Production Planning',
+        "3" :'Material Manage',
+        "4" :'User Manage',
+
+        product :'Product',
+        order :'Order',
+        delivery :'Delivery',
+        returns :'Returns',
+        customer :'Customer',
+        workOrder :'Work Order',
+        processCard :'Process Card',
+        reportingWorks :'Report for work',
+        rework :'Rework',
+        replenish :'Replenish',
+        machine :'Machine',
+        BOM :'BOM',
+        report :'Report',
+        productStock :'Product Stock',
+        ingredientsStock :'Ingredients Stock',
+        ingredients :'Ingredients',
+        trader :'Trader',
+        stockReport :'Stock Report',
+        purchaseOrder :'Purchase Order',
+        purchaseStorage :'Purchase Storage',
+        purchaseReturn :'Purchase Return',
+        orderBasicData :'Order Basic Data',
+        productionBasicData :'Production Basic Data',
+        warehouseBasicData :'Warehouse Basic Data',
+        user :'User',
+        role :'Role',
+        userPassWord :'User Pass Word',
+        glassPrice:'Glass Price',
+        glassOptimize:'鐜荤拑浼樺寲',
+        finishedGlassShelf:'鎴愬搧鏂欐灦',
+        userLog:'鐧诲綍鏃ュ織'
+    },
+
+    glassPrice:{
+        glassPriceComputed:'Glass quotation',
+        priceSet:'Price setting',
+        priceList:'Price list',
+        msg:{
+            error1:'Please select all parameters',
+            error2:'This membrane system already exists, please re-select',
+            success:'Data saved successfully',
+            addProduce:'Please add the product first'
+        },
+        glass:'glass',
+        interlayer:'gum',
+        hollow:'hollow',
+        process:'process',
+        addProduce:'Select product',
+        reorder:'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