From 91ab45ad4528477d04162e8a4e808b0ea84de421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Fri, 6 Jun 2025 15:22:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=E4=BB=AC?= =?UTF-8?q?=EF=BC=8C=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=863=E4=B8=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9B=BD=E9=99=85=E5=8C=96=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/lang/en.js | 655 +++++++++++---- ruoyi-ui/src/lang/zh.js | 764 +++++++++++++----- ruoyi-ui/src/views/out/outStockoutManage.vue | 34 +- ruoyi-ui/src/views/stock/freeze/index.vue | 289 ++++--- ruoyi-ui/src/views/stock/management/index.vue | 178 ++-- ruoyi-ui/src/views/stock/record/index.vue | 272 ++++--- ruoyi-ui/src/views/system/role/index.vue | 2 +- ruoyi-ui/src/views/system/user/index.vue | 8 +- 8 files changed, 1467 insertions(+), 735 deletions(-) diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 3caec43..5a8c2f9 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -22,7 +22,7 @@ export default { sidebarLogo: 'Sidebar Logo' }, // ***************收货单据新增************* - receiveStockinAdd:{ + receiveStockinAdd: { title: 'Add Receive Stockin', warehouse: 'Warehouse', supplier: 'Supplier', @@ -79,7 +79,7 @@ export default { grossWeight: 'Gross Weight (KG)' }, // ***************收货单据管理************* - inReceiveStockin:{ + inReceiveStockin: { stockinId: 'Stockin Order ID', inputstockinId: 'Please input stockin order ID', supplierNo: 'Supplier Code', @@ -114,7 +114,7 @@ export default { selecInType: 'Please select stockin type', }, // ***************入库单据管理************* - inStockin:{ + inStockin: { selecInType: 'Please select stockin type', cancel: 'Cancel Document', examine: 'Document Review', @@ -166,7 +166,7 @@ export default { selectStatus: 'Please select Task Status', inputTaskNo: 'Please input Task No.', inputTrayCode: 'Please input Tray Code', - targetCargoSpaceId:'TargetCargoSpaceID', + targetCargoSpaceId: 'TargetCargoSpaceID', inputTargetCargoSpaceId: 'Please input Target Cargo Space ID', selectExecutionPhase: 'Please select Execution Phase', selectInOrOut: 'Please select Task Type', @@ -175,17 +175,20 @@ export default { inputEntranceId: 'Please input Entrance ID', inputExitId: 'Please input Exit ID' }, - - outStockoutManage:{ + // ***************出库单据管理************** + outStockoutManage: { stockoutId: 'Outbound Order ID', outType: 'Outbound Type', status: 'Document Status', customerNo: 'Customer Code', + customerName: 'Customer Name', + productName:'Product Name', createManId: 'Creator', createDate: 'Create Time', startDate: 'Start Time', finishDate: 'Confirm Time', warehouseId: 'Warehouse ID', + warehouseName:'Warehouse　Name', stockoutDetailId: 'Outbound Detail ID', productId: 'Material Code', lotNo: 'Batch No.', @@ -208,9 +211,15 @@ export default { inputStockoutId: 'Please input outbound order ID', selectOutType: 'Please select outbound type', selectStatus: 'Please select document status', - inputCustomerNo: 'Please input customer code' + inputCustomerNo: 'Please input customer code', + inputCustomerName:'Please input customer name', + inputProductName:'Please input product name', + selectStartDate: 'Please input start date', + selectFinishDate: 'Please input finish date', + }, - addOutStockout:{ + // ***************新建出库单据************** + addOutStockout: { warehouse: 'Warehouse', selectWarehouse: 'Please select warehouse', customer: 'Customer', @@ -235,7 +244,7 @@ export default { confirm: 'Confirm', cancel: 'Cancel' }, - productAndStock:{ + productAndStock: { serialNumber: 'Serial Number1111111111', productId: 'Material Code', lotNo: 'Batch Number', @@ -252,6 +261,7 @@ export default { inputProductName: 'Please input material name', inputWarehouse: 'Please input warehouse' }, + // ***************出库作业管理************** outJobManagement: { // Status and Job Type status: 'Status', @@ -300,51 +310,478 @@ export default { manualComplete: 'Manual Complete', manualInvalidate: 'Manual Invalidate' }, + // *****************新建盘点单据*************** + checkCreate: { + warehouse: 'Warehouse', + selectWarehouse: 'Please select warehouse', + customer: 'Customer', + inputCustomerNo: 'Please input customer number', + documentType: 'Document Type', + selectDocumentType: 'Please select document type', + reset: 'Reset', + saveDocument: 'Save Document', + selectMaterial: 'Select Material', + recreateDocument: 'Recreate Document', + materialCode: 'Material Code', + materialName: 'Material Name', + batchNo: 'Batch No.', + inputBatchNo: 'Please input batch number', + quantity: 'Quantity', + operation: 'Operation', + delete: 'Delete', + inputMaterialCode: 'Please input material code', + inputMaterialName: 'Please input material name', + search: 'Search', + confirm: 'Confirm', + cancel: 'Cancel', + warehouseRequired: 'Please select warehouse', + customerRequired: 'Please input customer number', + documentTypeRequired: 'Please select document type', + selectMaterialRequired: 'Please select material', + materialExistWarning: 'Selected material already exists, please reselect', + quantityExceedError: 'Quantity cannot exceed stock quantity', + saveSuccess: 'Document {msg} saved successfully' + }, + //***************盘点单据管理*************** + checkStockCheck: { + stockCheckId: 'Stock Check ID', + inputStockCheckId: 'Please input stock check ID', + checkType: 'Check Type', + selectCheckType: 'Please select check type', + status: 'Status', + selectStatus: 'Please select status', + warehouse: 'Warehouse', + selectWarehouse: 'Please select warehouse', + search: 'Search', + reset: 'Reset', + invalidate: 'Invalidate', + review: 'Review', + confirm: 'Confirm', + warehouseId: 'Warehouse ID', + stockSource: 'Stock Source', + departmentNo: 'Department No', + createManId: 'Creator', + createDate: 'Create Date', + finishDate: 'Finish Date', + detailId: 'Detail ID', + mainId: 'Main ID', + lotNo: 'Lot No', + productId: 'Product ID', + materialDesc: 'Material Description', + englishDesc: 'English Description', + cartonNo: 'Carton No', + packingMethod: 'Packing Method', + quantity: 'Planned Quantity', + scanNum: 'Scanned Quantity', + assignNum: 'Actual Quantity', + stockCheckIdRequired: 'Stock check ID is required', + checkTypeRequired: 'Check type is required', + createDateRequired: 'Create date is required', + statusRequired: 'Status is required', + editSuccess: 'Edit successful', + addSuccess: 'Add successful', + invalidateSuccess: 'Invalidate successful', + onlyUnreviewedCanInvalidate: 'Only unreviewed documents can be invalidated', + alreadyReviewed: 'Document has been reviewed, please do not review again', + reviewSuccess: 'Review successful', + onlyUnreviewedCanReview: 'Only unreviewed documents can be reviewed', + confirmSuccess: 'Confirm successful', + onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed' + }, + // ***************盘点入库作业************* + checkJobIn: { + jobId: 'Task ID', + status: 'Task Status', + onLineType: 'Online Type', + jobType: 'Task Type', + taskNo: 'Task No.', + supplier: 'Supplier', + department: 'Department', + trayCode: 'Tray Code', + roadwayId: 'Roadway ID', + cargoSpace: 'Cargo Space', + targetRoadway: 'Target Roadway', + targetCargoSpace: 'Target Cargo Space', + lineId: 'Production Line ID', + workshopId: 'Workshop ID', + priority: 'Priority', + executionPhase: 'Execution Phase', + startTime: 'Start Time', + finishTime: 'Finish Time', + entrance: 'Entrance', + entranceId: 'Entrance ID', + exit: 'Exit', + exitId: 'Exit ID', + classId: 'Class ID', + warehouseId: 'Warehouse ID', + warehouse: 'Warehouse', + faultFlag: 'Fault Flag', + jobDetailId: 'Sub-task ID', + stockId: 'Stock ID', + lotNo: 'Lot No.', + inDate: 'Storage Time', + inOrOutId: 'Document ID', + inOrOutDId: 'Sub-document ID', + productGuid: 'Material GUID', + productId: 'Material Code', + stockStatus: 'Stock Status', + inQuantity: 'Storage Quantity', + printDate: 'Production Date', + supplierId: 'Supplier ID', + // 按钮和操作文本 + search: 'Search', + reset: 'Reset', + manualVoid: 'Manual Void', + manualFinish: 'Manual Complete', + // 输入框提示文本 + inputJobId: 'Please input Task ID', + selectStatus: 'Please select Task Status', + inputTaskNo: 'Please input Task No.', + inputTrayCode: 'Please input Tray Code', + inputTargetCargoSpace: 'Please input Target Cargo Space', + selectExecutionPhase: 'Please select Execution Phase', + selectJobType: 'Please select Task Type', + selectStartTime: 'Please select Start Time', + selectFinishTime: 'Please select Finish Time', + inputEntranceId: 'Please input Entrance ID', + inputExitId: 'Please input Exit ID', + inputWarehouseId: 'Please input Warehouse ID', + // 校验提示信息 + jobIdRequired: 'Task ID cannot be empty', + statusRequired: 'Task Status cannot be empty', + taskNoRequired: 'Task No. cannot be empty', + selectData: 'Please select data to operate' + }, + // **************盘点出库作业**************** + checkJobOut: { + jobId: 'Task ID', + status: 'Task Status', + onLineType: 'Online Type', + jobType: 'Task Type', + taskNo: 'Task No.', + supplierId: 'Supplier ID', + departmentId: 'Department ID', + trayCode: 'Tray Code', + roadwayId: 'Roadway ID', + cargoSpaceId: 'Cargo Space ID', + targetRoadwayId: 'Target Roadway ID', + targetCargoSpace: 'Target Cargo Space', + lineId: 'Production Line ID', + workshopId: 'Workshop ID', + priority: 'Priority', + executionPhase: 'Execution Phase', + startTime: 'Start Time', + finishTime: 'Finish Time', + entranceId: 'Entrance ID', + exitId: 'Exit ID', + classId: 'Class ID', + warehouse: 'Warehouse', + faultFlag: 'Fault Flag', + operation: 'Operation', + subJobId: 'Sub Task ID', + stockId: 'Stock ID', + batchNo: 'Batch No.', + inTime: 'In Time', + billId: 'Bill ID', + subBillId: 'Sub Bill ID', + materialGuid: 'Material GUID', + materialCode: 'Material Code', + stockStatus: 'Stock Status', + inQty: 'In Quantity', + productDate: 'Production Date', + search: 'Search', + reset: 'Reset', + manualFinish: 'Manual Finish', + manualInvalid: 'Manual Invalid', + inputJobId: 'Please input task ID', + selectStatus: 'Please select task status', + inputTaskNo: 'Please input task No.', + inputTrayCode: 'Please input tray code', + inputTargetCargoSpace: 'Please input target cargo space ID', + selectExecutionPhase: 'Please select execution phase', + selectJobType: 'Please select task type', + selectStartTime: 'Please select start time', + selectFinishTime: 'Please select finish time', + inputEntranceId: 'Please input entrance ID', + inputExitId: 'Please input exit ID', + inputWarehouseId: 'Please input warehouse ID', + selectData: 'Please select data to operate', + confirmFinish: 'Are you sure to manually finish the data with ID "{jobIds}"?', + finishSuccess: 'Manual finish successful', + confirmInvalid: 'Are you sure to manually invalid the data with ID "{jobIds}"?', + invalidSuccess: 'Manual invalid successful' + }, + // ****************盘点差异管理***************** + checkDifference: { + checkGuid: 'Check ID', + checkStockDetailId: 'Check Document ID', + stockId: 'Stock ID', + trayCode: 'Tray', + cargoSpaceId: 'Cargo Space ID', + productId: 'Product ID', + lotNo: 'Lot No.', + supplier: 'Supplier', + customer: 'Customer', + oldQuantity: 'Original Value', + newQuantity: 'New Value', + recordType: 'Operation Type', + productGuid: 'Product GUID', + operation: 'Operation', + edit: 'Edit', + delete: 'Delete', + search: 'Search', + reset: 'Reset', + confirm: 'Confirm', + cancel: 'Cancel', + inputCheckStockDetailId: 'Please enter check document ID', + inputStockId: 'Please enter stock ID', + inputTrayCode: 'Please enter tray', + inputCargoSpaceId: 'Please enter cargo space ID', + inputProductId: 'Please enter product ID', + inputLotNo: 'Please enter lot No.', + inputSupplier: 'Please enter supplier', + inputCustomer: 'Please enter customer', + inputOldQuantity: 'Please enter original value', + inputNewQuantity: 'Please enter new value', + inputProductGuid: 'Please enter product GUID' + }, + // ********************库存信息************* + stockManagement: { + stockId: 'Stock ID', + cargoSpaceId: 'Cargo Space ID', + stockStatus: 'Stock Status', + productStatus: 'Product Status', + lotNo: 'Lot No', + inDate: 'In Date', + backDate: 'Back Date', + productGuid: 'Product GUID', + quantity: 'Quantity', + jobId: 'Job ID', + trayCode: 'Tray Code', + outQuantity: 'Out Quantity', + stockinDetailId: 'Stock-in Detail ID', + stockinId: 'Stock-in ID', + inType: 'In Type', + inClassId: 'In Class ID', + warehouseId: 'Warehouse', + stackingId: 'Stacking ID', + operation: 'Operation', + add: 'Add', + edit: 'Edit', + delete: 'Delete', + export: 'Export', + confirm: 'Confirm', + cancel: 'Cancel', + search: 'search', + reset: 'reset', + inputStockId: 'Please input stock ID', + inputCargoSpaceId: 'Please input cargo space ID', + selectStockStatus: 'Please select stock status', + selectProductStatus: 'Please select product status', + inputLotNo: 'Please input lot No', + inputInDate: 'Please input in date', + inputBackDate: 'Please input back date', + inputProductGuid: 'Please input product GUID', + inputQuantity: 'Please input quantity', + inputJobId: 'Please input job ID', + inputTrayCode: 'Please input tray code', + inputOutQuantity: 'Please input out quantity', + inputStockinDetailId: 'Please input stock-in detail ID', + inputStockinId: 'Please input stock-in ID', + inputInClassId: 'Please input in class ID', + inputWarehouseId: 'Please input warehouse', + inputStackingId: 'Please input stacking ID', + stockIdRequired: 'Stock ID is required', + addTitle: 'Add Stock Information', + editTitle: 'Edit Stock Information', + addSuccess: 'Added successfully', + editSuccess: 'Modified successfully', + deleteSuccess: 'Deleted successfully', + confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?' + }, + // *************库存操作记录*************** + stockRecord: { + stockId: 'Stock ID', + cargoSpaceId: 'Cargo Space ID', + trayCode: 'Tray Code', + productId: 'Product ID', + productName: 'Product Name', + printDate: 'Production Date', + lotNo: 'Lot No.', + oldQuantity: 'Initial Quantity', + quantity: 'Quantity After Operation', + method: 'Operation', + warehouseId: 'Warehouse', + stockDetailId: 'Stock Detail ID', + operatingTarget: 'Operation Target', + barCodeOldQuantity: 'Barcode Quantity', + barCodeQuantity: 'Barcode Quantity', + productGuid: 'Product GUID', + inputStockId: 'Please enter stock ID', + inputCargoSpaceId: 'Please enter cargo space ID', + inputTrayCode: 'Please enter tray code', + inputProductId: 'Please enter product ID', + inputProductName: 'Please enter product name', + inputPrintDate: 'Please enter production date', + inputLotNo: 'Please enter lot number', + inputOldQuantity: 'Please enter initial quantity', + inputQuantity: 'Please enter quantity after operation', + selectMethod: 'Please select operation', + inputWarehouseId: 'Please enter warehouse', + inputStockDetailId: 'Please enter stock detail ID', + inputOperatingTarget: 'Please enter operation target', + inputBarCodeOldQuantity: 'Please enter barcode quantity', + inputBarCodeQuantity: 'Please enter barcode quantity', + inputProductGuid: 'Please enter product GUID', + stockIdRequired: 'Stock ID cannot be empty', + cargoSpaceIdRequired: 'Cargo space ID cannot be empty', + trayCodeRequired: 'Tray code cannot be empty', + productIdRequired: 'Product ID cannot be empty', + productNameRequired: 'Product name cannot be empty', + printDateRequired: 'Production date cannot be empty', + lotNoRequired: 'Lot number cannot be empty', + oldQuantityRequired: 'Initial quantity cannot be empty', + quantityRequired: 'Quantity after operation cannot be empty', + methodRequired: 'Operation cannot be empty', + warehouseIdRequired: 'Warehouse cannot be empty', + stockDetailIdRequired: 'Stock detail ID cannot be empty', + operatingTargetRequired: 'Operation target cannot be empty', + barCodeOldQuantityRequired: 'Barcode quantity cannot be empty', + barCodeQuantityRequired: 'Barcode quantity cannot be empty', + productGuidRequired: 'Product GUID cannot be empty', + search: 'Search', + reset: 'Reset', + export: 'Export', + confirm: 'Confirm', + cancel: 'Cancel', + addTitle: 'Add Stock Operation Record', + editTitle: 'Edit Stock Operation Record', + addSuccess: 'Added successfully', + editSuccess: 'Modified successfully', + deleteSuccess: 'Deleted successfully', + confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?', + fileName: 'record_{time}' + }, + // **************库存冻结记录************** + stockFreeze: { + stockId: 'Stock ID', + inputStockId: 'Please input stock ID', + stockIdRequired: 'Stock ID is required', + cargoSpaceId: 'Cargo Space ID', + inputCargoSpaceId: 'Please input cargo space ID', + cargoSpaceIdRequired: 'Cargo space ID is required', + trayCode: 'Tray Code', + inputTrayCode: 'Please input tray code', + trayCodeRequired: 'Tray code is required', + productId: 'Product ID', + inputProductId: 'Please input product ID', + productIdRequired: 'Product ID is required', + productName: 'Product Name', + inputProductName: 'Please input product name', + productNameRequired: 'Product name is required', + printDate: 'Production Date', + inputPrintDate: 'Please input production date', + printDateRequired: 'Production date is required', + lotNo: 'Lot No.', + inputLotNo: 'Please input lot No.', + lotNoRequired: 'Lot No. is required', + method: 'Operation', + inputMethod: 'Please input operation', + methodRequired: 'Operation is required', + warehouseId: 'Warehouse', + inputWarehouseId: 'Please input warehouse', + warehouseIdRequired: 'Warehouse is required', + stockDetailId: 'Stock Detail ID', + inputStockDetailId: 'Please input stock detail ID', + stockDetailIdRequired: 'Stock detail ID is required', + operatingTarget: 'Operating Target', + inputOperatingTarget: 'Please input operating target', + operatingTargetRequired: 'Operating target is required', + barCodeOldQuantity: 'Barcode Quantity', + inputBarCodeOldQuantity: 'Please input barcode quantity', + barCodeOldQuantityRequired: 'Barcode quantity is required', + barCodeQuantity: 'Barcode Quantity', + inputBarCodeQuantity: 'Please input barcode quantity', + barCodeQuantityRequired: 'Barcode quantity is required', + productGuid: 'Product GUID', + inputProductGuid: 'Please input product GUID', + productGuidRequired: 'Product GUID is required', + operation: 'Operation', + search: 'Search', + reset: 'Reset', + add: 'Add', + edit: 'Edit', + delete: 'Delete', + export: 'Export', + confirm: 'Confirm', + cancel: 'Cancel', + addTitle: 'Add Stock Freeze Record', + editTitle: 'Edit Stock Freeze Record', + addSuccess: 'Added successfully', + editSuccess: 'Modified successfully', + deleteSuccess: 'Deleted successfully', + deleteConfirm: 'Are you sure to delete the selected stock freeze records?' + }, menu: { //收货单据新增 InboundManagement: 'InboundManagement', - ReceivingDocumentsAdd:"ReceivingDocumentsAdd", - ReceiptDocumentManagement:"ReceiptDocumentManagement", - ManagementOfInboundDocuments:"ManagementOfInboundDocuments", - InboundTaskManagement:"InboundTaskManagement", - + ReceivingDocumentsAdd: "ReceivingDocumentsAdd", + ReceiptDocumentManagement: "ReceiptDocumentManagement", + ManagementOfInboundDocuments: "ManagementOfInboundDocuments", + InboundTaskManagement: "InboundTaskManagement", //********************仓库管理******************** WarehouseManagement: 'WarehouseManagement', - //仓库（库区）管理 - WarehouseAreaManagement: 'WarehouseManagement', - //货位管理 - CargoSpaceManagement: 'CargoSpaceManagement', - + //仓库（库区）管理 + WarehouseAreaManagement: 'WarehouseManagement', + //货位管理 + CargoSpaceManagement: 'CargoSpaceManagement', //********************出库管理******************** - outboundManagement:'outboundManagement', - createNewOutboundDocument:'createNewOutboundDocument', - outboundDocumentManagement:'outboundDocumentManagement', - outboundTaskManagement:'outboundTaskManagement', + outboundManagement: 'outboundManagement', + createNewOutboundDocument: 'createNewOutboundDocument', + outboundDocumentManagement: 'outboundDocumentManagement', + outboundTaskManagement: 'outboundTaskManagement', //********************系统管理******************** SystemManagement: 'SystemManagement', - //用户管理 - UserManagement: 'UserManagement', - //角色管理 - RoleManagement: 'RoleManagement', - //菜单管理 - MenuManagement: 'MenuManagement', - //部门管理 - DepartmentManagement: 'DepartmentManagement', - //岗位管理 - PostManagement: 'PostManagement', - //字典管理 - DictionaryManagement: 'DictionaryManagement', - //参数管理 - ParameterManagement: 'ParameterManagement', - //通知公告 - NoticeManagement: 'NoticeManagement', - //日志管理 - LogManagement: 'LogManagement', - + //用户管理 + UserManagement: 'UserManagement', + //角色管理 + RoleManagement: 'RoleManagement', + //菜单管理 + MenuManagement: 'MenuManagement', + //部门管理 + DepartmentManagement: 'DepartmentManagement', + //岗位管理 + PostManagement: 'PostManagement', + //字典管理 + DictionaryManagement: 'DictionaryManagement', + //参数管理 + ParameterManagement: 'ParameterManagement', + //通知公告 + NoticeManagement: 'NoticeManagement', + //日志管理 + LogManagement: 'LogManagement', + // ****************盘点管理****************** + inventoryManagement: 'inventoryManagement', + createNewInventoryDocument: 'createNewInventoryDocument', + inventoryDocumentManagement: 'inventoryDocumentManagement', + inventoryStorageTask: 'inventoryStorageTask', + inventoryOutboundTask: 'inventoryOutboundTask', + inventoryDiscrepancyManagement: 'inventoryDiscrepancyManagement', + // ****************库存管理****************** + stockManagement: 'stockManagement', + stockInformation: 'stockInformation', + stockOperationRecords: 'stockOperationRecords', + stockFreezeRecord: 'stockFreezeRecord', + // ***************基础信息**************** + basicInformation:'basicInformation', + customerManagement:'customerManagement', + supplierManagement:'supplierManagement', + materialManagement:'materialManagement', + basicPointLocation:'basicPointLocation' }, //=====================仓库（库区）管理===================== @@ -407,7 +844,7 @@ export default { }, //=====================货位管理===================== - cargoSpace:{ + cargoSpace: { //--------------数据表标题-------------- title: 'CargoSpace Management', cargoSpaceId: 'CargoSpaceId', @@ -490,116 +927,6 @@ export default { }, - //=====================系统管理：用户管理===================== - systemManagement_UserManagement: { - //--------------数据表标题-------------- - userId: 'UserId', - userName: 'UserName', - password: 'Password', - nickName: 'NickName', - deptName: 'DeptName', - phoneNumber: 'PhoneNumber', - status: 'Status', - creatTime: 'CreatTime', - operation: 'Operation', - email: 'Email', - post: 'Post', - role: 'Role', - gender: 'Gender', - remark: 'Remark', - - //--------------交互框操作提示-------------- - placeholderDeptName: 'Enter DeptName', - placeholderUserId: 'Enter UserId', - placeholderUserName: 'Enter UserName', - placeholderPassword: 'Enter Password', - placeholderNickName: 'Enter NickName', - placeholderPhoneNumber: 'Enter PhoneNumber', - placeholderStatus: 'Enter Status', - placeholderCreatTime: 'Enter CreatTime', - placeholderDateStart: 'DateStart', - placeholderDateEnd: 'DateEnd', - placeholderEmail: 'Enter Email', - placeholderPost: 'Select Post', - placeholderRole: 'Select Role', - placeholderGender: 'Select Gender', - placeholderRemark: 'Enter Remark', - - //--------------交互按钮-------------- - btnSearch: 'Search', - btnReset: 'Reset', - btnAdd: 'Add', - btnEdit: 'Edit', - btnDelete: 'Delete', - btnImport: 'Import', - btnExport: 'Export', - btnSubmit: 'Submit', - btnCancel: 'Cancel', - btnMore: 'More', - btnResetPassword: 'Reset Password', - btnAssignRole: 'Assign Role', - - //--------------二级窗口标题-------------- - addUserItem: 'Add User', - editUserItem: 'Edit User', - - //--------------提示文本-------------- - //---布局--- - textDragOrClick1: 'Drag file here, or ', - textDragOrClick2: 'click to upload', - textUpdateExistingData: 'Do you want to update existing user data?', - textUploadTip: 'Only xlsx and xls files are allowed.', - textDownloadTemplate: 'Download Template', - - //---函数：handleStatusChange--- - textEnable: 'enable', - textDisable: 'disable', - textUserConfirm1:"Are you sure you want to \"", - textUserConfirm2:"\" user？", - textSuccess: 'success', - - //---函数：handleResetPwd--- - textInputPassword1: 'Please enter the new password for the \"', - textInputPassword2: '\" user', - textTips: 'Tip', - textConfirm: 'Confirm', - textCancel: 'Cancel', - textResetPassword: 'The change was successful and the new password is:', - - //---函数：handleDelete--- - textDeleteConfirm1: 'Is it confirmed to delete the data item with user number "', - textDeleteConfirm2: '"?', - - //---函数：handleImport--- - textImportTitle: 'Import User Data', - - //---函数：textUploadTitle--- - textImportResult: 'Result', - - - //--------------操作提示-------------- - addSuccessInfo: 'Add Success', - editSuccessInfo: 'Edit Success', - deleteSuccessInfo: 'Delete Success', - resetPasswordSuccessInfo: 'Reset Password Success', - assignRoleSuccessInfo: 'Assign Role Success', - - //--------------校验提示-------------- - checkUserNameIsNull: 'UserName cannot be null!', - checkUserNameLength: 'UserName length must be between 2-20 characters!', - checkNickNameIsNull: 'NickName cannot be null!', - checkPasswordIsNull: 'Password cannot be null!', - checkPasswordLength: 'Password length must be between 5-20 characters!', - checkPasswordCharacter: "Password cannot contain illegal characters: < > \" \' \\\ |", - checkEmailFormat: 'Please enter a valid email address!', - checkPhoneNumberFormat: 'Please enter a valid phone number!', - - //--------------其他-------------- - lblWidthUserName: '80px', - lblWidthPhoneNumber: '90px', - - }, - //=====================系统管理:角色管理===================== systemManagement_RoleManagement: { @@ -798,7 +1125,7 @@ export default { // ***************出库作业流水查询************* searchViewOutJobFlow: { title: '出库作业流水查询', - jobId: '作业ID', + jobId: '作业ID1111', inputJobId: '请输入作业ID', jobDetailId: '子作业ID', inputJobDetailId: '请输入子作业ID', @@ -878,7 +1205,7 @@ export default { }, // ***************入库作业流水查询************* searchViewInJobFlow: { - status: '状态', + status: '状态11111111', selectStatus: '请选择状态', taskNo: '任务号', inputTaskNo: '请输入任务号', @@ -956,7 +1283,7 @@ export default { }, // ***************库存明细查询************* searchViewStockDetail: { - stockId: '库存ID', + stockId: '库存ID111111', inputStockId: '请输入库存ID', cargoSpaceId: '货位ID', inputCargoSpaceId: '请输入货位ID', @@ -1014,7 +1341,7 @@ export default { }, // ***************平库出库流水************* searchViewFlatWarehouseOutFlow: { - warehouse: '仓库', + warehouse: '仓库11111111111', selectWarehouse: '请选择仓库', productId: '物料ID', inputProductId: '请输入物料ID', @@ -1059,7 +1386,7 @@ export default { }, // ***************平库入库流水************* searchViewFlatWarehouseInFlow: { - warehouse: '仓库', + warehouse: '仓库11111111', selectWarehouse: '请选择仓库', productId: '物料ID', inputProductId: '请输入物料ID', @@ -1092,7 +1419,7 @@ export default { }, // ***************出库单据历史查询************* searchViewStockoutHistory: { - stockoutId: '出库单号', + stockoutId: '出库单号1111111111', inputStockoutId: '请输入出库单号', outType: '出库类型', selectOutType: '请选择出库类型', @@ -1140,9 +1467,9 @@ export default { }, // ***************入库单据历史查询************* searchViewStockinHistory: { - stockinGuid: '入库单guid', + stockinGuid: '入库单guid11111111111', inputStockinGuid: '请输入入库单guid', - stockinId: '入库单号', + stockinId: '入库单号1111111', inputStockinId: '请输入入库单号', inType: '入库类型', selectInType: '请选择入库类型', @@ -1222,7 +1549,7 @@ export default { // ***************收货单据管理************* searchStockSummary: { export: '导出', - productId: '物料编码', + productId: '物料编码111111111', inputProductId: '请输入物料编码', productName: '物料名称', inputProductName: '请输入物料名称', @@ -1241,7 +1568,7 @@ export default { }, // ***************预警库存查询************* searchViewStockWarning: { - stockId: '库存ID', + stockId: '库存ID111111111', inputStockId: '请输入库存ID', cargoSpaceId: '货位ID', inputCargoSpaceId: '请输入货位ID', @@ -1431,7 +1758,7 @@ export default { checkPostNameIsNull: 'PostName Can Not Be Null', checkPostCodeIsNull: 'PostCode Can Not Be Null', checkPostSortIsNull: 'PostSort Can Not Be Null', - + }, diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index cea610b..497ade7 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -26,7 +26,7 @@ export default { sidebarLogo: '侧边栏 Logo' }, // ***************收货单据新增************* - receiveStockinAdd:{ + receiveStockinAdd: { title: '新增收货单据', warehouse: '仓库', supplier: '供应商', @@ -69,64 +69,64 @@ export default { totalAmount: '总金额', submit: '提交', selectProduct: '选择物料', - productId:'物料编码', - spare1:'英文描述', - spare2:'单件净重KG', - totalNetWeight:'总净重', - spare3:'箱号', - spare4:'包装方式', - spare5:'长MM', - spare6:'宽MM', - spare7:'高MM', - spare8:'体积m³', - netWeight:'净重KG', - grossWeight:'毛重KG' + productId: '物料编码', + spare1: '英文描述', + spare2: '单件净重KG', + totalNetWeight: '总净重', + spare3: '箱号', + spare4: '包装方式', + spare5: '长MM', + spare6: '宽MM', + spare7: '高MM', + spare8: '体积m³', + netWeight: '净重KG', + grossWeight: '毛重KG' }, // ***************收货单据管理************* - inReceiveStockin:{ - stockinId:'入库订单ID', - inputstockinId:'请输入入库订单ID', - supplierNo:'供应商编码', - selecInType:"请选择入库类型", - inputSupplierNo:'请输入供应商编码', - stockSource:'单据来源', - inputStockSource:'请输入单据来源', - warehouseId:'仓库', - selectWarehouseId:'请选择仓库', - status:'单据状态', - selectStatus:'请选择单据状态', - search:'搜索', - reset:'重置', - generateStockin:'生成入库单据', - delet:'删除', - inType:'入库类型', - createDate:'建立时间', - createManName:'创建人', - warehouseName:'仓库', - departmentName:'部门', - supplierName:'供应商', - testing:'质检', - stockinDetailId:'子单ID', - lotNo:'批次号', - productId:'物料编码', - materialDesc:'物料描述', - englishDesc:'英文描述', - cartonNo:'箱号', - packingMethod:'包装方式', - quantity:'计划数量', - stockStatus:'单据状态', - operate:'操作' + inReceiveStockin: { + stockinId: '入库订单ID', + inputstockinId: '请输入入库订单ID', + supplierNo: '供应商编码', + selecInType: "请选择入库类型", + inputSupplierNo: '请输入供应商编码', + stockSource: '单据来源', + inputStockSource: '请输入单据来源', + warehouseId: '仓库', + selectWarehouseId: '请选择仓库', + status: '单据状态', + selectStatus: '请选择单据状态', + search: '搜索', + reset: '重置', + generateStockin: '生成入库单据', + delet: '删除', + inType: '入库类型', + createDate: '建立时间', + createManName: '创建人', + warehouseName: '仓库', + departmentName: '部门', + supplierName: '供应商', + testing: '质检', + stockinDetailId: '子单ID', + lotNo: '批次号', + productId: '物料编码', + materialDesc: '物料描述', + englishDesc: '英文描述', + cartonNo: '箱号', + packingMethod: '包装方式', + quantity: '计划数量', + stockStatus: '单据状态', + operate: '操作' }, // ***************入库单据管理************* - inStockin:{ - selecInType:"请选择入库类型", - cancel:'单据作废', - examine:'单据审核', - confirm:'单据确认', - printBarcode:'打印条码', - finishDate:'完成日期', - scanNum:'扫码数量', - assignNum:'实际数量' + inStockin: { + selecInType: "请选择入库类型", + cancel: '单据作废', + examine: '单据审核', + confirm: '单据确认', + printBarcode: '打印条码', + finishDate: '完成日期', + scanNum: '扫码数量', + assignNum: '实际数量' }, // ***************入库作业管理************* inJob: { @@ -170,7 +170,7 @@ export default { selectStatus: '请选择任务状态', inputTaskNo: '请输入任务号', inputTrayCode: '请输入托盘码', - targetCargoSpaceId:'目标货位ID', + targetCargoSpaceId: '目标货位ID', inputTargetCargoSpaceId: '请输入目标货位ID', selectExecutionPhase: '请选择执行阶段', selectInOrOut: '请选择任务类型', @@ -179,7 +179,8 @@ export default { inputEntranceId: '请输入入口ID', inputExitId: '请输入出口ID' }, - addOutStockout:{ + // ***************新建出库单据************** + addOutStockout: { warehouse: '仓库', selectWarehouse: '请选择仓库', customer: '客户', @@ -204,16 +205,20 @@ export default { confirm: '确 定', cancel: '取 消' }, - outStockoutManage:{ + // ***************出库单据管理************** + outStockoutManage: { stockoutId: '出库单编号', outType: '出库类型', status: '单据状态', customerNo: '客户编码', + customerName: '客户名称', + productName:'物资名称', createManId: '建单人', createDate: '创建时间', startDate: '开始时间', finishDate: '确认时间', warehouseId: '仓库编号', + warehouseName:'仓库名称', stockoutDetailId: '出库子单编号', productId: '物资编码', lotNo: '批次', @@ -236,9 +241,13 @@ export default { inputStockoutId: '请输入出库单编号', selectOutType: '请选择出库类型', selectStatus: '请选择单据状态', - inputCustomerNo: '请输入客户编码' + inputCustomerNo: '请输入客户编码', + inputCustomerName:'请输入客户名称', + inputProductName:'请输入物资名称', + selectStartDate: '请选择创建开始时间', + selectFinishDate: '请选择创建结束时间', }, - productAndStock:{ + productAndStock: { serialNumber: '序号', productId: '物资编码', lotNo: '批号', @@ -255,6 +264,7 @@ export default { inputProductName: '请输入物资名称', inputWarehouse: '请输入仓库' }, + // ***************出库作业管理************** outJobManagement: { // 状态和作业类型 status: '状态', @@ -303,49 +313,476 @@ export default { manualComplete: '手动完成', manualInvalidate: '手动作废' }, - menu:{ - InboundManagement:"入库管理", + // *****************新建盘点单据*************** + checkCreate: { + warehouse: '仓库', + selectWarehouse: '请选择仓库', + customer: '客户', + inputCustomerNo: '请输入客户编号', + documentType: '单据类型', + selectDocumentType: '请选择单据类型', + reset: '重置', + saveDocument: '保存单据', + selectMaterial: '选择物资', + recreateDocument: '重新建单', + materialCode: '物资编号', + materialName: '物资名称', + batchNo: '批号', + inputBatchNo: '请输入批号', + quantity: '数量', + operation: '操作', + delete: '删除', + inputMaterialCode: '请输入物资编码', + inputMaterialName: '请输入物资名称', + search: '搜索', + confirm: '确定', + cancel: '取消', + warehouseRequired: '请选择仓库', + customerRequired: '请输入客户编号', + documentTypeRequired: '请选择单据类型', + selectMaterialRequired: '请选择物资', + materialExistWarning: '所选物资已存在，请重新选择', + quantityExceedError: '数量不能大于库存数量', + saveSuccess: '单据{msg}保存成功' + }, + //***************盘点单据管理*************** + checkStockCheck: { + stockCheckId: '盘点单据ID', + inputStockCheckId: '请输入盘点单据ID', + checkType: '盘库类型', + selectCheckType: '请选择盘库类型', + status: '状态', + selectStatus: '请选择状态', + warehouse: '仓库', + selectWarehouse: '请选择仓库', + search: '搜索', + reset: '重置', + invalidate: '单据作废', + review: '单据审核', + confirm: '单据确认', + warehouseId: '仓库ID', + stockSource: '单据来源', + departmentNo: '部门编码', + createManId: '创建人', + createDate: '建立时间', + finishDate: '完成日期', + detailId: '子单ID', + mainId: '主单ID', + lotNo: '批次号', + productId: '物料编码', + materialDesc: '物料描述', + englishDesc: '英文描述', + cartonNo: '箱号', + packingMethod: '包装方式', + quantity: '计划数量', + scanNum: '扫码数量', + assignNum: '实际数量', + stockCheckIdRequired: '盘点单据ID不能为空', + checkTypeRequired: '盘库类型不能为空', + createDateRequired: '建立时间不能为空', + statusRequired: '单据状态不能为空', + editSuccess: '修改成功', + addSuccess: '新增成功', + invalidateSuccess: '作废成功', + onlyUnreviewedCanInvalidate: '只有未审核的单据可以作废', + alreadyReviewed: '单据已审核，请勿重复审核', + reviewSuccess: '审核成功', + onlyUnreviewedCanReview: '只有未审核的单据可以审核', + confirmSuccess: '确认成功', + onlyReviewedCanConfirm: '只有已审核的单据可以确认' + }, + // ***************盘点入库作业************* + checkJobIn: { + jobId: '任务ID', + status: '任务状态', + onLineType: '上线类型', + jobType: '任务类型', + taskNo: '任务号', + supplier: '供应商', + department: '部门', + trayCode: '托盘码', + roadwayId: '巷道ID', + cargoSpace: '货位', + targetRoadway: '目标巷道', + targetCargoSpace: '目标货位', + lineId: '产线ID', + workshopId: '车间ID', + priority: '优先级', + executionPhase: '执行阶段', + startTime: '开始时间', + finishTime: '结束时间', + entrance: '入口', + entranceId: '入口ID', + exit: '出口', + exitId: '出口ID', + classId: '班组ID', + warehouseId: '仓库ID', + warehouse: '仓库', + faultFlag: '重分标记', + jobDetailId: '子任务ID', + stockId: '库存ID', + lotNo: '批次号', + inDate: '入库时间', + inOrOutId: '单据ID', + inOrOutDId: '子单据ID', + productGuid: '物料GUID', + productId: '物料编码', + stockStatus: '库存状态', + inQuantity: '入库数量', + printDate: '生产日期', + supplierId: '供应商ID', + // 按钮和操作文本 + search: '搜索', + reset: '重置', + manualVoid: '手动作废', + manualFinish: '手动完成', + // 输入框提示文本 + inputJobId: '请输入任务ID', + selectStatus: '请选择任务状态', + inputTaskNo: '请输入任务号', + inputTrayCode: '请输入托盘码', + inputTargetCargoSpace: '请输入目标货位', + selectExecutionPhase: '请选择执行阶段', + selectJobType: '请选择任务类型', + selectStartTime: '请选择开始时间', + selectFinishTime: '请选择结束时间', + inputEntranceId: '请输入入口ID', + inputExitId: '请输入出口ID', + inputWarehouseId: '请输入仓库ID', + // 校验提示信息 + jobIdRequired: '任务ID不能为空', + statusRequired: '任务状态不能为空', + taskNoRequired: '任务号不能为空', + selectData: '请选择要操作的数据' + }, + // **************盘点出库作业**************** + checkJobOut: { + jobId: '任务ID', + status: '任务状态', + onLineType: '上线类型', + jobType: '任务类型', + taskNo: '任务号', + supplierId: '供应商ID', + departmentId: '部门ID', + trayCode: '托盘码', + roadwayId: '巷道ID', + cargoSpaceId: '货位ID', + targetRoadwayId: '目标巷道ID', + targetCargoSpace: '目标货位', + lineId: '产线ID', + workshopId: '车间ID', + priority: '优先级', + executionPhase: '执行阶段', + startTime: '开始时间', + finishTime: '结束时间', + entranceId: '入口ID', + exitId: '出口ID', + classId: '班组ID', + warehouse: '仓库', + faultFlag: '重分标记', + operation: '操作', + subJobId: '子任务ID', + stockId: '库存ID', + batchNo: '批次号', + inTime: '入库时间', + billId: '单据ID', + subBillId: '子单据ID', + materialGuid: '物料GUID', + materialCode: '物料编码', + stockStatus: '库存状态', + inQty: '入库数量', + productDate: '生产日期', + search: '搜索', + reset: '重置', + manualFinish: '手动完成', + manualInvalid: '手动作废', + inputJobId: '请输入任务ID', + selectStatus: '请选择任务状态', + inputTaskNo: '请输入任务号', + inputTrayCode: '请输入托盘码', + inputTargetCargoSpace: '请输入目标货位ID', + selectExecutionPhase: '请选择执行阶段', + selectJobType: '请选择任务类型', + selectStartTime: '请选择开始时间', + selectFinishTime: '请选择结束时间', + inputEntranceId: '请输入入口ID', + inputExitId: '请输入出口ID', + inputWarehouseId: '请输入仓库ID', + selectData: '请选择要操作的数据', + confirmFinish: '是否确认手动完成编号为"{jobIds}"的数据项?', + finishSuccess: '手动完成成功', + confirmInvalid: '是否确认手动作废编号为"{jobIds}"的数据项?', + invalidSuccess: '手动作废成功' + }, + // ****************盘点差异管理***************** + checkDifference: { + checkGuid: '盘点id', + checkStockDetailId: '盘点单据id', + stockId: '库存id', + trayCode: '托盘', + cargoSpaceId: '货位id', + productId: '物料id', + lotNo: '批次号', + supplier: '供应商', + customer: '客户', + oldQuantity: '原值', + newQuantity: '新值', + recordType: '操作方式', + productGuid: '物料guid', + operation: '操作', + edit: '修改', + delete: '删除', + search: '搜索', + reset: '重置', + confirm: '确定', + cancel: '取消', + inputCheckStockDetailId: '请输入盘点单据id', + inputStockId: '请输入库存id', + inputTrayCode: '请输入托盘', + inputCargoSpaceId: '请输入货位id', + inputProductId: '请输入物料id', + inputLotNo: '请输入批次号', + inputSupplier: '请输入供应商', + inputCustomer: '请输入客户', + inputOldQuantity: '请输入原值', + inputNewQuantity: '请输入新值', + inputProductGuid: '请输入物料guid' + }, + // ********************库存信息************* + stockManagement: { + stockId: '库存id', + cargoSpaceId: '货位id', + stockStatus: '库存状态', + productStatus: '物料状态', + lotNo: '批次号', + inDate: '入库时间', + backDate: '回流时间', + productGuid: '物料GUID', + quantity: '库存数量', + jobId: '作业ID', + trayCode: '托盘条码', + outQuantity: '出库数量', + stockinDetailId: '入库子单id', + stockinId: '入库主单', + inType: '入库类型', + inClassId: '入库班组ID', + warehouseId: '仓库', + stackingId: '垛型ID', + operation: '操作', + add: '新增', + edit: '修改', + delete: '删除', + export: '导出', + confirm: '确定', + cancel: '取消', + search: '搜索', + reset: '重置', + inputStockId: '请输入库存id', + inputCargoSpaceId: '请输入货位id', + selectStockStatus: '请选择库存状态', + selectProductStatus: '请选择物料状态', + inputLotNo: '请输入批次号', + inputInDate: '请输入入库时间', + inputBackDate: '请输入回流时间', + inputProductGuid: '请输入物料GUID', + inputQuantity: '请输入库存数量', + inputJobId: '请输入作业ID', + inputTrayCode: '请输入托盘条码', + inputOutQuantity: '请输入出库数量', + inputStockinDetailId: '请输入入库子单id', + inputStockinId: '请输入入库主单', + inputInClassId: '请输入入库班组ID', + inputWarehouseId: '请输入仓库', + inputStackingId: '请输入垛型ID', + stockIdRequired: '库存id不能为空', + addTitle: '添加库存信息', + editTitle: '修改库存信息', + addSuccess: '新增成功', + editSuccess: '修改成功', + deleteSuccess: '删除成功', + confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？' + }, + // *************库存操作记录*************** + stockRecord: { + stockId: '库存编码', + cargoSpaceId: '货位编码', + trayCode: '托盘条码', + productId: '物品编码', + productName: '物品名称', + printDate: '生产日期', + lotNo: '批号', + oldQuantity: '初始数量', + quantity: '操作后数量', + method: '操作', + warehouseId: '仓库', + stockDetailId: '库存字表id', + operatingTarget: '操作目标', + barCodeOldQuantity: '条码数量', + barCodeQuantity: '条码数量', + productGuid: '物料guid', + inputStockId: '请输入库存编码', + inputCargoSpaceId: '请输入货位编码', + inputTrayCode: '请输入托盘条码', + inputProductId: '请输入物品编码', + inputProductName: '请输入物品名称', + inputPrintDate: '请输入生产日期', + inputLotNo: '请输入批号', + inputOldQuantity: '请输入初始数量', + inputQuantity: '请输入操作后数量', + selectMethod: '请选择操作', + inputWarehouseId: '请输入仓库', + inputStockDetailId: '请输入库存字表id', + inputOperatingTarget: '请输入操作目标', + inputBarCodeOldQuantity: '请输入条码数量', + inputBarCodeQuantity: '请输入条码数量', + inputProductGuid: '请输入物料guid', + stockIdRequired: '库存编码不能为空', + cargoSpaceIdRequired: '货位编码不能为空', + trayCodeRequired: '托盘条码不能为空', + productIdRequired: '物品编码不能为空', + productNameRequired: '物品名称不能为空', + printDateRequired: '生产日期不能为空', + lotNoRequired: '批号不能为空', + oldQuantityRequired: '初始数量不能为空', + quantityRequired: '操作后数量不能为空', + methodRequired: '操作不能为空', + warehouseIdRequired: '仓库不能为空', + stockDetailIdRequired: '库存字表id不能为空', + operatingTargetRequired: '操作目标不能为空', + barCodeOldQuantityRequired: '条码数量不能为空', + barCodeQuantityRequired: '条码数量不能为空', + productGuidRequired: '物料guid不能为空', + search: '搜索', + reset: '重置', + export: '导出', + confirm: '确定', + cancel: '取消', + addTitle: '添加库存操作记录', + editTitle: '修改库存操作记录', + addSuccess: '新增成功', + editSuccess: '修改成功', + deleteSuccess: '删除成功', + confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？', + fileName: '记录{time}' + }, + // **************库存冻结记录************** + stockFreeze: { + stockId: '库存编码', + inputStockId: '请输入库存编码', + stockIdRequired: '库存编码不能为空', + cargoSpaceId: '货位编码', + inputCargoSpaceId: '请输入货位编码', + cargoSpaceIdRequired: '货位编码不能为空', + trayCode: '托盘条码', + inputTrayCode: '请输入托盘条码', + trayCodeRequired: '托盘条码不能为空', + productId: '物品编码', + inputProductId: '请输入物品编码', + productIdRequired: '物品编码不能为空', + productName: '物品名称', + inputProductName: '请输入物品名称', + productNameRequired: '物品名称不能为空', + printDate: '生产日期', + inputPrintDate: '请输入生产日期', + printDateRequired: '生产日期不能为空', + lotNo: '批号', + inputLotNo: '请输入批号', + lotNoRequired: '批号不能为空', + method: '操作', + inputMethod: '请输入操作', + methodRequired: '操作不能为空', + warehouseId: '仓库', + inputWarehouseId: '请输入仓库', + warehouseIdRequired: '仓库不能为空', + stockDetailId: '库存字表id', + inputStockDetailId: '请输入库存字表id', + stockDetailIdRequired: '库存字表id不能为空', + operatingTarget: '操作目标', + inputOperatingTarget: '请输入操作目标', + operatingTargetRequired: '操作目标不能为空', + barCodeOldQuantity: '条码数量', + inputBarCodeOldQuantity: '请输入条码数量', + barCodeOldQuantityRequired: '条码数量不能为空', + barCodeQuantity: '条码数量', + inputBarCodeQuantity: '请输入条码数量', + barCodeQuantityRequired: '条码数量不能为空', + productGuid: '物料guid', + inputProductGuid: '请输入物料guid', + productGuidRequired: '物料guid不能为空', + operation: '操作', + search: '搜索', + reset: '重置', + add: '新增', + edit: '修改', + delete: '删除', + export: '导出', + confirm: '确定', + cancel: '取消', + addTitle: '添加库存冻结记录', + editTitle: '修改库存冻结记录', + addSuccess: '新增成功', + editSuccess: '修改成功', + deleteSuccess: '删除成功', + deleteConfirm: '是否确认删除所选库存冻结记录？' + }, + menu: { + InboundManagement: "入库管理", //收货单据新增 ReceivingDocumentsAdd: '收货单据新增', - ReceiptDocumentManagement:"收货单据管理", - ManagementOfInboundDocuments:"入库单据管理", - InboundTaskManagement:"入库作业管理", - + ReceiptDocumentManagement: "收货单据管理", + ManagementOfInboundDocuments: "入库单据管理", + InboundTaskManagement: "入库作业管理", //********************仓库管理******************** WarehouseManagement: '仓库管理', - //仓库（库区）管理 - WarehouseAreaManagement: '库区管理', - //货位管理 - CargoSpaceManagement: '货位管理', - + //仓库（库区）管理 + WarehouseAreaManagement: '库区管理', + //货位管理 + CargoSpaceManagement: '货位管理', //********************出库管理******************** - outboundManagement:'出库管理', - createNewOutboundDocument:'新建出库单据', - outboundDocumentManagement:'出库单据管理', - outboundTaskManagement:'出库作业管理', + outboundManagement: '出库管理', + createNewOutboundDocument: '新建出库单据', + outboundDocumentManagement: '出库单据管理', + outboundTaskManagement: '出库作业管理', //********************系统管理******************** SystemManagement: '系统管理', - //用户管理 - UserManagement: '用户管理', - //角色管理 - RoleManagement: '角色管理', - //菜单管理 - MenuManagement: '菜单管理', - //部门管理 - DepartmentManagement: '部门管理', - //岗位管理 - PostManagement: '岗位管理', - //字典管理 - DictionaryManagement: '字典管理', - //参数管理 - ParameterManagement: '参数管理', - //通知公告 - NoticeManagement: '通知公告', - //日志管理 - LogManagement: '日志管理', + //用户管理 + UserManagement: '用户管理', + //角色管理 + RoleManagement: '角色管理', + //菜单管理 + MenuManagement: '菜单管理', + //部门管理 + DepartmentManagement: '部门管理', + //岗位管理 + PostManagement: '岗位管理', + //字典管理 + DictionaryManagement: '字典管理', + //参数管理 + ParameterManagement: '参数管理', + //通知公告 + NoticeManagement: '通知公告', + //日志管理 + LogManagement: '日志管理', + // ****************盘点管理****************** + inventoryManagement: '盘点管理', + createNewInventoryDocument: '新建盘点单据', + inventoryDocumentManagement: '盘点单据管理', + inventoryStorageTask: '盘点入库作业', + inventoryOutboundTask: '盘点出库作业', + inventoryDiscrepancyManagement: '盘点差异管理', + // ****************库存管理****************** + stockManagement: '库存管理', + stockInformation: '库存信息', + stockOperationRecords: '库存操作记录', + stockFreezeRecord: '库存冻结记录', + // ***************基础信息**************** + basicInformation:'基础信息', + customerManagement:'客户管理', + supplierManagement:'供应商管理', + materialManagement:'物料管理', }, @@ -451,10 +888,10 @@ export default { placeholderStatus: '请输入货位状态', placeholderCargoHeight: '请输入货位高度', placeholderIsDouble: '请输入是否双伸（Y/N）', - // placeholderGroupCodingNo: '双货位分组编码', - // placeholderGroupCodingName: '双货位分组编码（1、2...）', - // placeholderCargoSpaceLogo: '双货位标识（0外1内）', - // placeholderThisCargoAreaId: '仓库区域编码', + // placeholdergroupCodingNo: '双货位分组编码', + // placeholdergroupCodingName: '双货位分组编码（1、2...）', + // placeholdercargoSpaceLogo: '双货位标识（0外1内）', + // placeholderthisCargoAreaId: '仓库区域编码', //--------------交互按钮-------------- btnSearch: '搜索', @@ -490,119 +927,6 @@ export default { lockedIsNull: '是否可用不能为空', }, - - //=====================系统管理:用户管理===================== - systemManagement_UserManagement: { - //--------------数据表标题-------------- - userId: '用户编号', - userName: '用户名称', - password: '密码', - nickName: '用户昵称', - deptName: '部门', - phoneNumber: '手机号', - status: '状态', - creatTime: '创建时间', - operation: '操作', - email: '邮箱', - post: '岗位', - role: '角色', - gender: '性别', - remark: '备注', - - //--------------交互框操作提示-------------- - placeholderDeptName: '请输入部门名称', - placeholderUserId: '请输入用户编号', - placeholderUserName: '请输入用户名称', - placeholderPassword: '请输入密码', - placeholderNickName: '请输入用户昵称', - placeholderPhoneNumber: '请输入手机号', - placeholderStatus: '请选择状态', - placeholderCreatTime: '请选择创建时间', - placeholderDateStart: '开始日期', - placeholderDateEnd: '结束日期', - placeholderEmail: '请输入邮箱', - placeholderPost: '请选择岗位', - placeholderRole: '请选择角色', - placeholderGender: '请选择性别', - placeholderRemark: '请输入备注信息', - - //--------------交互按钮-------------- - btnSearch: '搜索', - btnReset: '重置', - btnAdd: '新增', - btnEdit: '修改', - btnDelete: '删除', - btnImport: '导入', - btnExport: '导出', - btnSubmit: '确定', - btnCancel: '取消', - btnMore: '更多', - btnResetPassword: '重置密码', - btnAssignRole: '分配角色', - - //--------------二级窗口标题-------------- - addUserItem: '添加用户', - editUserItem: '修改用户', - - //--------------提示文本-------------- - //---布局--- - textDragOrClick1: '将文件拖到此处，或', - textDragOrClick2: '点击上传', - textUpdateExistingData: '是否更新已经存在的用户数据？', - textUploadTip: '仅允许导入xls、xlsx格式文件。', - textDownloadTemplate: '下载模板', - - //---函数：handleStatusChange--- - textEnable: '启用', - textDisable: '禁用', - textUserConfirm1:"确认要\"", - textUserConfirm2:"\"用户吗？", - textSuccess: '成功', - - //---函数：handleResetPwd--- - textInputPassword1: '请输入', - textInputPassword2: '的新密码', - textTips: '提示', - textConfirm: '确认', - textCancel: '取消', - textResetPassword: '修改成功，新密码是：', - - //---函数：handleDelete--- - textDeleteConfirm1: '是否确认删除用户编号为"', - textDeleteConfirm2: '"的数据项？', - - //---函数：handleImport--- - textImportTitle: '导入成功', - - //---函数：textUploadTitle--- - textImportResult: '导入结果', - - - //--------------操作提示-------------- - addSuccessInfo: '新增成功', - editSuccessInfo: '编辑成功', - deleteSuccessInfo: '删除成功', - resetPasswordSuccessInfo: '重置密码成功', - assignRoleSuccessInfo: '分配角色成功', - - //--------------校验提示-------------- - checkUserNameIsNull: '用户名称不能为空', - checkUserNameLength: '用户名称长度必须介于2-20个字符', - checkNickNameIsNull: '用户昵称不能为空', - checkPasswordIsNull: '密码不能为空', - checkPasswordLength: '密码长度必须介于5-20个字符', - checkPasswordCharacter: "不能包含非法字符：< > \" ' \\\ |", - checkEmailFormat: '请输入正确的邮箱地址', - checkPhoneNumberFormat: '请输入正确的手机号', - - //--------------其他-------------- - lblWidthUserName: '68px', - lblWidthPhoneNumber: '68px', - lblWidthDialog: '80px', - - }, - - //=====================系统管理:角色管理===================== systemManagement_RoleManagement: { //--------------数据表标题-------------- @@ -928,14 +1252,14 @@ export default { checkPostNameIsNull: '岗位名称不能为空', checkPostCodeIsNull: '岗位编码不能为空', checkPostSortIsNull: '岗位顺序不能为空', - + }, // ***************出库作业流水查询************* searchViewOutJobFlow: { title: '出库作业流水查询', - jobId: '作业ID', + jobId: '作业ID1111', inputJobId: '请输入作业ID', jobDetailId: '子作业ID', inputJobDetailId: '请输入子作业ID', @@ -1016,7 +1340,7 @@ export default { // ***************入库作业流水查询************* searchViewInJobFlow: { status: '状态', - selectStatus: '请选择状态', + selectStatus: '请选择状态1111111111', taskNo: '任务号', inputTaskNo: '请输入任务号', thePlatoon: '排', @@ -1093,7 +1417,7 @@ export default { }, // ***************库存明细查询************* searchViewStockDetail: { - stockId: '库存ID', + stockId: '库存ID111111111', inputStockId: '请输入库存ID', cargoSpaceId: '货位ID', inputCargoSpaceId: '请输入货位ID', @@ -1151,7 +1475,7 @@ export default { }, // ***************平库出库流水************* searchViewFlatWarehouseOutFlow: { - warehouse: '仓库', + warehouse: '仓库111111111111', selectWarehouse: '请选择仓库', productId: '物料ID', inputProductId: '请输入物料ID', @@ -1196,7 +1520,7 @@ export default { }, // ***************平库入库流水************* searchViewFlatWarehouseInFlow: { - warehouse: '仓库', + warehouse: '仓库1111111111', selectWarehouse: '请选择仓库', productId: '物料ID', inputProductId: '请输入物料ID', @@ -1229,7 +1553,7 @@ export default { }, // ***************出库单据历史查询************* searchViewStockoutHistory: { - stockoutId: '出库单号', + stockoutId: '出库单号111111111111', inputStockoutId: '请输入出库单号', outType: '出库类型', selectOutType: '请选择出库类型', @@ -1277,7 +1601,7 @@ export default { }, // ***************入库单据历史查询************* searchViewStockinHistory: { - stockinGuid: '入库单guid', + stockinGuid: '入库单guid1111111111', inputStockinGuid: '请输入入库单guid', stockinId: '入库单号', inputStockinId: '请输入入库单号', @@ -1359,7 +1683,7 @@ export default { // ***************收货单据管理************* searchStockSummary: { export: '导出', - productId: '物料编码', + productId: '物料编码1111111111', inputProductId: '请输入物料编码', productName: '物料名称', inputProductName: '请输入物料名称', @@ -1378,7 +1702,7 @@ export default { }, // ***************预警库存查询************* searchViewStockWarning: { - stockId: '库存ID', + stockId: '库存ID111111111111', inputStockId: '请输入库存ID', cargoSpaceId: '货位ID', inputCargoSpaceId: '请输入货位ID', diff --git a/ruoyi-ui/src/views/out/outStockoutManage.vue b/ruoyi-ui/src/views/out/outStockoutManage.vue index 3a70bc6..2dcb304 100644 --- a/ruoyi-ui/src/views/out/outStockoutManage.vue +++ b/ruoyi-ui/src/views/out/outStockoutManage.vue @@ -38,36 +38,36 @@ - + - + - + + :placeholder="$t('outStockoutManage.selectStartDate')"> - + + :placeholder="$t('outStockoutManage.selectFinishDate')"> @@ -142,14 +142,14 @@ - - - - - - + + + + + + - + - + diff --git a/ruoyi-ui/src/views/stock/freeze/index.vue b/ruoyi-ui/src/views/stock/freeze/index.vue index 3bd7c75..3fec1c2 100644 --- a/ruoyi-ui/src/views/stock/freeze/index.vue +++ b/ruoyi-ui/src/views/stock/freeze/index.vue @@ -1,121 +1,121 @@