diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index b57353b..5915e5c 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -21,6 +21,7 @@ export default { fixedHeader: 'Fixed Header', sidebarLogo: 'Sidebar Logo' }, + // ***************收货单据新增************* receiveStockinAdd:{ title: 'Add Receive Stockin', warehouse: 'Warehouse', @@ -63,7 +64,241 @@ export default { totalQuantity: 'Total Quantity', totalAmount: 'Total Amount', submit: 'Submit', - selectProduct: 'Select Product' + selectProduct: 'Select Product', + productId: 'Material Code', + spare1: 'English Description', + spare2: 'Net Weight per Unit (KG)', + totalNetWeight: 'Total Net Weight', + spare3: 'Carton No.', + spare4: 'Packing Method', + spare5: 'Length (MM)', + spare6: 'Width (MM)', + spare7: 'Height (MM)', + spare8: 'Volume (m³)', + netWeight: 'Net Weight (KG)', + grossWeight: 'Gross Weight (KG)' + }, + // ***************收货单据管理************* + inReceiveStockin:{ + stockinId: 'Stockin Order ID', + inputstockinId: 'Please input stockin order ID', + supplierNo: 'Supplier Code', + inputSupplierNo: 'Please input supplier code', + stockSource: 'Document Source', + inputStockSource: 'Please input document source', + warehouseId: 'Warehouse', + selectWarehouseId: 'Please select warehouse', + status: 'Document Status', + selectStatus: 'Please select document status', + search: 'Search', + reset: 'Reset', + generateStockin: 'Generate Stockin Document', + delet: 'Delete', + inType: 'Stockin Type', + createDate: 'Create Time', + createManName: 'Creator', + warehouseName: 'Warehouse', + departmentName: 'Department', + supplierName: 'Supplier', + testing: 'Quality Inspection', + stockinDetailId: 'Sub-document ID', + lotNo: 'Batch No.', + productId: 'Material Code', + materialDesc: 'Material Description', + englishDesc: 'English Description', + cartonNo: 'Carton No.', + packingMethod: 'Packing Method', + quantity: 'Planned Quantity', + stockStatus: 'Document Status', + operate: 'Operation', + selecInType: 'Please select stockin type', + }, + // ***************入库单据管理************* + inStockin:{ + selecInType: 'Please select stockin type', + cancel: 'Cancel Document', + examine: 'Document Review', + confirm: 'Document Confirm', + printBarcode: 'Print Barcode', + finishDate: 'Completion Date', + scanNum: 'Scanned Quantity', + assignNum: 'Actual Quantity' + }, + // ***************入库作业管理************* + inJob: { + jobId: 'Task ID', + status: 'Task Status', + onLineType: 'Online Type', + inOrOut: 'Task Type', + taskNo: 'Task No.', + supplierName: 'Supplier', + departmentName: 'Department', + trayCode: 'Tray Code', + roadwayId: 'Roadway ID', + cargoSpaceName: 'Cargo Space', + targetRoadwayId: 'Target Roadway', + targetCargoSpaceName: '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', + warehouseId: 'Warehouse ID', + 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', + // Placeholder translations + inputJobId: 'Please input Task ID', + selectStatus: 'Please select Task Status', + inputTaskNo: 'Please input Task No.', + inputTrayCode: 'Please input Tray Code', + targetCargoSpaceId:'TargetCargoSpaceID', + inputTargetCargoSpaceId: 'Please input Target Cargo Space ID', + selectExecutionPhase: 'Please select Execution Phase', + selectInOrOut: 'Please select Task Type', + selectStartTime: 'Please select Start Time', + selectFinishTime: 'Please select Finish Time', + inputEntranceId: 'Please input Entrance ID', + inputExitId: 'Please input Exit ID' + }, + + outStockoutManage:{ + stockoutId: 'Outbound Order ID', + outType: 'Outbound Type', + status: 'Document Status', + customerNo: 'Customer Code', + createManId: 'Creator', + createDate: 'Create Time', + startDate: 'Start Time', + finishDate: 'Confirm Time', + warehouseId: 'Warehouse ID', + stockoutDetailId: 'Outbound Detail ID', + productId: 'Material Code', + lotNo: 'Batch No.', + quantity: 'Planned Quantity', + assignNum: 'Actual Quantity', + allotQuantity: 'Allocated Quantity', + unit: 'Unit', + spec: 'Specification', + price: 'Price', + remark: 'Remark', + // Button text + search: 'Search', + reset: 'Reset', + audit: 'Audit', + confirm: 'Confirm', + cancel: 'Cancel', + autoAllot: 'Auto Allocate', + manualAllot: 'Manual Allocate', + // Placeholder text + inputStockoutId: 'Please input outbound order ID', + selectOutType: 'Please select outbound type', + selectStatus: 'Please select document status', + inputCustomerNo: 'Please input customer code' + }, + addOutStockout:{ + 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.', + quantity: 'Quantity', + operation: 'Operation', + delete: 'Delete', + inputMaterialCode: 'Please input material code', + inputMaterialName: 'Please input material name', + inputBatchNo: 'Please input batch number', + inputWarehouse: 'Please input warehouse', + search: 'Search', + confirm: 'Confirm', + cancel: 'Cancel' + }, + productAndStock:{ + serialNumber: 'Serial Number1111111111', + productId: 'Material Code', + lotNo: 'Batch Number', + productName: 'Material Name', + warehouse: 'Warehouse', + quantity: 'Quantity', + search: 'Search', + reset: 'Reset', + export: 'Export', + // placeholder text + inputSerialNumber: 'Please input serial number', + inputProductId: 'Please input material code', + inputLotNo: 'Please input batch number', + inputProductName: 'Please input material name', + inputWarehouse: 'Please input warehouse' + }, + outJobManagement: { + // Status and Job Type + status: 'Status', + selectStatus: 'Please select status', + jobType: 'Job Type', + selectJobType: 'Please select job type', + onLineType: 'Online Type', + executionPhase: 'Execution Phase', + + // Task Information + jobId: 'Task ID', + taskNo: 'Task No.', + inputTaskNo: 'Please input task number', + subTaskId: 'Sub-task ID', + subDocumentId: 'Sub-document ID', + priority: 'Priority', + + // Time Related + startTime: 'Start Time', + selectStartTime: 'Please select start time', + finishTime: 'End Time', + selectFinishTime: 'Please select end time', + + // Location Information + warehouse: 'Warehouse', + selectWarehouse: 'Please select warehouse', + warehouseId: 'Warehouse ID', + roadwayId: 'Roadway ID', + cargoSpaceId: 'Cargo Space ID', + exitId: 'Exit ID', + + // Material Information + materialCode: 'Material Code', + stockId: 'Stock ID', + lotNo: 'Lot No.', + outQuantity: 'Out Quantity', + + // Customer Information + customerId: 'Customer ID', + trayCode: 'Tray Code', + inputTrayCode: 'Please input tray code', + + // Button Text + search: 'Search', + reset: 'Reset', + manualComplete: 'Manual Complete', + manualInvalidate: 'Manual Invalidate' }, menu: { //收货单据新增 @@ -77,10 +312,15 @@ export default { //********************仓库管理******************** WarehouseManagement: 'WarehouseManagement', - //仓库（库区）管理 - WarehouseAreaManagement: 'WarehouseManagement', - //货位管理 - CargoSpaceManagement: 'CargoSpaceManagement', + //仓库（库区）管理 + WarehouseAreaManagement: 'WarehouseManagement', + //货位管理 + CargoSpaceManagement: 'CargoSpaceManagement', + //********************出库管理******************** + outboundManagement:'outboundManagement', + createNewOutboundDocument:'createNewOutboundDocument', + outboundDocumentManagement:'outboundDocumentManagement', + outboundTaskManagement:'outboundTaskManagement', //********************系统管理******************** @@ -106,7 +346,6 @@ export default { }, - //=====================仓库（库区）管理===================== warehouse: { //--------------数据表表标题-------------- @@ -254,7 +493,7 @@ export default { //=====================系统管理===================== - systemManagement_RoleManagement: { + systemManagement_RoleManagement: { //--------------数据表标题-------------- userId: 'UserId', userName: 'UserName', diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 7c43180..af117e4 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -25,6 +25,7 @@ export default { fixedHeader: '固定 Header', sidebarLogo: '侧边栏 Logo' }, + // ***************收货单据新增************* receiveStockinAdd:{ title: '新增收货单据', warehouse: '仓库', @@ -67,7 +68,240 @@ export default { totalQuantity: '总数量', totalAmount: '总金额', submit: '提交', - selectProduct: '选择物料' + selectProduct: '选择物料', + 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:'操作' + }, + // ***************入库单据管理************* + inStockin:{ + selecInType:"请选择入库类型", + cancel:'单据作废', + examine:'单据审核', + confirm:'单据确认', + printBarcode:'打印条码', + finishDate:'完成日期', + scanNum:'扫码数量', + assignNum:'实际数量' + }, + // ***************入库作业管理************* + inJob: { + jobId: '任务ID', + status: '任务状态', + onLineType: '上线类型', + inOrOut: '任务类型', + taskNo: '任务号', + supplierName: '供应商', + departmentName: '部门', + trayCode: '托盘码', + roadwayId: '巷道ID', + cargoSpaceName: '货位', + targetRoadwayId: '目标巷道', + targetCargoSpaceName: '目标货位', + lineId: '产线ID', + workshopId: '车间ID', + priority: '优先级', + executionPhase: '执行阶段', + startTime: '开始时间', + finishTime: '结束时间', + entranceId: '入口ID', + exitId: '出口ID', + classId: '班组ID', + warehouseId: '仓库ID', + faultFlag: '重分标记', + jobDetailId: '子任务ID', + stockId: '库存ID', + lotNo: '批次号', + inDate: '入库时间', + inOrOutId: '单据ID', + inOrOutDId: '子单据ID', + productGuid: '物料GUID', + productId: '物料编码', + stockStatus: '库存状态', + inQuantity: '入库数量', + printDate: '生产日期', + supplierId: '供应商ID', + // Placeholder translations + inputJobId: '请输入任务ID', + selectStatus: '请选择任务状态', + inputTaskNo: '请输入任务号', + inputTrayCode: '请输入托盘码', + targetCargoSpaceId:'目标货位ID', + inputTargetCargoSpaceId: '请输入目标货位ID', + selectExecutionPhase: '请选择执行阶段', + selectInOrOut: '请选择任务类型', + selectStartTime: '请选择开始时间', + selectFinishTime: '请选择结束时间', + inputEntranceId: '请输入入口ID', + inputExitId: '请输入出口ID' + }, + addOutStockout:{ + warehouse: '仓库', + selectWarehouse: '请选择仓库', + customer: '客户', + inputCustomerNo: '请输入客户编号', + documentType: '单据类型', + selectDocumentType: '请选择单据类型', + reset: '重置', + saveDocument: '保存单据', + selectMaterial: '选择物资', + recreateDocument: '重新建单', + materialCode: '物资编号', + materialName: '物资名称', + batchNo: '批号', + quantity: '数量', + operation: '操作', + delete: '删除', + inputMaterialCode: '请输入物资编码', + inputMaterialName: '请输入物资名称', + inputBatchNo: '请输入批号', + inputWarehouse: '请输入仓库', + search: '搜索', + confirm: '确 定', + cancel: '取 消' + }, + outStockoutManage:{ + stockoutId: '出库单编号', + outType: '出库类型', + status: '单据状态', + customerNo: '客户编码', + createManId: '建单人', + createDate: '创建时间', + startDate: '开始时间', + finishDate: '确认时间', + warehouseId: '仓库编号', + stockoutDetailId: '出库子单编号', + productId: '物资编码', + lotNo: '批次', + quantity: '计划数量', + assignNum: '实际数量', + allotQuantity: '分配数量', + unit: '单位', + spec: '规格', + price: '价格', + remark: '备注', + // 按钮文本 + search: '搜索', + reset: '重置', + audit: '单据审核', + confirm: '单据确认', + cancel: '单据作废', + autoAllot: '自动分配', + manualAllot: '手动分配', + // placeholder文本 + inputStockoutId: '请输入出库单编号', + selectOutType: '请选择出库类型', + selectStatus: '请选择单据状态', + inputCustomerNo: '请输入客户编码' + }, + productAndStock:{ + serialNumber: '序号', + productId: '物资编码', + lotNo: '批号', + productName: '物资名称', + warehouse: '仓库', + quantity: '数量', + search: '搜索', + reset: '重置', + export: '导出', + // placeholder文本 + inputSerialNumber: '请输入序号', + inputProductId: '请输入物资编码', + inputLotNo: '请输入批号', + inputProductName: '请输入物资名称', + inputWarehouse: '请输入仓库' + }, + outJobManagement: { + // 状态和作业类型 + status: '状态', + selectStatus: '请选择状态', + jobType: '作业类型', + selectJobType: '请选择作业类型', + onLineType: '上线类型', + executionPhase: '执行阶段', + + // 任务信息 + jobId: '任务ID', + taskNo: '任务号', + inputTaskNo: '请输入任务号', + subTaskId: '子任务ID', + subDocumentId: '子单据ID', + priority: '优先级', + + // 时间相关 + startTime: '开始时间', + selectStartTime: '请选择开始时间', + finishTime: '结束时间', + selectFinishTime: '请选择结束时间', + + // 位置信息 + warehouse: '仓库', + selectWarehouse: '请选择仓库', + warehouseId: '仓库ID', + roadwayId: '巷道ID', + cargoSpaceId: '货位ID', + exitId: '出口ID', + + // 物料信息 + materialCode: '物料编码', + stockId: '库存ID', + lotNo: '批次号', + outQuantity: '出库数量', + + // 客户信息 + customerId: '客户ID', + trayCode: '托盘码', + inputTrayCode: '请输入托盘条码', + + // 按钮文本 + search: '搜索', + reset: '重置', + manualComplete: '手动完成', + manualInvalidate: '手动作废' }, menu:{ InboundManagement:"入库管理", @@ -77,14 +311,19 @@ export default { ManagementOfInboundDocuments:"入库单据管理", InboundTaskManagement:"入库作业管理", - + //********************仓库管理******************** WarehouseManagement: '仓库管理', - //仓库（库区）管理 - WarehouseAreaManagement: '库区管理', - //货位管理 - CargoSpaceManagement: '货位管理', + //仓库（库区）管理 + WarehouseAreaManagement: '库区管理', + //货位管理 + CargoSpaceManagement: '货位管理', + //********************出库管理******************** + outboundManagement:'出库管理', + createNewOutboundDocument:'新建出库单据', + outboundDocumentManagement:'出库单据管理', + outboundTaskManagement:'出库作业管理', //********************系统管理******************** SystemManagement: '系统管理', @@ -167,11 +406,11 @@ export default { warehouseNameIsNull: '仓库名称不能为空', isCurrentIsNull: '是否可用不能为空', - + }, //=====================货位管理===================== - cargoSpace: { + cargoSpace: { //--------------数据表标题-------------- title: '货位管理', cargoSpaceId: '货位编码', @@ -252,12 +491,12 @@ export default { - - - - + + + + //=====================系统管理:用户管理===================== - systemManagement_RoleManagement: { + systemManagement_RoleManagement: { //--------------数据表标题-------------- userId: '用户编号', userName: '用户名称', @@ -342,7 +581,7 @@ export default { //---函数：textUploadTitle--- textImportResult: '导入结果', - + //--------------提示信息-------------- addSuccessInfo: '新增成功', editSuccessInfo: '编辑成功', diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 2783450..4a3b70e 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -1,16 +1,16 @@