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 | 141 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 119 insertions(+), 22 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 509e996..8c4e6d4 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -92,6 +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: "Quantity Error",
+ dataDoesNotExist: "Data Does Not Exist",
}
},
product:{
@@ -133,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',
@@ -218,6 +220,7 @@
areaAmountPerPiece:'Area amount (single piece)',
areaAmountAge:'Area amount (total area)',
errorValue:'Error value',
+
details:'Details',
workmanship:'Technology',
processCard:'Flow card',
@@ -242,8 +245,11 @@
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',
tableLengthNot:'No table data',
@@ -268,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:'姝よ鍗曞惈鏈夋墜鍔ㄤ慨鏀瑰ぇ灏忕墖锛屽弽瀹′慨鏀硅鍗曞悗璇烽噸鏂伴噸缃ぇ灏忕墖锛佹槸鍚﹀弽瀹★紵'
}
},
@@ -330,12 +337,14 @@
xMargin:'X axis margin',
yMargin:'Y-axis margin',
location:'Trademark position',
+ sort:'鐜荤拑鍙嶅集'
},
workOrder:{
page:{
- selectWorkOrder:'Work order'
+ selectWorkOrder:'Work order',
+ addWorkOrder:'Forward production order'
},
productionId:'Production Order Number',
convert:'Convert',
@@ -344,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:{
@@ -354,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',
@@ -372,6 +382,7 @@
weight:'Weight',
selectedQuantity:'Select Quantity',
establishProcessCards:'Add',
+ createBySequenceNumber:'By Sequence Number',
return:'Return',
ProductionSchedulingOk:'Scheduled Production',
ProductionSchedulingNo:'Unscheduled Production',
@@ -405,6 +416,7 @@
composingOk:'Can Be Typesetter',
composingNo:'Non Typesetting',
typesetter:'typesetter',
+ revoke:'鎾ら攢鍙帓鐗�',
scheduledStartTime:'Scheduled Start Time',
planEndTime:'Plan End Time',
customerId:'Customer Id',
@@ -426,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',
@@ -443,9 +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'
+ 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'
},
reportingWorks:{
page:{
@@ -525,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',
@@ -552,10 +578,20 @@
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:"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',
@@ -631,7 +667,6 @@
singlePieceArea:'Single Piece Area',
perimeter:'Perimeter',
returnToWarehouse:'Return To Warehouse',
-
entryFailure:'Put in storage failure',
entry:'Put in storage',
failedToRetrieve:'Take out failure',
@@ -645,10 +680,12 @@
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'
},
customer:{
page:{
@@ -692,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',
@@ -723,8 +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:{
@@ -756,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',
@@ -767,6 +804,7 @@
roleList:'Role Home',
},
id:'ID',
+ characterHomepage:'Role Home',
role:'Character',
roleAdd:'Role addition',
menu:'Menu',
@@ -796,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',
@@ -840,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"
@@ -918,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',
@@ -962,7 +1003,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',
@@ -972,8 +1017,18 @@
films :'Coating Type',
pleaseEnterData :'Please enter data',
pleaseEnter :'Please enter',
+ msg1 :'This material is already in stock and cannot be deleted',
+ unit :'unit',
},
- 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',
@@ -1013,13 +1068,36 @@
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'
},
- 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",
},
components:{
addNewSignature :'Add label name',
@@ -1069,6 +1147,25 @@
user :'User',
role :'Role',
userPassWord :'User Pass Word',
+ glassPrice:'Glass Price'
+ },
+
+ 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'
}
--
Gitblit v1.8.0