lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库管理下4个页面，出库管理下3个页面，国际化

Browse Source
This commit is contained in:
猫猫guowen
2025-06-05 10:08:01 +08:00
parent 9e43e81df0
commit 6b94fe43e2
10 changed files with 796 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

253
ruoyi-ui/src/lang/en.js
View File

@@ -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',

267
ruoyi-ui/src/lang/zh.js
View File

@@ -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: '编辑成功',

138
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -1,16 +1,16 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务ID" prop="jobId">
<el-form-item :label="$t('inJob.jobId')" prop="jobId">
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务ID"
:placeholder="$t('inJob.inputJobId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-form-item :label="$t('inJob.status')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('inJob.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -29,10 +29,10 @@
/>
</el-select>
</el-form-item>-->
<el-form-item label="任务号" prop="taskNo">
<el-form-item :label="$t('inJob.taskNo')" prop="taskNo">
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
:placeholder="$t('inJob.inputTaskNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -61,10 +61,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="托盘码" prop="trayCode">
<el-form-item :label="$t('inJob.trayCode')" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
:placeholder="$t('inJob.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -93,10 +93,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="目标货位" prop="targetCargoSpaceId">
<el-form-item :label="$t('inJob.targetCargoSpaceId')" prop="targetCargoSpaceId">
<el-input
v-model="queryParams.targetCargoSpaceId"
placeholder="请输入目标货位ID"
:placeholder="$t('inJob.inputTargetCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -125,8 +125,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="执行阶段" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
<el-form-item :label="$t('inJob.executionPhase')" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" :placeholder="$t('inJob.selectExecutionPhase')" clearable>
<el-option
v-for="dict in dict.type.execution_phase_type"
:key="dict.value"
@@ -135,8 +135,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
<el-form-item :label="$t('inJob.inOrOut')" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" :placeholder="$t('inJob.selectInOrOut')" clearable>
<el-option
v-for="dict in dict.type.in_job_type"
:key="dict.value"
@@ -145,34 +145,34 @@
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-form-item :label="$t('inJob.startTime')" prop="startTime">
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
:placeholder="$t('inJob.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item :label="$t('inJob.finishTime')" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
:placeholder="$t('inJob.selectFinishTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="入口" prop="entranceId">
<el-form-item :label="$t('inJob.entranceId')" prop="entranceId">
<el-input
v-model="queryParams.entranceId"
placeholder="请输入入口ID"
:placeholder="$t('inJob.inputEntranceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-form-item :label="$t('inJob.exitId')" prop="exitId">
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口ID"
:placeholder="$t('inJob.inputExitId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -185,10 +185,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
:placeholder="$t('inReceiveStockin.selectWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -202,8 +202,8 @@
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('outJobManagement.search') }}</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('outJobManagement.reset') }}</el-button>
</el-form-item>
</el-form>
@@ -216,7 +216,7 @@
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:manualInvalidation']"
>手动作废</el-button>
>{{ $t('outJobManagement.manualInvalidate') }}</el-button><!--手动作废-->
</el-col>
<el-col :span="1.5">
<el-button
@@ -226,7 +226,7 @@
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:mydoJob:manualCompleted']"
>手动完成</el-button>
>{{ $t('outJobManagement.manualComplete') }}</el-button><!--手动完成-->
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -244,55 +244,52 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
max-height="300">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="center" prop="jobId" fixed />
<el-table-column label="任务状态" align="center" prop="status">
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" fixed /> // 任务ID
<el-table-column :label="$t('inJob.status')" align="center" prop="status"> // 任务状态
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="上线类型" align="center" prop="onLineType">
<el-table-column :label="$t('inJob.onLineType')" align="center" prop="onLineType"> // 上线类型
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
<el-table-column label="任务类型" align="center" prop="inOrOut">
<el-table-column :label="$t('inJob.inOrOut')" align="center" prop="inOrOut"> // 任务类型
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="供应商" align="center" prop="supplierName" key="supplierId" value="supplierName" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="部门" align="center" prop="departmentName" />
<el-table-column label="托盘码" align="center" prop="trayCode" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<el-table-column label="货位" align="center" prop="cargoSpaceName" />
<el-table-column label="目标巷道" align="center" prop="targetRoadwayId" />
<el-table-column label="目标货位" align="center" prop="targetCargoSpaceName" />
<el-table-column label="产线ID" align="center" prop="lineId" />
<el-table-column label="车间ID" align="center" prop="workshopId" />
<el-table-column label="优先级" align="center" prop="priority" />
<el-table-column label="执行阶段" align="center" prop="executionPhase">
<el-table-column :label="$t('inJob.taskNo')" align="center" prop="taskNo" /> // 任务号
<el-table-column :label="$t('inJob.supplierName')" align="center" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商
<el-table-column :label="$t('inJob.departmentName')" align="center" prop="departmentName" /> // 部门
<el-table-column :label="$t('inJob.trayCode')" align="center" prop="trayCode" /> // 托盘码
<el-table-column :label="$t('inJob.roadwayId')" align="center" prop="roadwayId" /> // 巷道ID
<el-table-column :label="$t('inJob.cargoSpaceName')" align="center" prop="cargoSpaceName" /> // 货位
<el-table-column :label="$t('inJob.targetRoadwayId')" align="center" prop="targetRoadwayId" /> // 目标巷道
<el-table-column :label="$t('inJob.targetCargoSpaceName')" align="center" prop="targetCargoSpaceName" /> // 目标货位
<el-table-column :label="$t('inJob.lineId')" align="center" prop="lineId" /> // 产线ID
<el-table-column :label="$t('inJob.workshopId')" align="center" prop="workshopId" /> // 车间ID
<el-table-column :label="$t('inJob.priority')" align="center" prop="priority" /> // 优先级
<el-table-column :label="$t('inJob.executionPhase')" align="center" prop="executionPhase"> // 执行阶段
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<el-table-column :label="$t('inJob.startTime')" align="center" prop="startTime" width="180"> // 开始时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="finishTime" width="180">
<el-table-column :label="$t('inJob.finishTime')" align="center" prop="finishTime" width="180"> // 结束时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="入口ID" align="center" prop="entranceId" />
<!-- <el-table-column label="出口ID" align="center" prop="exitId" />-->
<el-table-column label="班组ID" align="center" prop="classId" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="重分标记" align="center" prop="faultFlag" />
<el-table-column :label="$t('inJob.entranceId')" align="center" prop="entranceId" /> // 入口ID
<el-table-column :label="$t('inJob.classId')" align="center" prop="classId" /> // 班组ID
<el-table-column :label="$t('inJob.warehouseId')" align="center" prop="warehouseId" /> // 仓库ID
<el-table-column :label="$t('inJob.faultFlag')" align="center" prop="faultFlag" /> // 重分标记
</el-table>
<pagination
@@ -307,32 +304,23 @@
max-height="300"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="center" prop="jobDetailId" />
<el-table-column label="任务ID" align="center" prop="jobId" />
<el-table-column label="库存ID" align="center" prop="stockId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="入库时间" align="center" prop="inDate" width="180">
<el-table-column :label="$t('inJob.jobDetailId')" align="center" prop="jobDetailId" />
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID
<el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID
<el-table-column :label="$t('inJob.lotNo')" align="center" prop="lotNo" /> // 批次号
<el-table-column :label="$t('inJob.inDate')" align="center" prop="inDate" width="180"> // 入库时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单据ID" align="center" prop="inOrOutId" />
<el-table-column label="子单据ID" align="center" prop="inOrOutDId" />
<el-table-column label="物料GUID" align="center" prop="productGuid" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="库存状态" align="center" prop="stockStatus" />
<el-table-column label="入库数量" align="center" prop="inQuantity" />
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
<!-- <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
<!-- <el-table-column label="整层数量" align="center" prop="layerQuantity" />-->
<!-- <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />-->
<!-- <el-table-column label="回流数量" align="center" prop="giveNum" />-->
<!-- <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />-->
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
<!-- <el-table-column label="出库口ID" align="center" prop="exitId" />-->
<el-table-column label="生产日期" align="center" prop="printDate" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="供应商ID" align="center" prop="supplierId" />
<el-table-column :label="$t('inJob.inOrOutId')" align="center" prop="inOrOutId" /> // 单据ID
<el-table-column :label="$t('inJob.inOrOutDId')" align="center" prop="inOrOutDId" /> // 子单据ID
<el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID
<el-table-column :label="$t('inJob.productId')" align="center" prop="productId" /> // 物料编码
<el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态
<el-table-column :label="$t('inJob.inQuantity')" align="center" prop="inQuantity" /> // 入库数量
<el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期
<el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段3" align="center" prop="spare3" />

58
ruoyi-ui/src/views/in/receive/add/index.vue
View File

@@ -62,22 +62,22 @@
<el-table :data="productList" border style="width: 100%">
<el-table-column type="index" :label="$t('receiveStockinAdd.serialNumber')" width="50" align="center"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column fixed label="物料编码" align="center" prop="productId" />
<el-table-column fixed label="物料名称" align="center" prop="productName" />
<el-table-column fixed label="英文描述" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="单件净重KG" align="center" prop="spare2" />
<el-table-column label="总净重" align="center" prop="totalNetWeight" />
<el-table-column label="箱号" align="center" prop="spare3" />
<el-table-column label="包装方式" align="center" prop="spare4" />
<el-table-column label="长MM" align="center" prop="spare5" />
<el-table-column label="宽MM" align="center" prop="spare6" />
<el-table-column label="高MM" align="center" prop="spare7" />
<el-table-column label="体积m³" align="center" prop="spare8" />
<el-table-column label="净重KG" align="center" prop="netWeight" />
<el-table-column label="毛重KG" align="center" prop="grossWeight" />
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="描述" align="center" prop="remark" />
<el-table-column fixed :label="$t('receiveStockinAdd.productId')" align="center" prop="productId" /><!--物料编码-->
<el-table-column fixed :label="$t('receiveStockinAdd.productName')" align="center" prop="productName" /><!--物料名称-->
<el-table-column fixed :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.totalNetWeight')" align="center" prop="totalNetWeight" /><!--总净重-->
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
<el-table-column :label="$t('receiveStockinAdd.spare8')" align="center" prop="spare8" /><!--体积m³-->
<el-table-column :label="$t('receiveStockinAdd.netWeight')" align="center" prop="netWeight" /><!--净重KG-->
<el-table-column :label="$t('receiveStockinAdd.grossWeight')" align="center" prop="grossWeight" /><!--毛重KG-->
<el-table-column :label="$t('receiveStockinAdd.price')" align="center" prop="price" /><!--价格-->
<el-table-column :label="$t('receiveStockinAdd.remark')" align="center" prop="remark" /><!--描述-->
<el-table-column :label="$t('receiveStockinAdd.batchNumber')" width="120" align="center">
<template slot-scope="scope">
<el-input
@@ -143,21 +143,21 @@
<el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
<el-table-column type="selection" width="55"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="英文描述" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="单件净重KG" align="center" prop="spare2" />
<el-table-column label="箱号" align="center" prop="spare3" />
<el-table-column label="包装方式" align="center" prop="spare4" />
<el-table-column label="长MM" align="center" prop="spare5" />
<el-table-column label="宽MM" align="center" prop="spare6" />
<el-table-column label="高MM" align="center" prop="spare7" />
<el-table-column label="体积m³" align="center" prop="spare8" />
<el-table-column :label="$t('receiveStockinAdd.productId')" align="center" prop="productId" /><!--物料编码-->
<el-table-column :label="$t('receiveStockinAdd.productName')" align="center" prop="productName" /><!--物料名称-->
<el-table-column :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
<el-table-column :label="$t('receiveStockinAdd.spare8')" align="center" prop="spare8" /><!--体积m³-->
<!-- <el-table-column label="净重KG" align="center" prop="spare8" />
<el-table-column label="毛重KG" align="center" prop="spare9" />-->
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="描述" align="center" prop="remark" />
<el-table-column :label="$t('receiveStockinAdd.price')" align="center" prop="price" /><!--价格-->
<el-table-column :label="$t('receiveStockinAdd.remark')" align="center" prop="remark" /><!--描述-->
</el-table>
<pagination
v-show="productTotal>0"

80
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -100,34 +100,34 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="入库订单ID" prop="stockinId">
<el-form-item :label="$t('inReceiveStockin.stockinId')" prop="stockinId"><!--入库订单ID-->
<el-input
v-model="queryParams.stockinId"
placeholder="请输入入库订单ID"
:placeholder="$t('inReceiveStockin.inputstockinId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商编码" prop="supplierNo">
<el-form-item :label="$t('inReceiveStockin.supplierNo')" prop="supplierNo"><!--供应商编码-->
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编码"
:placeholder="$t('inReceiveStockin.inputSupplierNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单据来源" prop="stockSource">
<el-form-item :label="$t('inReceiveStockin.stockSource')" prop="stockSource"><!--单据来源-->
<el-input
v-model="queryParams.stockSource"
placeholder="请输入单据来源"
:placeholder="$t('inReceiveStockin.inputStockSource')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
:placeholder="$t('inReceiveStockin.selectWarehouseId')"
clearable
@change="handleQuery"
>
@@ -139,10 +139,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-form-item :label="$t('inReceiveStockin.status')" prop="status"><!--单据状态-->
<el-select
v-model="queryParams.status"
placeholder="请选择单据状态"
:placeholder="$t('inReceiveStockin.selectStatus')"
clearable
@change="handleQuery"
>
@@ -155,8 +155,8 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('inReceiveStockin.search')}}</el-button><!--搜索-->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('inReceiveStockin.reset')}}</el-button><!--重置-->
</el-form-item>
</el-form>
@@ -180,7 +180,7 @@
:disabled="single"
@click="handleCreateInStockIn"
v-hasPermi="['receive:stockin:edit']"
>生成入库单据
>{{$t('inReceiveStockin.generateStockin')}}<!--生成入库单据-->
</el-button>
</el-col>
<el-col :span="1.5">
@@ -192,7 +192,7 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['receive:stockin:remove']"
>删除
>{{$t('inReceiveStockin.delet')}}<!--删除-->
</el-button>
</el-col>
<!-- <el-col :span="1.5">
@@ -213,16 +213,16 @@
@row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center"/>
<!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
<el-table-column label="入库订单ID" align="center" prop="stockinId"/>
<el-table-column label="入库类型" align="center" prop="inType"/>
<el-table-column label="建立时间" align="center" prop="createDate"/>
<el-table-column label="创建人" align="center" prop="createManName"/>
<el-table-column label="单据状态" align="center" prop="status">
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" prop="inType"/><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" prop="warehouseName"/>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />
<el-table-column label="备用字段4" align="center" prop="spare4" />
<el-table-column label="备用字段3" align="center" prop="spare3" />-->
@@ -230,11 +230,11 @@
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段1" align="center" prop="spare1" />-->
<!-- <el-table-column label="erp单号" align="center" prop="erpBill"/>-->
<el-table-column label="单据来源" align="center" prop="stockSource"/>
<el-table-column label="部门" align="center" prop="departmentName"/>
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"/><!--单据来源-->
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="center" prop="departmentName"/><!--部门-->
<!-- <el-table-column label="客户编码" align="center" prop="customerNo"/>-->
<!-- <el-table-column label="班组编码" align="center" prop="classNo"/>-->
<el-table-column label="供应商" align="center" prop="supplierName"/>
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -272,7 +272,7 @@
:detailDisabled="single"
@click="handleQualityInspection"
v-hasPermi="['receive:stockInDetail:qualityInspection']"
>质检
>{{$t('inReceiveStockin.testing')}}<!--质检-->
</el-button>
</el-col>
<el-col :span="1.5">
@@ -284,23 +284,23 @@
:detailDisabled="multiple"
@click="handleStockinDetailDelete"
v-hasPermi="['receive:stockInDetail:remove']"
>删除
>{{$t('inReceiveStockin.delet')}}<!--删除-->
</el-button>
</el-col>
</el-row>
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="子单ID" align="center" prop="stockinDetailId"/>
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="center" prop="stockinDetailId"/><!--子单ID-->
<!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" /> -->
<el-table-column label="主单ID" align="center" prop="stockinId"/>
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="center" prop="lotNo"/><!--批次号-->
<!-- <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
<el-table-column label="物料编码" align="center" prop="productId"/>
<el-table-column label="物料描述" align="center" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="center" prop="extraField.englishDesc"/>
<el-table-column label="箱号" align="center" prop="extraField.cartonNo"/>
<el-table-column label="包装方式" align="center" prop="extraField.packingMethod"/>
<el-table-column label="计划数量" width="120" align="center">
<el-table-column :label="$t('inReceiveStockin.productId')" align="center" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="center" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
<template slot-scope="scope">
<el-input-number
v-model="scope.row.quantity"
@@ -319,7 +319,7 @@
<el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
<el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />-->
<!-- <el-table-column label="入库日期" align="center" prop="printDate"/>-->
<el-table-column label="单据状态" align="center" prop="stockStatus">
<el-table-column :label="$t('inReceiveStockin.stockStatus')" align="center" prop="stockStatus"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.stockStatus"/>
</template>
@@ -334,7 +334,7 @@
<el-table-column label="备用字段4" align="center" prop="spare4" />
<el-table-column label="备用字段5" align="center" prop="spare5" />
<el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('inReceiveStockin.operate')" align="center" class-name="small-padding fixed-width"><!--操作-->
<template slot-scope="scope">
<el-button
size="mini"
@@ -342,7 +342,7 @@
icon="el-icon-edit"
@click="handleQualityInspection(scope.row)"
v-hasPermi="['receive:stockInDetail:qualityInspection']"
>质检
>{{$t('inReceiveStockin.testing')}}<!--质检-->
</el-button>
<el-button
size="mini"
@@ -350,7 +350,7 @@
icon="el-icon-delete"
@click="handleStockinDetailDelete(scope.row)"
v-hasPermi="['receive:stockInDetail:remove']"
>删除
>{{$t('inReceiveStockin.delet')}}<!--删除-->
</el-button>
</template>
</el-table-column>
@@ -582,7 +582,7 @@ export default {
//质检功能
handleQualityInspection(row) {
const stockinDetailIds = row.stockinDetailId || this.detailIds
if (!stockinDetailIds || (Array.isArray(stockinDetailIds) && stockinDetailIds.length === 0)) {
this.$modal.msgError("请选择需要质检的记录");
return;
@@ -607,7 +607,7 @@ export default {
list: selectedDetails,
stockinId: selectedDetails[0].stockinId
};
qualityInspection(data).then(response => {
this.getDetailList(data.stockinId)
this.$modal.msgSuccess("质检成功");

70
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -1,16 +1,16 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="入库订单ID" prop="stockinId">
<el-form-item :label="$t('inReceiveStockin.stockinId')" prop="stockinId"><!--入库订单ID-->
<el-input
v-model="queryParams.stockinId"
placeholder="请输入入库订单ID"
:placeholder="$t('inReceiveStockin.inputstockinId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-form-item :label="$t('inReceiveStockin.inType')" prop="inType"><!--入库类型-->
<el-select v-model="queryParams.inType" :placeholder="$t('inReceiveStockin.selecInType')" clearable>
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
@@ -19,8 +19,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-form-item :label="$t('inReceiveStockin.status')" prop="status"><!--单据状态-->
<el-select v-model="queryParams.status" :placeholder="$t('inReceiveStockin.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.in_bill_status"
:key="dict.value"
@@ -37,10 +37,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="供应商编码" prop="supplierNo">
<el-form-item :label="$t('inReceiveStockin.supplierNo')" prop="supplierNo"><!--供应商编码-->
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编码"
:placeholder="$t('inReceiveStockin.inputSupplierNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -164,8 +164,8 @@
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('inReceiveStockin.search')}}</el-button><!--搜索-->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('inReceiveStockin.reset')}}</el-button><!--重置-->
</el-form-item>
</el-form>
@@ -179,7 +179,7 @@
:disabled="single"
@click="handleInvalidated"
v-hasPermi="['in:stockIn:edit']"
>单据作废
>{{$t('inStockin.cancel')}}<!--单据作废-->
</el-button>
</el-col>
<el-col :span="1.5">
@@ -191,7 +191,7 @@
:disabled="single"
@click="handleReview"
v-hasPermi="['in:stockIn:edit']"
>单据审核
>{{$t('inStockin.examine')}}<!--单据审核-->
</el-button>
</el-col>
<el-col :span="1.5">
@@ -203,7 +203,7 @@
:disabled="single"
@click="handleConfirmation"
v-hasPermi="['in:stockIn:edit']"
>单据确认
>{{$t('inStockin.confirm')}}<!--单据确认-->
</el-button>
</el-col>
<!-- <el-col :span="1.5">
@@ -226,7 +226,7 @@
:disabled="detailMultiple"
@click="handleBarcodePrinting"
v-hasPermi="['in:stockIn:barcodePrinting']"
>打印条码
>{{$t('inStockin.printBarcode')}}<!--打印条码-->
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -236,28 +236,28 @@
@row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
<el-table-column label="入库订单ID" align="center" prop="stockinId"/>
<el-table-column label="入库类型" align="center" prop="inType">
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" prop="inType"><!--入库类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column label="建立时间" align="center" prop="createDate"/>
<el-table-column label="创建人" align="center" prop="createManName"/>
<el-table-column label="单据状态" align="center" prop="status">
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" prop="warehouseName"/>
<el-table-column label="完成日期" align="center" prop="finishDate"/>
<el-table-column label="单据来源" align="center" prop="stockSource">
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"><!--单据来源-->
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
</template>
</el-table-column>
<el-table-column label="部门" align="center" prop="departmentName"/>
<el-table-column label="供应商" align="center" prop="supplierName"/>
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="center" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
</el-table>
<pagination
@@ -270,17 +270,17 @@
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子单ID" align="center" prop="stockinDetailId"/>
<el-table-column label="主单ID" align="center" prop="stockinId"/>
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column label="物料编码" align="center" prop="productId"/>
<el-table-column label="物料描述" align="center" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="center" prop="extraField.englishDesc"/>
<el-table-column label="箱号" align="center" prop="extraField.cartonNo"/>
<el-table-column label="包装方式" align="center" prop="extraField.packingMethod"/>
<el-table-column label="计划数量" align="center" prop="quantity"/>
<el-table-column label="扫码数量" align="center" prop="scanNum"/>
<el-table-column label="实际数量" align="center" prop="assignNum"/>
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="center" prop="stockinDetailId"/><!--子单ID-->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="center" prop="lotNo"/><!--批次号-->
<el-table-column :label="$t('inReceiveStockin.productId')" align="center" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="center" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->
</el-table>
<pagination
v-show="detailTotal>0"

185
ruoyi-ui/src/views/job/outJobManagement.vue
View File

@@ -1,16 +1,8 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form-item label="任务ID" prop="jobId">-->
<!-- <el-input-->
<!-- v-model="queryParams.jobId"-->
<!-- placeholder="请输入任务ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-form-item :label="$t('outJobManagement.status')" prop="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('outJobManagement.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -20,68 +12,26 @@
</el-select>
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-form-item :label="$t('outJobManagement.taskNo')" prop="taskNo"> <!-- 任务号 -->
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="供应商ID" prop="supplierId">
<el-input
v-model="queryParams.supplierId"
placeholder="请输入供应商ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户ID" prop="customerId">
<el-input
v-model="queryParams.customerId"
placeholder="请输入客户ID"
:placeholder="$t('outJobManagement.inputTaskNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
-->
<el-form-item label="托盘条码" prop="trayCode">
<el-form-item :label="$t('outJobManagement.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
:placeholder="$t('outJobManagement.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="巷道ID" prop="roadwayId">
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="货位ID" prop="cargoSpaceId">
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="执行阶段" prop="executionPhase">-->
<!-- <el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.execution_phase_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="作业类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择作业类型" clearable>
<el-form-item :label="$t('outJobManagement.jobType')" prop="inOrOut"> <!-- 作业类型 -->
<el-select v-model="queryParams.inOrOut" :placeholder="$t('outJobManagement.selectJobType')" clearable>
<el-option
v-for="dict in dict.type.out_job_type"
:key="dict.value"
@@ -90,43 +40,29 @@
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-form-item :label="$t('outJobManagement.startTime')" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
:placeholder="$t('outJobManagement.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item :label="$t('outJobManagement.finishTime')" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
:placeholder="$t('outJobManagement.selectFinishTime')">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="入口" prop="entranceId">-->
<!-- <el-input-->
<!-- v-model="queryParams.entranceId"-->
<!-- placeholder="请输入入口ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="出口" prop="exitId">-->
<!-- <el-input-->
<!-- v-model="queryParams.exitId"-->
<!-- placeholder="请输入出口ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('outJobManagement.warehouse')" prop="warehouseId"> <!-- 仓库 -->
<el-select
v-model="queryParams.warehouseId"
placeholder="请选择仓库"
:placeholder="$t('outJobManagement.selectWarehouse')"
clearable
>
<el-option
@@ -137,17 +73,10 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="重分标记" prop="faultFlag">
<el-input
v-model="queryParams.faultFlag"
placeholder="请输入重分标记"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('outJobManagement.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('outJobManagement.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -160,7 +89,7 @@
size="mini"
@click="OuthandFinish"
v-hasPermi="['job:outmydoJob:OuthandFinish']"
>手动完成</el-button>
>{{$t('outJobManagement.manualComplete')}}</el-button> <!-- 手动完成 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -170,54 +99,52 @@
size="mini"
@click="OuthandInvalidation"
v-hasPermi="['job:outmydoJob:OuthandInvalidation']"
>手动作废</el-button>
>{{$t('outJobManagement.manualInvalidate')}}</el-button> <!-- 手动作废 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="center" prop="jobId" />
<el-table-column label="任务状态" align="center" prop="status">
<el-table-column :label="$t('outJobManagement.jobId')" align="center" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('outJobManagement.status')" align="center" prop="status"> <!-- 任务状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="上线类型" align="center" prop="onLineType">
<el-table-column :label="$t('outJobManagement.onLineType')" align="center" prop="onLineType"> <!-- 上线类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
<el-table-column label="任务类型" align="center" prop="inOrOut">
<el-table-column :label="$t('outJobManagement.jobType')" align="center" prop="inOrOut"> <!-- 任务类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column label="任务号" align="center" prop="taskNo" />
<!-- <el-table-column label="供应商ID" align="center" prop="supplierId" />-->
<el-table-column label="客户ID" align="center" prop="customerId" />
<el-table-column label="托盘码" align="center" prop="trayCode" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<el-table-column label="货位ID" align="center" prop="cargoSpaceId" />
<el-table-column label="优先级" align="center" prop="priority" />
<el-table-column label="执行阶段" align="center" prop="executionPhase">
<el-table-column :label="$t('outJobManagement.taskNo')" align="center" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('outJobManagement.customerId')" align="center" prop="customerId" /> <!-- 客户ID -->
<el-table-column :label="$t('outJobManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘码 -->
<el-table-column :label="$t('outJobManagement.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column :label="$t('outJobManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('outJobManagement.priority')" align="center" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('outJobManagement.executionPhase')" align="center" prop="executionPhase"> <!-- 执行阶段 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<el-table-column :label="$t('outJobManagement.startTime')" align="center" prop="startTime" width="180"> <!-- 开始时间 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="finishTime" width="180">
<el-table-column :label="$t('outJobManagement.finishTime')" align="center" prop="finishTime" width="180"> <!-- 结束时间 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="出口ID" align="center" prop="exitId" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column :label="$t('outJobManagement.exitId')" align="center" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('outJobManagement.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
</el-table>
<pagination
@@ -230,36 +157,12 @@
<el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="center" prop="jobDetailId" />
<!-- <el-table-column label="任务ID" align="center" prop="jobId" />-->
<el-table-column label="库存ID" align="center" prop="stockId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<!-- <el-table-column label="入库时间" align="center" prop="inDate" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="单据ID" align="center" prop="inOrOutId" />-->
<el-table-column label="子单据ID" align="center" prop="inOrOutDId" />
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column label="物料编码" align="center" prop="productId" />
<!-- <el-table-column label="库存状态" align="center" prop="stockStatus" />-->
<!-- <el-table-column label="入库数量" align="center" prop="inQuantity" />-->
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
<el-table-column label="出库数量" align="center" prop="outQuantity" />
<!-- <el-table-column label="整层数量" align="center" prop="layerQuantity" />-->
<!-- <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />-->
<!-- <el-table-column label="回流数量" align="center" prop="giveNum" />-->
<!-- <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />-->
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
<!-- <el-table-column label="出库口ID" align="center" prop="exitId" />-->
<!-- <el-table-column label="生产日期" align="center" prop="printDate" />-->
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<!-- <el-table-column label="供应商ID" align="center" prop="supplierId" />-->
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段3" align="center" prop="spare3" />
<el-table-column label="备用字段4" align="center" prop="spare4" />-->
<el-table-column :label="$t('outJobManagement.subTaskId')" align="center" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column :label="$t('outJobManagement.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('outJobManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('outJobManagement.subDocumentId')" align="center" prop="inOrOutDId" /> <!-- 子单据ID -->
<el-table-column :label="$t('outJobManagement.materialCode')" align="center" prop="productId" /> <!-- 物料编码 -->
<el-table-column :label="$t('outJobManagement.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
</el-table>
<pagination
@@ -269,8 +172,6 @@
:limit.sync="queryDetailParams.pageSize"
@pagination="getDetailList"
/>
</div>
</template>

68
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -2,8 +2,8 @@
<div class="app-container">
<!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<el-form-item label="仓库" prop="warehouseId" required>
<el-select v-model="formData.warehouseId" placeholder="请选择仓库" clearable>
<el-form-item :label="$t('addOutStockout.warehouse')" prop="warehouseId" required><!--仓库-->
<el-select v-model="formData.warehouseId" :placeholder="$t('addOutStockout.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
@@ -12,15 +12,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="客户" prop="customerNo" required>
<el-form-item :label="$t('addOutStockout.customer')" prop="customerNo" required><!--客户-->
<el-input
v-model="formData.customerNo"
placeholder="请输入客户编号"
:placeholder="$t('addOutStockout.inputCustomerNo')"
clearable
/>
</el-form-item>
<el-form-item label="单据类型" prop="outType" required>
<el-select v-model="formData.outType" placeholder="请选择单据类型" clearable>
<el-form-item :label="$t('addOutStockout.documentType')" prop="outType" required><!--单据类型-->
<el-select v-model="formData.outType" :placeholder="$t('addOutStockout.selectDocumentType')" clearable>
<el-option
v-for="dict in dict.type.out_bill_type"
:key="dict.value"
@@ -30,86 +30,86 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">重置</el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">保存单据</el-button>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{$t('addOutStockout.reset')}}<!--重置--></el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">{{$t('addOutStockout.saveDocument')}}<!--保存单据--></el-button>
</el-form-item>
</el-form>
<div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">选择物资</el-button>
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">重新建单</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">{{$t('addOutStockout.selectMaterial')}}<!--选择物资--></el-button>
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{$t('addOutStockout.recreateDocument')}}<!--重新建单--></el-button>
</div>
<!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList">
<el-table-column label="物资编号" align="center" prop="productId" />
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="数量" align="center" prop="quantity">
<el-table-column :label="$t('addOutStockout.materialCode')" align="center" prop="productId" /><!--物资编号-->
<el-table-column :label="$t('addOutStockout.materialName')" align="center" prop="productName" /><!--物资名称-->
<el-table-column :label="$t('addOutStockout.batchNo')" align="center" prop="lotNo" /><!--批号-->
<el-table-column :label="$t('addOutStockout.quantity')" align="center" prop="quantity"><!--数量-->
<template slot-scope="scope">
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('addOutStockout.operation')" align="center" class-name="small-padding fixed-width"><!--操作-->
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">{{$t('addOutStockout.delete')}}<!--删除--></el-button>
</template>
</el-table-column>
</el-table>
<!-- 选择物资弹窗 -->
<el-dialog title="选择物资" :visible.sync="materialDialog" width="800px" append-to-body>
<el-dialog :title="$t('addOutStockout.selectMaterial')" :visible.sync="materialDialog" width="800px" append-to-body><!--选择物资-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="物资编码" prop="productId">
<el-form-item :label="$t('addOutStockout.materialCode')" prop="productId"><!--物资编码-->
<el-input
v-model="queryParams.productId"
placeholder="请输入物资编码"
:placeholder="$t('addOutStockout.inputMaterialCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物资名称" prop="productName">
<el-form-item :label="$t('addOutStockout.materialName')" prop="productName"><!--物资名称-->
<el-input
v-model="queryParams.productName"
placeholder="请输入物资名称"
:placeholder="$t('addOutStockout.inputMaterialName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('addOutStockout.batchNo')" prop="lotNo"><!--批号-->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('addOutStockout.inputBatchNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('addOutStockout.warehouse')" prop="warehouseId"><!--仓库-->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
:placeholder="$t('addOutStockout.inputWarehouse')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('addOutStockout.search')}}<!--搜索--></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('addOutStockout.reset')}}<!--重置--></el-button>
</el-form-item>
</el-form>
<el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="物资编码" align="center" prop="productId" />
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="数量" align="center" prop="quantity" />
<el-table-column label="仓库" align="center" prop="warehouseId" />
<el-table-column :label="$t('addOutStockout.materialCode')" align="center" prop="productId" /><!--物资编码-->
<el-table-column :label="$t('addOutStockout.materialName')" align="center" prop="productName" /><!--物资名称-->
<el-table-column :label="$t('addOutStockout.batchNo')" align="center" prop="lotNo" /><!--批号-->
<el-table-column :label="$t('addOutStockout.quantity')" align="center" prop="quantity" /><!--数量-->
<el-table-column :label="$t('addOutStockout.warehouse')" align="center" prop="warehouseId" /><!--仓库-->
</el-table>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelectMaterials">确 定</el-button>
<el-button @click="cancelSelectMaterials">取 消</el-button>
<el-button type="primary" @click="confirmSelectMaterials">{{$t('addOutStockout.confirm')}}<!--确 定--></el-button>
<el-button @click="cancelSelectMaterials">{{$t('addOutStockout.cancel')}}<!--取 消--></el-button>
</div>
</el-dialog>
</div>

69
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -2,16 +2,16 @@
<div class="app-container">
<!-- 查询表单 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="出库单编号" prop="stockoutId">
<el-form-item :label="$t('outStockoutManage.stockoutId')" prop="stockoutId"> <!-- 出库单编号 -->
<el-input
v-model="queryParams.stockoutId"
placeholder="请输入出库单编号"
:placeholder="$t('outStockoutManage.inputStockoutId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库类型" prop="outType">
<el-select v-model="queryParams.outType" placeholder="请选择出库类型" clearable>
<el-form-item :label="$t('outStockoutManage.outType')" prop="outType"> <!-- 出库类型 -->
<el-select v-model="queryParams.outType" :placeholder="$t('outStockoutManage.selectOutType')" clearable>
<el-option
v-for="dict in dict.type.out_bill_type"
:key="dict.value"
@@ -20,8 +20,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-form-item :label="$t('outStockoutManage.status')" prop="status"> <!-- 单据状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('outStockoutManage.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.out_bill_status"
:key="dict.value"
@@ -30,17 +30,17 @@
/>
</el-select>
</el-form-item>
<el-form-item label="客户编码" prop="customerNo">
<el-form-item :label="$t('outStockoutManage.customerNo')" prop="customerNo"> <!-- 客户编码 -->
<el-input
v-model="queryParams.customerNo"
placeholder="请输入客户编码"
:placeholder="$t('outStockoutManage.inputCustomerNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('outStockoutManage.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('outStockoutManage.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -54,7 +54,7 @@
size="mini"
@click="handleAudit(2)"
v-hasPermi="['out:outStockout:changeStatus']"
>单据审核</el-button>
>{{$t('outStockoutManage.audit')}}</el-button> <!-- 单据审核 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -64,7 +64,7 @@
size="mini"
@click="handleAudit(4)"
v-hasPermi="['out:outStockout:changeStatus']"
>单据确认</el-button>
>{{$t('outStockoutManage.confirm')}}</el-button> <!-- 单据确认 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -74,7 +74,7 @@
size="mini"
@click="handleAudit(5)"
v-hasPermi="['out:outStockout:changeStatus']"
>单据作废</el-button>
>{{$t('outStockoutManage.cancel')}}</el-button> <!-- 单据作废 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -83,7 +83,7 @@
icon="el-icon-s-promotion"
size="mini"
@click="handleAutoAllot"
>自动分配</el-button>
>{{$t('outStockoutManage.autoAllot')}}</el-button> <!-- 自动分配 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -92,30 +92,30 @@
icon="el-icon-s-tools"
size="mini"
@click="handleManualAllot"
>手动分配</el-button>
>{{$t('outStockoutManage.manualAllot')}}</el-button> <!-- 手动分配 -->
</el-col>
</el-row>
<!-- 主表数据 -->
<el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="出库单编号" align="center" prop="stockoutId" />
<el-table-column label="出库类型" align="center" prop="outType">
<el-table-column :label="$t('outStockoutManage.stockoutId')" align="center" prop="stockoutId" /> <!-- 出库单编号 -->
<el-table-column :label="$t('outStockoutManage.outType')" align="center" prop="outType"> <!-- 出库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
</template>
</el-table-column>
<el-table-column label="单据状态" align="center" prop="status">
<el-table-column :label="$t('outStockoutManage.status')" align="center" prop="status"> <!-- 单据状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="客户编码" align="center" prop="customerNo" />
<el-table-column label="建单人" align="center" prop="createManId" />
<el-table-column label="创建时间" align="center" prop="createDate" />
<el-table-column label="开始时间" align="center" prop="startDate" />
<el-table-column label="确认时间" align="center" prop="finishDate" />
<el-table-column label="仓库编号" align="center" prop="warehouseId" />
<el-table-column :label="$t('outStockoutManage.customerNo')" align="center" prop="customerNo" /> <!-- 客户编码 -->
<el-table-column :label="$t('outStockoutManage.createManId')" align="center" prop="createManId" /> <!-- 建单人 -->
<el-table-column :label="$t('outStockoutManage.createDate')" align="center" prop="createDate" /> <!-- 创建时间 -->
<el-table-column :label="$t('outStockoutManage.startDate')" align="center" prop="startDate" /> <!-- 开始时间 -->
<el-table-column :label="$t('outStockoutManage.finishDate')" align="center" prop="finishDate" /> <!-- 确认时间 -->
<el-table-column :label="$t('outStockoutManage.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库编号 -->
</el-table>
<pagination
@@ -128,17 +128,16 @@
<!-- 子表数据 -->
<el-table v-loading="detailLoading" :data="outStockDetailList.slice((detailQueryParams.pageNum-1)*detailQueryParams.pageSize, detailQueryParams.pageNum*detailQueryParams.pageSize)" style="margin-top: 20px;">
<el-table-column label="出库子单编号" align="center" prop="stockoutDetailId" />
<el-table-column label="物资编码" align="center" prop="productId" />
<el-table-column label="批次" align="center" prop="lotNo" />
<el-table-column label="计划数量" align="center" prop="quantity" />
<el-table-column label="实际数量" align="center" prop="assignNum" />
<el-table-column label="分配数量" align="center" prop="allotQuantity" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column :label="$t('outStockoutManage.stockoutDetailId')" align="center" prop="stockoutDetailId" /> <!-- 出库子单编号 -->
<el-table-column :label="$t('outStockoutManage.productId')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('outStockoutManage.lotNo')" align="center" prop="lotNo" /> <!-- 批次 -->
<el-table-column :label="$t('outStockoutManage.quantity')" align="center" prop="quantity" /> <!-- 计划数量 -->
<el-table-column :label="$t('outStockoutManage.assignNum')" align="center" prop="assignNum" /> <!-- 实际数量 -->
<el-table-column :label="$t('outStockoutManage.allotQuantity')" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
<el-table-column :label="$t('outStockoutManage.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('outStockoutManage.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('outStockoutManage.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('outStockoutManage.remark')" align="center" prop="remark" /> <!-- 备注 -->
</el-table>
<pagination

38
ruoyi-ui/src/views/out/productAndStock.vue
View File

@@ -1,49 +1,49 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="序号" prop="onlyIdentity">
<el-form-item :label="$t('productAndStock.serialNumber')" prop="onlyIdentity"> <!-- 序号 -->
<el-input
v-model="queryParams.onlyIdentity"
placeholder="请输入序号"
:placeholder="$t('productAndStock.inputSerialNumber')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物资编码" prop="productId">
<el-form-item :label="$t('productAndStock.productId')" prop="productId"> <!-- 物资编码 -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物资编码"
:placeholder="$t('productAndStock.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('productAndStock.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('productAndStock.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物资名称" prop="productName">
<el-form-item :label="$t('productAndStock.productName')" prop="productName"> <!-- 物资名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物资名称"
:placeholder="$t('productAndStock.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('productAndStock.warehouse')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
:placeholder="$t('productAndStock.inputWarehouse')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('productAndStock.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('productAndStock.reset')}}111</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -56,18 +56,18 @@
size="mini"
@click="handleExport"
v-hasPermi="['out:productAndStock:export']"
>导出</el-button>
>{{$t('productAndStock.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="productAndStockList">
<el-table-column label="序号" align="center" prop="onlyIdentity" />
<el-table-column label="物资编码" align="center" prop="productId" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column label="数量" align="center" prop="quantity" />
<el-table-column label="仓库" align="center" prop="warehouseId" />
<el-table-column :label="$t('productAndStock.serialNumber')" align="center" prop="onlyIdentity" /> <!-- 序号 -->
<el-table-column :label="$t('productAndStock.productId')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('productAndStock.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="$t('productAndStock.productName')" align="center" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('productAndStock.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('productAndStock.warehouse')" align="center" prop="warehouseId" /> <!-- 仓库 -->
</el-table>
<pagination