From 9b9fdcb4711279a303cf8da9ce9e3ff30b1bf6e0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 三月 2025 16:45:06 +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 | 124 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 44 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 02d6ffe..8c4e6d4 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -92,8 +92,8 @@
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: "鏁伴噺閿欒锛岃鍒锋柊鍐嶄繚瀛�",
- dataDoesNotExist: "鏁版嵁涓嶅瓨鍦�",
+ quantityError: "Quantity Error",
+ dataDoesNotExist: "Data Does Not Exist",
}
},
product:{
@@ -135,7 +135,7 @@
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',
@@ -245,8 +245,10 @@
sheet3:'View shipping information',
sheet5:'Production and processing of single curved glass (single sheet)',
oneClickStorage:'One-click completion',
+ oneClickReturn:'涓�閿��鍥�',
quantityMount:'Quantity and Amount',
+ allAmount:'闈㈢Н閲戦锛堟�婚噾棰濓級',
msg:{
productCheck:'Please select a product',
@@ -272,7 +274,8 @@
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:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵'
}
},
@@ -334,13 +337,14 @@
xMargin:'X axis margin',
yMargin:'Y-axis margin',
location:'Trademark position',
+ sort:'鐜荤拑鍙嶅集'
},
workOrder:{
page:{
selectWorkOrder:'Work order',
- addWorkOrder:'杞敓浜ц鍗�'
+ addWorkOrder:'Forward production order'
},
productionId:'Production Order Number',
convert:'Convert',
@@ -349,7 +353,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:{
@@ -359,10 +364,10 @@
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"
},
processId:'Process Card Number',
founder:'Divider',
@@ -377,6 +382,7 @@
weight:'Weight',
selectedQuantity:'Select Quantity',
establishProcessCards:'Add',
+ createBySequenceNumber:'By Sequence Number',
return:'Return',
ProductionSchedulingOk:'Scheduled Production',
ProductionSchedulingNo:'Unscheduled Production',
@@ -410,6 +416,7 @@
composingOk:'Can Be Typesetter',
composingNo:'Non Typesetting',
typesetter:'typesetter',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'Scheduled Start Time',
planEndTime:'Plan End Time',
customerId:'Customer Id',
@@ -431,9 +438,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',
@@ -448,11 +458,20 @@
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:'鍚堝苟鐘舵��',
+
+ mergeState:'Merge State',
+ merge:'Merge',
+ printQuantity:'Print Quantity',
+ printWarn1:'The print quantity cannot be greater than the order quantity'
},
reportingWorks:{
page:{
@@ -532,7 +551,7 @@
thisCompletedQuantity:'This Completed Quantity',
thisWornQuantity:'This Worn Quantity',
passAudit:'Pass The Audit',
-
+ patchCondition:'Patch Condition',
selectResponsibleTeam:'Please select a responsible team',
selectWorkReportingTeam:'Please select a responsible team',
@@ -559,13 +578,14 @@
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',
},
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',
@@ -662,10 +682,10 @@
typeClaim:'Take out type',
pleaseEnterTheBoxNumber:'Please enter the box number',
- boxNumber:'绠卞彿',
- msg1:'鍙戣揣鍗曞凡鍑哄簱璇峰埛鏂扮晫闈�',
- msg2:'鍙戣揣鍗曞簱瀛樻暟涓嶅瓨鍦�',
- msg3:'鍏ュ簱鏁伴噺涓嶈兘瓒呰繃璁㈠崟鎬绘暟'
+ 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'
},
customer:{
page:{
@@ -709,7 +729,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',
@@ -740,7 +760,7 @@
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',
},
replenish:{
@@ -772,6 +792,7 @@
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',
@@ -783,7 +804,7 @@
roleList:'Role Home',
},
id:'ID',
- characterHomepage:'瑙掕壊棣栭〉',
+ characterHomepage:'Role Home',
role:'Character',
roleAdd:'Role addition',
menu:'Menu',
@@ -813,6 +834,7 @@
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',
@@ -857,10 +879,12 @@
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:'鏅�氬伐搴�',
+ laminatingProcess:'鍚堢墖宸ュ簭',
},
machine:{
page:{
- selectMachine:'璁惧绠＄悊',
+ selectMachine:'Equipment management',
addMachine:"Device addition",
maintenanceAndRepair:"Maintenance and repair",
addMaintenanceAndRepair:"Maintenance and repair added"
@@ -935,7 +959,7 @@
productionScheduling:'Production scheduling report',
yieldReport:'Yield report',
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',
@@ -993,15 +1017,16 @@
films :'Coating Type',
pleaseEnterData :'Please enter data',
pleaseEnter :'Please enter',
- msg1 :'搴撳瓨宸插瓨鍦ㄦ鐗╂枡涓嶈兘鍒犻櫎',
+ msg1 :'This material is already in stock and cannot be deleted',
+ unit :'unit',
},
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',
@@ -1044,10 +1069,10 @@
materialReturnType :'Material return type',
createTime :'Returned warehouse date',
- surplusMaterialManagement :'浣欐枡绠＄悊',
- additionOfSurplusMaterials :'浣欐枡鏂板',
- excessMaterialOutflow :'浣欐枡鍑哄簱',
- pleaseSelectTheTypeOfReturnToStock:'璇烽�夋嫨杩斿簱绫诲瀷'
+ surplusMaterialManagement :'Waste material management',
+ additionOfSurplusMaterials :'Surplus addition',
+ excessMaterialOutflow :'Residual materials out of storage',
+ pleaseSelectTheTypeOfReturnToStock:'Please select a return type'
},
warehouseBasicData:{
page:{
@@ -1061,8 +1086,18 @@
},
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",
},
components:{
addNewSignature :'Add label name',
@@ -1114,22 +1149,23 @@
userPassWord :'User Pass Word',
glassPrice:'Glass Price'
},
+
glassPrice:{
- glassPriceComputed:'鐜荤拑鎶ヤ环',
- priceSet:'浠锋牸璁剧疆',
- priceList:'浠锋牸鍒楄〃',
+ glassPriceComputed:'Glass quotation',
+ priceSet:'Price setting',
+ priceList:'Price list',
msg:{
- error1:'璇烽�夋嫨鍏ㄩ儴鍙傛暟',
- error2:'姝よ啘绯诲凡缁忓瓨鍦紝璇烽噸鏂伴�夋嫨',
- success:'鏁版嵁淇濆瓨鎴愬姛',
- addProduce:'璇峰厛娣诲姞浜у搧'
+ 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:'鐜荤拑',
- interlayer:'澶硅兌',
- hollow:'涓┖',
- craft:'宸ヨ壓',
- addProduce:'閫夋嫨浜у搧',
- reorder:'杞鍗�'
+ glass:'glass',
+ interlayer:'gum',
+ hollow:'hollow',
+ process:'process',
+ addProduce:'Select product',
+ reorder:'reorder'
}
--
Gitblit v1.8.0