xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(wms): 新增agv出库任务界面

Browse Source 
- 在表格中新增 AGV 状态和完成数量列
- 在查询参数中添加 AGV 相关字段
- 优化了表单数据结构，支持 AGV 任务标识和状态
- 注释掉了部分未使用的查询条件
master^2
zangch@mesnac.com 5 days ago
parent ad6a4697a3
commit 20c87c1dd8
2 changed files with 123 additions and 39 deletions
Show Stats Download Patch File Download Diff File

49
src/api/wms/outstockDetail/types.ts
Unescape Escape View File

@ -37,6 +37,22 @@ export interface OutstockDetailVO {
*/
materialCode: string;
/**
* 是否为AGV任务（0是，1否）
*/
isAgv: string ;
/**
* 完成数量
*/
completeQty: number | string;
/**
* AGV状态（0待拾取 / 1运输中 / 2完成）
*/
agvStatus: string;
}
export interface OutstockDetailForm extends BaseEntity {
@ -72,6 +88,22 @@ export interface OutstockDetailForm extends BaseEntity {
materialCategoryName?: string;
/**
* 是否为AGV任务（0是，1否）
*/
isAgv?: string ;
/**
* 完成数量
*/
completeQty?: number | string;
/**
* AGV状态（0待拾取 / 1运输中 / 2完成）
*/
agvStatus?: string;
}
export interface OutstockDetailQuery extends PageQuery {
@ -108,6 +140,23 @@ export interface OutstockDetailQuery extends PageQuery {
materialCategoryName?: string;
/**
* 是否为AGV任务（0是，1否）
*/
isAgv?: string ;
/**
* 完成数量
*/
completeQty?: number | string;
/**
* AGV状态（0待拾取 / 1运输中 / 2完成）
*/
agvStatus?: string;
/**
* 日期范围参数
*/

113
src/views/wms/outstockDetail/index.vue
Unescape Escape View File

@ -4,24 +4,24 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="表主键" prop="outstockDetailId">
<el-input v-model="queryParams.outstockDetailId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="出库单号" prop="outstockCode">
<el-input v-model="queryParams.outstockCode" placeholder="请输入出库单号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="出库单 主键" prop="outstockId">
<el-input v-model="queryParams.outstockId" placeholder="请输入出库单 主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料id" prop="materialId">
<el-input v-model="queryParams.materialId" placeholder="请输入物料id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="出库数量" prop="outstockQty">
<el-input v-model="queryParams.outstockQty" placeholder="请输入出库数量" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料大类" prop="materialCategoryId">
<el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="表主键" prop="outstockDetailId">-->
<!-- <el-input v-model="queryParams.outstockDetailId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="出库单号" prop="outstockCode">-->
<!-- <el-input v-model="queryParams.outstockCode" placeholder="请输入出库单号" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="出库单 主键" prop="outstockId">-->
<!-- <el-input v-model="queryParams.outstockId" placeholder="请输入出库单 主键" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料id" prop="materialId">-->
<!-- <el-input v-model="queryParams.materialId" placeholder="请输入物料id" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="出库数量" prop="outstockQty">-->
<!-- <el-input v-model="queryParams.outstockQty" placeholder="请输入出库数量" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料大类" prop="materialCategoryId">-->
<!-- <el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -55,11 +55,17 @@
<!-- <el-table-column label="表主键" align="center" prop="outstockDetailId" v-if="columns[0].visible"/> -->
<el-table-column label="出库单号" align="center" prop="outstockCode" v-if="columns[1].visible"/>
<!-- <el-table-column label="出库单 主键" align="center" prop="outstockId" v-if="columns[2].visible"/> -->
<el-table-column label="物料" align="center" prop="materialCode" v-if="columns[4].visible"/>
<el-table-column label="物料编号" align="center" prop="materialCode" v-if="columns[4].visible"/>
<el-table-column label="出库数量" align="center" prop="outstockQty" v-if="columns[5].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[6].visible">
</el-table-column>
<el-table-column label="完成数量" align="center" prop="completeQty" v-if="columns[7].visible"/>
<el-table-column label="AGV状态" align="center" prop="agvStatus" v-if="columns[8].visible">
<template #default="scope">
<dict-tag :options="agv_status" :value="scope.row.agvStatus"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -124,6 +130,12 @@ import { getBaseMaterialCategoryListInWMS } from '@/api/wms/baseMaterialCategory
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const {
agv_status,
is_agv
} = toRefs<any>(proxy?.useDict('agv_status', 'is_agv'));
const outstockDetailList = ref<OutstockDetailVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
@ -151,6 +163,8 @@ const columns = ref<FieldOption[]>([
{ key: 4, label: `物料id`, visible: true },
{ key: 5, label: `出库数量`, visible: true },
{ key: 6, label: `物料大类`, visible: true },
{ key: 7, label: `完成数量`, visible: true },
{ key: 8, label: `AGV状态`, visible: true },
]);
const initFormData: OutstockDetailForm = {
@ -159,7 +173,10 @@ const initFormData: OutstockDetailForm = {
outstockId: undefined,
materialId: undefined,
outstockQty: undefined,
materialCategoryId: undefined
materialCategoryId: undefined,
agvStatus: undefined,
completeQty: undefined,
isAgv: undefined,
}
const data = reactive<PageData<OutstockDetailForm, OutstockDetailQuery>>({
form: {...initFormData},
@ -173,33 +190,50 @@ const data = reactive<PageData<OutstockDetailForm, OutstockDetailQuery>>({
outstockQty: undefined,
materialCategoryId: undefined,
materialCategoryName: undefined,//字段映射
agvStatus: undefined,
completeQty: undefined,
isAgv: undefined,
params: {
}
},
rules: {
outstockDetailId: [
{ required: true, message: "表主键不能为空", trigger: "blur" }
],
outstockCode: [
{ required: true, message: "出库单号不能为空", trigger: "blur" }
],
outstockId: [
{ required: true, message: "出库单 主键不能为空", trigger: "blur" }
],
materialId: [
{ required: true, message: "物料id不能为空", trigger: "blur" }
],
outstockQty: [
{ required: true, message: "出库数量不能为空", trigger: "blur" }
],
materialCategoryId: [
{ required: true, message: "物料大类不能为空", trigger: "blur" }
]
// outstockDetailId: [
// { required: true, message: "表主键不能为空", trigger: "blur" }
// ],
// outstockCode: [
// { required: true, message: "出库单号不能为空", trigger: "blur" }
// ],
// outstockId: [
// { required: true, message: "出库单 主键不能为空", trigger: "blur" }
// ],
// materialId: [
// { required: true, message: "物料id不能为空", trigger: "blur" }
// ],
// outstockQty: [
// { required: true, message: "出库数量不能为空", trigger: "blur" }
// ],
// materialCategoryId: [
// { required: true, message: "物料大类不能为空", trigger: "blur" }
// ]
}
});
const { queryParams, form, rules } = toRefs(data);
// 获取路由实例
const route = useRoute();// 获取路由实例
// 初始化时获取路由参数并设置到查询表单
let routeIsAgvValue = '';
if (route.query.isAgv) {
// 确保值是字符串类型，如果是数组则取第一个元素
const isAgvValue = Array.isArray(route.query.isAgv)
? route.query.isAgv[0]
: route.query.isAgv;
queryParams.value.isAgv = isAgvValue;
routeIsAgvValue = isAgvValue; // 保存路由参数值
}
/** 查询出库单-物料列表 */
const getList = async () => {
loading.value = true;
@ -235,6 +269,7 @@ const cancel = () => {
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
queryParams.value.isAgvValue = routeIsAgvValue;
outstockDetailFormRef.value?.resetFields();
}

Write Preview
Loading…
Cancel
Save