From 033fb309b323e1e6b50d79bc6dd628d427e3ac11 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 13 三月 2024 10:16:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/lang/en.js |  213 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 205 insertions(+), 8 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 7de4518..199c621 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -4,13 +4,11 @@
         pwErr:'Please enter your password',
         loginSuccessful:'User login successful',
         connectErr:'server connection failed',
-        user:'user',
-        password:'pass',
-
-
+        user:'User',
+        password:'Pass',
         SysName:'North Glass ERP System',
-        login:'login',
-        register:'register',
+        login:'Login',
+        register:'Register',
     },
     main:{
         connectErr:'The server connection is abnormal. Please try again later',
@@ -37,6 +35,7 @@
         search:'Search',
         startDate:'Start Date',
         endDate:'End Date',
+        reportData:'Report Data',
         msg:{
             max255:"The value contains a maximum of 255 characters",
             range99999Dec2:
@@ -107,8 +106,42 @@
         }
 
     },
-
-    //宸ュ崟绠$悊
+    searchOrder:{
+        createOrder:'Create',
+        production:'Production',
+        process:'Process',
+        storage:'Storage',
+        delivery:'Delivery',
+        inventoryNum:'InventoryNum',
+        perimeter:'Perimeter',
+        regularOrders:'Regular Orders',
+        cancelledOrders:'Cancelled Orders',
+        allOrders:'All Orders',
+        msg:'Please select a piece of data',
+        msgDelete:'Reviewed orders cannot be deleted',
+        msgDeleteFail:'Fail to delete',
+        msgDeleteSuccess:'Successfully delete',
+        deleteConfirm:'Confirm order deletion?',
+        orderType:'Order Type',
+    },
+    craft:{
+        glassAddress:'Glass Address',
+        glassChild:'GlassChild',
+        width:'Width',
+        height:'Height',
+        totalArea:'TotalArea',
+        childWidth:'Child Width',
+        childHeight:'Child Height',
+        area:'Area',
+        process:'Process',
+        orderDetail:'Order Detail',
+        updateCraft:'Update Process',
+        technologicalProcess:'Technological Process',
+        processAttribute:'Process Attribute',
+        oldProcess:'Old Process',
+        newProcess:'New Process',
+        reset:'Reset',
+    },
     workOrder:{
         workOrder:'Work Order Management',
         productionId:'Production Order Number',
@@ -247,6 +280,170 @@
         passAudit:'Pass The Audit',
 
 
+    },
+
+
+
+
+    productStock:{
+        inventoryQuery:'Stock Inquiry',
+        finishedProductWarehousing:"Finished product Into Stock ",
+        finishedProductOutbound:'Finished Product Out Of Stock',
+        finishedProductOrderReturn:"Return Finished Order ",
+        reportForms:"Report Forms",
+        remarks:"Remarks",
+        outbound:'Outbound',
+        orderTransfer:'Order Allocation',
+        finishedProductPickup:"Finished Goods Delivery ",
+        finishedProductRework:"Finished Goods Reprocessing ",
+        pleaseEnterTheStorageLocation:'Please input stock no',
+        pleaseEnterANote:"Please input remarks ",
+        completedQuantity:'Finished Quantity',
+        finishedProductInventory:"Finished Product Stock ",
+        confirmOutbound:'Delivery Confirmation',
+        confirmReceiptOfGoods:'Warehousing Confirmation',
+
+        receivedSuccessfully:'Successfully entered the warehouse',
+        deliverySuccessful:"Successfully transferred out of warehouse ",
+        successfullyRetrieved:'Successfully claimed',
+        reworkSuccessful:'Successfully rework',
+        transferSuccessful:'Successfully mutual exchange',
+        reviewSuccessful:'Successfully review ',
+        invalidSuccessfully:'Successfully cancel',
+        reverseReviewSuccessful:'Successfully re-audit',
+
+        confirmWithdrawal:'Take Out Confirmation',
+        pickingOutRecords:'Take Out Records',
+        confirmTransfer:'Mutual Exchange Confirmation',
+        transferRecords:'Mutual Exchange Records',
+        reworkConfirmation:'Rework Confirmation',
+        reworkRecords:'Rework Records',
+
+
+        pleaseSelectTheTypeOfWithdrawal:'Please select the type of withdrawal',
+        pleaseSelectTheTypeOfRework:'Please select the type of rework',
+        receivedQuantity:'Received Quantity',
+        reworkQuantity:'Rework Quantity',
+        transferQuantity:'Mutual Exchange Quantity',
+        receivedReworkedQuantity:'Received/Reworked Quantity',
+        inventoryQuantity:'Inventory Quantity',
+        availableQuantity:'Available Quantity',
+
+        newOrderNumber:'New Order Number',
+        newOrderId:'New Order Id',
+        transferOrderNumber:'Mutual Exchange Order Number',
+        operationOrderNumber:'Operation Order Number',
+        inventoryArea:'Inventory Location',
+
+
+        dataVerificationFailed:'Fail data check',
+        unselectedData:'No data selected',
+        pleaseEnterAPositiveInteger:'Please enter a positive integer',
+        pleaseEnterTheOrderIdForTheTransfer:'Please enter the order id for the transfer',
+        pleaseEnterTheOrderNumberForTheTransfer:'Please enter the order number for the transfer',
+        theTransferQuantityCannotBeGreaterThanTheOrderQuantity:'The quantity of mutual exchange cannot be greater than the number of orders',
+        transferQuantityCannotBeEmptyOr0:'The quantity of mutual exchange cannot be empty or 0',
+        theClaimedQuantityCannotBeGreaterThanTheOrderQuantity:'The claimed quantity cannot be greater than the number of orders',
+        claimedQuantityCannotBeEmptyOr0:'The claimed quantity cannot be empty or 0',
+        theReworkQuantityCannotBeGreaterThanTheOrderQuantity:'The quantity of rework cannot be greater than the number of orders',
+        reworkQuantityCannotBeEmptyOr0:'Rework quantity cannot be empty or 0',
+
+        storageTime:'Warehouse Entry Time',
+        outboundTime:'Time Of Leaving The Warehouse',
+        modificationTime:'modification Time',
+        productionDate:'Production Date',
+        statementDate:'Statement Date',
+        approvedDate:'Approved Date',
+        creator:'Document Making Staff',
+        reviewed:'Audit Staff',
+        documentStatus:'Document Status',
+        status:'Status',
+
+        totalNumberOfOrders :'Total Number Of Orders',
+        quantityAlreadyInStock:'Quantity Already In Stock',
+        totalArea:'Total Area',
+        singlePieceArea:'Single Piece Area',
+        perimeter:'Perimeter',
+        returnToWarehouse:'Return To Warehouse',
+    },
+    customer:{
+        pleaseEnterTheCustomerName:'Please enter the customer name',
+        pleaseEnterCustomerLevel:"Please enter customer level ",
+        pleaseEnterTheAmountOfFunds:'Please enter the amount of funds',
+        pleaseEnterTheContactAddress:"Please enter the contact address ",
+        pleaseEnterTheContactPerson:"Please enter the contact person ",
+        pleaseEnterTheContactPhoneNumber:"Please enter the contact phone number",
+        customerGrade:'Customer Grade',
+        moneyLimit:"Money Limit ",
+        address:"Address ",
+        contacts:'Contacts',
+        telephone:"Telephone ",
+        customerNumber:'Customer Id',
+        customerName:"Customer",
+        customerHomePage:'Customer Homepage',
+        increaseCustomers:'Increase Customers',
+        resetting:'Resetting',
+
+    },
+    delivery:{
+        delivery:'Delivery',
+        place :'Place',
+        technology:'Technology',
+        produce:'Produce',
+        traveler:'Traveler',
+        warehousing:'Warehousing',
+        unpaidQuantity:"Unpaid  Quantity ",
+        availableStock:'Available Stock',
+        deliveryQuantity:'Delivery Quantity',
+        pleaseEnterTheAmountOfFunds:'Please enter the project name',
+        pleaseSelectPaymentTerms:"Please select payment terms ",
+        pleaseEnterThePaymentMethod:"Please enter the payment method ",
+        pleaseSelectTheSameCustomerOrder:'Please select the same customer order',
+        deliveryNoteSubmittedSuccessfully:"Delivery note submitted successfully",
+        pleaseEnterANumericalValueGreaterThanOrEqualTo0:'Please enter a numerical value greater than or equal to 0',
+        theShipmentQuantityCannotBeGreaterThanTheInventoryQuantity:"The shipment quantity cannot be greater than the inventory quantity ",
+        theShipmentQuantityCannotBeEmptyOr0:"The shipment quantity cannot be empty or 0 ",
+        paymentTerms:'Payment Terms',
+        paymentDate:"Payment Date ",
+        selectDate:'Select Date',
+        paymentMethod:"Payment Method ",
+        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 ",
+
+    },
+    replenish:{
+        patchManagement:'Patch Management',
+        addPatches:"Add Patches ",
+        printPatches:'Print Patches',
+        patchNumber:'Patch Number',
+
+        mark:'Mark',
+        sliceMarking:'Slice Marking',
+
+
+
+    },
+    rework:{
+        reworkManagement:'Rework Management',
+        addRework:"Add Rework ",
+        printRework:'Print Rework',
+        reworkNumber:'Rework Number',
+        reworkTeam:'Rework Team',
+        reasonForRework:"Reason For Rework ",
+        reworkProcess:'Rework Process',
+        reworkType:'Rework Type',
+        reworkArea:'Rework Area',
+
+        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',
+
     }
 
 }
\ No newline at end of file

--
Gitblit v1.8.0