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 | 406 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 373 insertions(+), 33 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 488ed4a..3131fbd 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -68,8 +68,18 @@
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:
@@ -92,6 +102,12 @@
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:{
@@ -133,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',
@@ -162,12 +178,14 @@
productAbbreviation:'Product abbreviation',
productDuplication:'Product repetition',
+ msg1:'鍒涘缓浜烘槸锛�',
+ msg2:'鏃犳硶鎿嶄綔锛�',
}
},
order:{
page:{
selectOrder:'Order Home Page',
- createOrder:'Create',
+ create: 'Create',
orderReport:'Order Detail Report',
orderSummaryReport:'Order Summary Report',
orderDetailsSummary:'Order Detail Summary',
@@ -218,6 +236,7 @@
areaAmountPerPiece:'Area amount (single piece)',
areaAmountAge:'Area amount (total area)',
errorValue:'Error value',
+
details:'Details',
workmanship:'Technology',
processCard:'Flow card',
@@ -242,8 +261,41 @@
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',
@@ -268,8 +320,42 @@
calculationAreaPrompt5:'Do you want to continue creating duplicate orders',
pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
- grossAreaIsNot0:'瀛樺湪瀹為檯鎬婚潰绉瓑浜�0',
- }
+ 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:{
@@ -293,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',
@@ -330,12 +423,18 @@
xMargin:'X axis margin',
yMargin:'Y-axis margin',
location:'Trademark position',
+ sort:'鐜荤拑鍙嶅集',
+ archRise:'鎷遍珮',
+ qr1Local:'浜岀淮鐮�1浣嶇疆',
+ qr2Local:'浜岀淮鐮�2浣嶇疆',
+ default:'榛樿'
},
workOrder:{
page:{
- selectWorkOrder:'Work order'
+ selectWorkOrder:'Work order',
+ addWorkOrder:'Forward production order'
},
productionId:'Production Order Number',
convert:'Convert',
@@ -344,7 +443,8 @@
transferOrder:'Transfer Order',
perimeter:'perimeter',
deleteNo:'Delete failed Check whether the shelf has been splited',
- msg:'Please select all data'
+ msg:'Please select all data',
+ msgSelect:'璇烽�夋嫨璁㈠崟鍙�'
},
processCard:{
@@ -354,11 +454,18 @@
productionScheduling:'Production Scheduling',
selectPrintProject:'Engineering Printing',
selectPrintFlowCard:"print",
- splittingDetails:"鍒嗘灦鏌ヨ",
- addProcessCard:"鍒嗘灦鏂板",
- printFlowCard:"娴佺▼鍗℃墦鍗�",
- selectDetailProcessCard:"娴佺▼鍗℃槑缁嗘煡璇�"
+ 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',
@@ -372,6 +479,7 @@
weight:'Weight',
selectedQuantity:'Select Quantity',
establishProcessCards:'Add',
+ createBySequenceNumber:'By Sequence Number',
return:'Return',
ProductionSchedulingOk:'Scheduled Production',
ProductionSchedulingNo:'Unscheduled Production',
@@ -385,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',
@@ -405,6 +514,7 @@
composingOk:'Can Be Typesetter',
composingNo:'Non Typesetting',
typesetter:'typesetter',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'Scheduled Start Time',
planEndTime:'Plan End Time',
customerId:'Customer Id',
@@ -426,9 +536,12 @@
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:'Lable Printing',
sortingSuccessful:'Sorting successful',
@@ -443,9 +556,65 @@
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'
+ 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:{
page:{
@@ -453,6 +622,9 @@
addReportingWork:"New Work Reporting",
qualityInspectionReview:"Quality Inspection Review",
},
+ msgMannerPacking:'璇烽�夋嫨鍖呰鏂瑰紡',
+ saveWorkStorage:'鎶ュ伐鍏ュ簱',
+ mannerPacking:'鍖呰鏂瑰紡',
glassNumber:'Code',
glassAddress:'Glass Address',
WorkReportingManagement:'Work Reporting Management ',
@@ -525,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',
@@ -552,14 +728,29 @@
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:"鍑哄叆搴撹褰�",
+ storageRecord:"Entry and exit records",
orderAllocation:'Order Allocation',
finishedProductOut:'Finished Product Out Of Stock',
finishedGoodsIssue:'Finished Goods Delivery',
@@ -641,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',
@@ -655,10 +845,18 @@
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:{
@@ -685,6 +883,9 @@
customerAbbreviation:'Customer abbreviation',
pleaseEnterTheCustomerAbbreviation:'Please enter the customers abbreviation',
+ msgList:{
+ notCustomerInfo:'鏈煡璇㈠埌瀹㈡埛淇℃伅',
+ }
},
delivery:{
page:{
@@ -694,7 +895,6 @@
shipmentProductClassificationReport:"Category report of shipped products ",
createDelivery:'Create delivery',
deliveryReport:'Delivery report',
-
},
delivery:'Delivery',
place :'Place',
@@ -702,7 +902,7 @@
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',
@@ -733,8 +933,10 @@
freightPrice:'Freight Price',
freightQuantity:'Freight Quantity',
freight:'Freight Money',
-
- pleaseMsg1:'璁㈠崟瀛樺湪鍏朵粬閲戦鍗曚环娌℃湁濉啓',
+ pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',
+ print1:'娲涢槼鎵撳嵃鏃犲昂瀵�',
+ print2:'娲涢槼鎵撳嵃鏈夊昂瀵�',
+ orderAdd:'璁㈠崟娣诲姞',
},
replenish:{
@@ -743,12 +945,16 @@
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:{
@@ -766,9 +972,11 @@
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:'璇峰～鍏ラ渶瑕佸悎骞剁殑灞�',
},
@@ -777,6 +985,7 @@
roleList:'Role Home',
},
id:'ID',
+ characterHomepage:'Role Home',
role:'Character',
roleAdd:'Role addition',
menu:'Menu',
@@ -796,6 +1005,7 @@
userId:'User ID',
user:'User',
setUpRoles:'Set a role',
+ setProcess:'璁剧疆宸ュ簭',
changePassword:'Change password',
OldPassword:'Old password',
TheNewPassword:'New password',
@@ -806,15 +1016,25 @@
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',
@@ -850,10 +1070,18 @@
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:'璁惧绠＄悊',
+ selectMachine:'Equipment management',
addMachine:"Device addition",
maintenanceAndRepair:"Maintenance and repair",
addMaintenanceAndRepair:"Maintenance and repair added"
@@ -911,7 +1139,12 @@
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',
@@ -927,11 +1160,13 @@
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',
@@ -954,6 +1189,11 @@
patchNum :'Patch number',
finished :'Rate of finished product',
finishedProductReport :'Finished product report',
+ workProcessName:'鍦ㄥ埗鍝佸悕绉�',
+ StorageArea:'鍏ュ簱闈㈢Н',
+ shippedArea:'鍙戣揣闈㈢Н',
+ thicknessArea:'骞虫柟姣背'
+
},
productionBasicData:{
page:{
@@ -986,14 +1226,17 @@
films :'Coating Type',
pleaseEnterData :'Please enter data',
pleaseEnter :'Please enter',
+ msg1 :'This material is already in stock and cannot be deleted',
+ unit :'unit',
+ msg2 :'璇ョ墿鏂欏凡瀛樺湪',
},
ingredientsStock:{
page:{
selectIngredientsStock:"Material inventory",
materialOutbound:"Material delivery",
returnToStorage:"Return to the warehouse",
- selectSurplusMaterials:"浣欐枡绠＄悊",
- createOutbound:'鐗╂枡鍑哄簱鏂板',
+ selectSurplusMaterials:"Waste material management",
+ createOutbound:'New material delivery',
returnToStorageCreate:'Returned warehouse addition'
},
materialName :'Material name',
@@ -1036,9 +1279,14 @@
materialReturnType :'Material return type',
createTime :'Returned warehouse date',
- surplusMaterialManagement :'浣欐枡绠＄悊',
- additionOfSurplusMaterials :'浣欐枡鏂板',
- excessMaterialOutflow :'浣欐枡鍑哄簱',
+ surplusMaterialManagement :'Waste material management',
+ additionOfSurplusMaterials :'Surplus addition',
+ excessMaterialOutflow :'Residual materials out of storage',
+ pleaseSelectTheTypeOfReturnToStock:'Please select a return type',
+ pleaseSelectOneData:'璇烽�変腑涓�琛屾暟鎹�',
+ msg1:'搴撳瓨瀛樺湪澶氭潯',
+ msg2:'鏁伴噺涓嶅璇锋鏌�',
+ msg3:'搴撳瓨涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ鏉�',
},
warehouseBasicData:{
page:{
@@ -1052,8 +1300,22 @@
},
stockReport:{
page:{
- warehouseReport:"Warehouse Basic Data"
- }
+ 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',
@@ -1103,6 +1365,84 @@
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