入库任务功能
This commit is contained in:
@@ -1,6 +1,10 @@
|
||||
package com.ruoyi.job.mydojob.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.ruoyi.bas.basJobId.service.IBasJobIdService;
|
||||
import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -10,19 +14,23 @@ import com.ruoyi.job.mydojob.service.IMydoJobService;
|
||||
|
||||
/**
|
||||
* 任务表Service业务层处理
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2025-05-23
|
||||
*/
|
||||
@Service
|
||||
public class MydoJobServiceImpl implements IMydoJobService
|
||||
public class MydoJobServiceImpl implements IMydoJobService
|
||||
{
|
||||
@Autowired
|
||||
private MydoJobMapper mydoJobMapper;
|
||||
@Autowired
|
||||
private IBasJobIdService basJobIdService;
|
||||
@Autowired
|
||||
private IBasTaskNoService basTaskNoService;
|
||||
|
||||
/**
|
||||
* 查询任务表
|
||||
*
|
||||
*
|
||||
* @param jobId 任务表主键
|
||||
* @return 任务表
|
||||
*/
|
||||
@@ -34,7 +42,7 @@ public class MydoJobServiceImpl implements IMydoJobService
|
||||
|
||||
/**
|
||||
* 查询任务表列表
|
||||
*
|
||||
*
|
||||
* @param mydoJob 任务表
|
||||
* @return 任务表
|
||||
*/
|
||||
@@ -46,7 +54,7 @@ public class MydoJobServiceImpl implements IMydoJobService
|
||||
|
||||
/**
|
||||
* 新增任务表
|
||||
*
|
||||
*
|
||||
* @param mydoJob 任务表
|
||||
* @return 结果
|
||||
*/
|
||||
@@ -54,12 +62,14 @@ public class MydoJobServiceImpl implements IMydoJobService
|
||||
public int insertMydoJob(MydoJob mydoJob)
|
||||
{
|
||||
mydoJob.setCreateTime(DateUtils.getNowDate());
|
||||
mydoJob.setJobId(basJobIdService.getJobId("RK"));
|
||||
mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
|
||||
return mydoJobMapper.insertMydoJob(mydoJob);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改任务表
|
||||
*
|
||||
*
|
||||
* @param mydoJob 任务表
|
||||
* @return 结果
|
||||
*/
|
||||
@@ -71,7 +81,7 @@ public class MydoJobServiceImpl implements IMydoJobService
|
||||
|
||||
/**
|
||||
* 批量删除任务表
|
||||
*
|
||||
*
|
||||
* @param jobIds 需要删除的任务表主键
|
||||
* @return 结果
|
||||
*/
|
||||
@@ -83,7 +93,7 @@ public class MydoJobServiceImpl implements IMydoJobService
|
||||
|
||||
/**
|
||||
* 删除任务表信息
|
||||
*
|
||||
*
|
||||
* @param jobId 任务表主键
|
||||
* @return 结果
|
||||
*/
|
||||
|
||||
44
ruoyi-ui/src/api/job/mydoJob.js
Normal file
44
ruoyi-ui/src/api/job/mydoJob.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询任务表列表
|
||||
export function listMydoJob(query) {
|
||||
return request({
|
||||
url: '/job/mydoJob/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询任务表详细
|
||||
export function getMydoJob(jobId) {
|
||||
return request({
|
||||
url: '/job/mydoJob/' + jobId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增任务表
|
||||
export function addMydoJob(data) {
|
||||
return request({
|
||||
url: '/job/mydoJob',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改任务表
|
||||
export function updateMydoJob(data) {
|
||||
return request({
|
||||
url: '/job/mydoJob',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除任务表
|
||||
export function delMydoJob(jobId) {
|
||||
return request({
|
||||
url: '/job/mydoJob/' + jobId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
44
ruoyi-ui/src/api/job/mydoJobDetail.js
Normal file
44
ruoyi-ui/src/api/job/mydoJobDetail.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询子任务表列表
|
||||
export function listMydoJobDetail(query) {
|
||||
return request({
|
||||
url: '/job/mydoJobDetail/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询子任务表详细
|
||||
export function getMydoJobDetail(jobId) {
|
||||
return request({
|
||||
url: '/job/mydoJobDetail/' + jobId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增子任务表
|
||||
export function addMydoJobDetail(data) {
|
||||
return request({
|
||||
url: '/job/mydoJobDetail',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改子任务表
|
||||
export function updateMydoJobDetail(data) {
|
||||
return request({
|
||||
url: '/job/mydoJobDetail',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除子任务表
|
||||
export function delMydoJobDetail(jobId) {
|
||||
return request({
|
||||
url: '/job/mydoJobDetail/' + jobId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@@ -64,5 +64,8 @@ export default {
|
||||
totalAmount: 'Total Amount',
|
||||
submit: 'Submit',
|
||||
selectProduct: 'Select Product'
|
||||
}
|
||||
},
|
||||
menu: {
|
||||
InboundManagement: 'InboundManagement'
|
||||
},
|
||||
}
|
||||
|
||||
537
ruoyi-ui/src/views/in/job/index.vue
Normal file
537
ruoyi-ui/src/views/in/job/index.vue
Normal file
@@ -0,0 +1,537 @@
|
||||
<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-option
|
||||
v-for="dict in dict.type.mydo_job_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="上线类型" prop="onLineType">
|
||||
<el-select v-model="queryParams.onLineType" placeholder="请选择上线类型" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.on_line_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="任务号" 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"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="部门ID" prop="departmentId">
|
||||
<el-input
|
||||
v-model="queryParams.departmentId"
|
||||
placeholder="请输入部门ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="托盘码" prop="trayCode">
|
||||
<el-input
|
||||
v-model="queryParams.trayCode"
|
||||
placeholder="请输入托盘码"
|
||||
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="目标巷道ID" prop="targetRoadwayId">
|
||||
<el-input
|
||||
v-model="queryParams.targetRoadwayId"
|
||||
placeholder="请输入目标巷道ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="目标货位" prop="targetCargoSpaceId">
|
||||
<el-input
|
||||
v-model="queryParams.targetCargoSpaceId"
|
||||
placeholder="请输入目标货位ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="产线ID" prop="lineId">
|
||||
<el-input
|
||||
v-model="queryParams.lineId"
|
||||
placeholder="请输入产线ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="车间ID" prop="workshopId">
|
||||
<el-input
|
||||
v-model="queryParams.workshopId"
|
||||
placeholder="请输入车间ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="优先级" prop="priority">
|
||||
<el-input
|
||||
v-model="queryParams.priority"
|
||||
placeholder="请输入优先级"
|
||||
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-option
|
||||
v-for="dict in dict.type.in_job_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始时间" prop="startTime">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.startTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择开始时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="finishTime">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.finishTime"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择结束时间">
|
||||
</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="班组ID" prop="classId">
|
||||
<el-input
|
||||
v-model="queryParams.classId"
|
||||
placeholder="请输入班组ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="仓库" prop="warehouseId">
|
||||
<el-input
|
||||
v-model="queryParams.warehouseId"
|
||||
placeholder="请输入仓库ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</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-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
@click="handleCompletedManually"
|
||||
v-hasPermi="['job:mydoJob:CompletedManually']"
|
||||
>手动完成</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['job:mydoJob:export']"
|
||||
>导出</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">
|
||||
<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">
|
||||
<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">
|
||||
<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="部门ID" align="center" prop="departmentId" />
|
||||
<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="目标巷道ID" align="center" prop="targetRoadwayId" />
|
||||
<el-table-column label="目标货位ID" align="center" prop="targetCargoSpaceId" />
|
||||
<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">
|
||||
<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">
|
||||
<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">
|
||||
<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>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<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>
|
||||
|
||||
<pagination
|
||||
v-show="detailTotal>0"
|
||||
:total="detailTotal"
|
||||
:page.sync="queryDetailParams.pageNum"
|
||||
:limit.sync="queryDetailParams.pageSize"
|
||||
@pagination="getDetailList"
|
||||
/>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/mydoJob"
|
||||
import { listMydoJobDetail } from "@/api/job/mydoJobDetail"
|
||||
|
||||
export default {
|
||||
name: "MydoJob",
|
||||
dicts: ['execution_phase_type', 'in_job_type', 'on_line_type', 'mydo_job_status'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
detailLoading:false,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
detailTotal: 0,
|
||||
// 任务表表格数据
|
||||
mydoJobList: [],
|
||||
// 子任务表表格数据
|
||||
mydoJobDetailList:[],
|
||||
// 当前选中行
|
||||
currentRow:null,
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
jobId: null,
|
||||
status: null,
|
||||
onLineType: null,
|
||||
taskNo: null,
|
||||
supplierId: null,
|
||||
customerId: null,
|
||||
departmentId: null,
|
||||
trayCode: null,
|
||||
roadwayId: null,
|
||||
cargoSpaceId: null,
|
||||
targetRoadwayId: null,
|
||||
targetCargoSpaceId: null,
|
||||
lineId: null,
|
||||
workshopId: null,
|
||||
priority: null,
|
||||
executionPhase: null,
|
||||
inOrOut: null,
|
||||
createTime: null,
|
||||
startTime: null,
|
||||
finishTime: null,
|
||||
entranceId: null,
|
||||
exitId: null,
|
||||
classId: null,
|
||||
warehouseId: null,
|
||||
faultFlag: null
|
||||
},
|
||||
queryDetailParams:{
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
jobId: null,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
jobId: [
|
||||
{ required: true, message: "任务ID不能为空", trigger: "blur" }
|
||||
],
|
||||
status: [
|
||||
{ required: true, message: "任务状态不能为空", trigger: "change" }
|
||||
],
|
||||
taskNo: [
|
||||
{ required: true, message: "任务号不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
/** 查询任务表列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
listMydoJob(this.queryParams).then(response => {
|
||||
this.mydoJobList = response.rows
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
// 如果有数据,自动选中第一行
|
||||
if (this.mydoJobList.length > 0) {
|
||||
this.handleRowClick(this.mydoJobList[0]);
|
||||
}
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false
|
||||
this.reset()
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
jobId: null,
|
||||
status: null,
|
||||
onLineType: null,
|
||||
taskNo: null,
|
||||
supplierId: null,
|
||||
customerId: null,
|
||||
departmentId: null,
|
||||
trayCode: null,
|
||||
roadwayId: null,
|
||||
cargoSpaceId: null,
|
||||
targetRoadwayId: null,
|
||||
targetCargoSpaceId: null,
|
||||
lineId: null,
|
||||
workshopId: null,
|
||||
priority: null,
|
||||
executionPhase: null,
|
||||
inOrOut: null,
|
||||
createTime: null,
|
||||
startTime: null,
|
||||
finishTime: null,
|
||||
entranceId: null,
|
||||
exitId: null,
|
||||
classId: null,
|
||||
warehouseId: null,
|
||||
faultFlag: null
|
||||
}
|
||||
this.resetForm("form")
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm")
|
||||
this.handleQuery()
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.jobId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('job/mydoJob/export', {
|
||||
...this.queryParams
|
||||
}, `mydoJob_${new Date().getTime()}.xlsx`)
|
||||
},
|
||||
/** 行点击事件处理 */
|
||||
handleRowClick(row) {
|
||||
// 设置当前选中行
|
||||
this.currentRow = row;
|
||||
// 更新子表格查询参数
|
||||
this.queryDetailParams.jobId = row.jobId;
|
||||
// 查询子表格数据
|
||||
this.getDetailList();
|
||||
},
|
||||
/** 查询子任务表列表 */
|
||||
getDetailList() {
|
||||
// 如果没有选中的主任务,不加载子任务
|
||||
if (!this.queryDetailParams.jobId) {
|
||||
this.mydoJobDetailList = [];
|
||||
this.detailTotal = 0;
|
||||
this.detailLoading = false;
|
||||
return;
|
||||
}
|
||||
this.detailLoading = true;
|
||||
listMydoJobDetail(this.queryDetailParams).then(response => {
|
||||
this.mydoJobDetailList = response.rows;
|
||||
this.detailTotal = response.total;
|
||||
this.detailLoading = false;
|
||||
});
|
||||
},
|
||||
//手动完成
|
||||
handleCompletedManually(row){
|
||||
const stockinDetailIds = row.stockinDetailId || this.detailIds
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-table >>> .current-row {
|
||||
background-color: #f0f9eb;
|
||||
}
|
||||
</style>
|
||||
@@ -330,63 +330,6 @@
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改收货单据对话框 -->
|
||||
<!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="入库订单ID" prop="stockinId">
|
||||
<el-input v-model="form.stockinId" placeholder="请输入入库订单ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="建立时间" prop="createDate">
|
||||
<el-input v-model="form.createDate" placeholder="请输入建立时间" />
|
||||
</el-form-item>
|
||||
<el-form-item label="创建人" prop="createManId">
|
||||
<el-input v-model="form.createManId" placeholder="请输入创建人" />
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库ID" prop="warehouseId">
|
||||
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段5" prop="spare5">
|
||||
<el-input v-model="form.spare5" placeholder="请输入备用字段5" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段4" prop="spare4">
|
||||
<el-input v-model="form.spare4" placeholder="请输入备用字段4" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段3" prop="spare3">
|
||||
<el-input v-model="form.spare3" placeholder="请输入备用字段3" />
|
||||
</el-form-item>
|
||||
<el-form-item label=" 完成日期" prop="finishDate">
|
||||
<el-input v-model="form.finishDate" placeholder="请输入 完成日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段2" prop="spare2">
|
||||
<el-input v-model="form.spare2" placeholder="请输入备用字段2" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段1" prop="spare1">
|
||||
<el-input v-model="form.spare1" placeholder="请输入备用字段1" />
|
||||
</el-form-item>
|
||||
<el-form-item label="erp单号" prop="erpBill">
|
||||
<el-input v-model="form.erpBill" placeholder="请输入erp单号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="单据来源" prop="stockSource">
|
||||
<el-input v-model="form.stockSource" placeholder="请输入单据来源" />
|
||||
</el-form-item>
|
||||
<el-form-item label="部门编码" prop="departmentNo">
|
||||
<el-input v-model="form.departmentNo" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
<el-form-item label="客户编码" prop="customerNo">
|
||||
<el-input v-model="form.customerNo" placeholder="请输入客户编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="班组编码" prop="classNo">
|
||||
<el-input v-model="form.classNo" placeholder="请输入班组编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="供应商编码" prop="supplierNo">
|
||||
<el-input v-model="form.supplierNo" placeholder="请输入供应商编码" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>-->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -484,7 +427,6 @@ export default {
|
||||
var data = this.stockinList[0];
|
||||
this.getDetailList(data.stockinId);
|
||||
} else {
|
||||
//console.log("没有数据")
|
||||
this.stockInDetailList = []
|
||||
this.detailLoading = false
|
||||
}
|
||||
@@ -543,41 +485,6 @@ export default {
|
||||
this.detailSingle = selection.length !== 1
|
||||
this.detailMultiple = !selection.length
|
||||
},
|
||||
/**
|
||||
* 创建入库单
|
||||
* @param row
|
||||
*/
|
||||
handleCreateInStockIn(row) {
|
||||
this.reset()
|
||||
const stockinGuid = row.stockinGuid || this.ids
|
||||
let data = {
|
||||
stockinGuidList: stockinGuid
|
||||
}
|
||||
//console.log(data)
|
||||
createStockin(data).then(response => {
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.stockinGuid != null) {
|
||||
updateStockin(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
} else {
|
||||
addStockin(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const stockinGuids = row.stockinGuid || this.ids
|
||||
@@ -605,6 +512,7 @@ export default {
|
||||
this.detailLoading = false;
|
||||
});
|
||||
},
|
||||
//主单点击触发事件
|
||||
handleRowClick(selection) {
|
||||
this.detailLoading = true;
|
||||
this.queryDetailParams.stockinId = selection.stockinId;
|
||||
@@ -614,6 +522,7 @@ export default {
|
||||
this.detailLoading = false;
|
||||
});
|
||||
},
|
||||
// 删除子单据按钮操作
|
||||
handleStockinDetailDelete(row) {
|
||||
const stockinDetailIds = row.stockinDetailId || this.detailIds
|
||||
|
||||
@@ -625,6 +534,7 @@ export default {
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
//质检功能
|
||||
handleQualityInspection(row) {
|
||||
|
||||
const stockinDetailIds = row.stockinDetailId || this.detailIds
|
||||
Reference in New Issue
Block a user