zangch
/
WCS_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(wcs): 统一审计字段命名并新增任务明细列表接口

Browse Source 
1.  将WcsBaseEntity及所有业务实体的审计字段从createdTime/updatedTime等改为和RuoYi对齐的createTime/updateTime命名
2.  修正所有页面表格、查询参数中的字段引用匹配新命名
3.  新增getTaskDetailList接口用于获取免分页的实时任务明细下拉列表
4.  为物料信息模块新增字典选择组件适配物料类型枚举
main
zch 4 weeks ago
parent 44b4df864f
commit 73b00d000b
21 changed files with 126 additions and 108 deletions
Show Stats Download Patch File Download Diff File

12
src/api/wcs/deviceHost/types.ts
Unescape Escape View File

@ -47,16 +47,16 @@ export interface DeviceHostVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface DeviceHostForm extends WcsBaseEntity {
@ -135,7 +135,7 @@ export interface DeviceHostQuery extends PageQuery {
/**
* 创建时间
*/
createdTime?: string;
createTime?: string;
/**
* 日期范围参数

12
src/api/wcs/deviceInfo/types.ts
Unescape Escape View File

@ -47,19 +47,19 @@ export interface DeviceInfoVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/** 所属主机名称 */
hostName: string;
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface DeviceInfoForm extends WcsBaseEntity {
@ -138,7 +138,7 @@ export interface DeviceInfoQuery extends PageQuery {
/**
* 创建时间
*/
createdTime?: string;
createTime?: string;
/**
* 日期范围参数

12
src/api/wcs/deviceParam/types.ts
Unescape Escape View File

@ -57,19 +57,19 @@ export interface DeviceParamVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/** 设备名称 */
deviceName: string;
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface DeviceParamForm extends WcsBaseEntity {
@ -168,7 +168,7 @@ export interface DeviceParamQuery extends PageQuery {
/**
* 创建时间
*/
createdTime?: string;
createTime?: string;
/**
* 日期范围参数

12
src/api/wcs/locationInfo/types.ts
Unescape Escape View File

@ -82,7 +82,7 @@ export interface LocationInfoVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/** 仓库名称 */
storeName: string;
@ -90,13 +90,13 @@ export interface LocationInfoVO {
materialName: string;
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface LocationInfoForm extends WcsBaseEntity {
@ -245,7 +245,7 @@ export interface LocationInfoQuery extends PageQuery {
/**
* 创建时间
*/
createdTime?: string;
createTime?: string;
/**
* 日期范围参数

12
src/api/wcs/materialInfo/types.ts
Unescape Escape View File

@ -52,16 +52,16 @@ export interface MaterialInfoVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface MaterialInfoForm extends WcsBaseEntity {
@ -150,7 +150,7 @@ export interface MaterialInfoQuery extends PageQuery {
/**
* 创建时间
*/
createdTime?: string;
createTime?: string;
/**
* 日期范围参数

12
src/api/wcs/pathDetails/types.ts
Unescape Escape View File

@ -37,16 +37,16 @@ export interface PathDetailsVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface PathDetailsForm extends WcsBaseEntity {
@ -105,7 +105,7 @@ export interface PathDetailsQuery extends PageQuery {
/**
* 创建时间
*/
createdTime?: string;
createTime?: string;
/**
* 日期范围参数

12
src/api/wcs/pathInfo/types.ts
Unescape Escape View File

@ -33,19 +33,19 @@ export interface PathInfoVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/** 路径明细列表 */
details: PathDetailsVO[];
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface PathInfoForm extends WcsBaseEntity {
@ -100,7 +100,7 @@ export interface PathInfoQuery extends PageQuery {
/**
* 创建时间
*/
createdTime?: string;
createTime?: string;
/**
* 日期范围参数

12
src/api/wcs/storeInfo/types.ts
Unescape Escape View File

@ -32,16 +32,16 @@ export interface StoreInfoVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface StoreInfoForm extends WcsBaseEntity {
@ -90,7 +90,7 @@ export interface StoreInfoQuery extends PageQuery {
/**
* 创建时间
*/
createdTime?: string;
createTime?: string;
/**
* 日期范围参数

12
src/api/wcs/taskDetail/index.ts
Unescape Escape View File

@ -39,6 +39,18 @@ export const getTaskDetailByIds = (ids: TaskDetailIds): AxiosPromise<TaskDetailV
});
};
/**
* 获取实时任务明细下拉列表（免分页）
* @param query
*/
export const getTaskDetailList = (query?: TaskDetailQuery) => {
return request({
url: '/wcs/taskDetail/getTaskDetailList',
method: 'get',
params: query
});
};
/**
* 统计实时任务明细数量
* @param query

12
src/api/wcs/taskDetail/types.ts
Unescape Escape View File

@ -97,21 +97,21 @@ export interface TaskDetailVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/**
* 更新时间
*/
updatedTime: string;
updateTime: string;
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface TaskDetailForm extends WcsBaseEntity {

12
src/api/wcs/taskQueue/types.ts
Unescape Escape View File

@ -98,24 +98,24 @@ export interface TaskQueueVO {
/**
* 创建时间
*/
createdTime: string;
createTime: string;
/**
* 更新时间
*/
updatedTime: string;
updateTime: string;
/** 实时任务明细列表；列表接口不挂载明细，详情接口按需返回。 */
details?: TaskDetailVO[];
/** 创建人 */
createdBy: string | number;
createBy: string | number;
/** 更新人 */
updatedBy: string | number;
updateBy: string | number;
/** 创建人名称 */
createdByName: string;
createByName: string;
/** 更新人名称 */
updatedByName: string;
updateByName: string;
}
export interface TaskQueueForm extends WcsBaseEntity {

8
src/api/wcs/types.ts
Unescape Escape View File

@ -3,10 +3,10 @@ export interface WcsBaseEntity {
* hw-wcs 业务库字段固定为 created_time/updated_time，
* 与 RuoYi 通用 BaseEntity 的 createTime/updateTime 不同，单独建模可避免两套审计字段混用。
*/
createdTime?: string;
updatedTime?: string;
createdBy?: string | number;
updatedBy?: string | number;
createTime?: string;
updateTime?: string;
createBy?: string | number;
updateBy?: string | number;
}
/**

8
src/views/wcs/deviceHost/index.vue
Unescape Escape View File

@ -57,13 +57,13 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createdTime" width="100">
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">

8
src/views/wcs/deviceInfo/index.vue
Unescape Escape View File

@ -70,13 +70,13 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createdTime" width="100">
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">

8
src/views/wcs/deviceParam/index.vue
Unescape Escape View File

@ -63,13 +63,13 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createdTime" width="100">
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">

10
src/views/wcs/locationInfo/index.vue
Unescape Escape View File

@ -80,13 +80,13 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createdTime" width="180">
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, CREATED_TIME_DISPLAY_FORMAT) }}</span>
<span>{{ parseTime(scope.row.createTime, CREATED_TIME_DISPLAY_FORMAT) }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -207,7 +207,7 @@ import {
CREATED_TIME_PICKER_FORMAT,
CREATED_TIME_VALUE_FORMAT,
getTodayCreatedTimeRange
} from '../utils/createdTimeRange';
} from '../utils/createTimeRange';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wcs_location_status, wcs_is_flag } = toRefs<any>(proxy?.useDict('wcs_location_status', 'wcs_is_flag'));

20
src/views/wcs/materialInfo/index.vue
Unescape Escape View File

@ -48,7 +48,11 @@
<el-table-column label="序号" align="center" type="index" width="60" />
<el-table-column label="物料编号" align="center" prop="materialCode" />
<el-table-column label="物料名称" align="center" prop="materialName" />
<el-table-column label="物料类型" align="center" prop="materialType" />
<el-table-column label="物料类型" align="center" prop="materialType" >
<template #default="scope">
<dict-tag :options="wcs_material_type" :value="scope.row.materialType"/>
</template>
</el-table-column>
<el-table-column label="物料条码" align="center" prop="materialBarcode" />
<el-table-column label="最短存放周期" align="center" prop="minStorageCycle" />
<el-table-column label="最长存放周期" align="center" prop="maxStorageCycle" />
@ -58,13 +62,13 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createdTime" width="100">
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -89,7 +93,9 @@
<el-input v-model="form.materialName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="物料类型" prop="materialType">
<el-input v-model="form.materialType" placeholder="请输入物料类型" />
<el-select v-model="form.materialType" placeholder="请选择物料类型" class="w-full">
<el-option v-for="dict in wcs_material_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
</el-form-item>
<el-form-item label="物料条码" prop="materialBarcode">
<el-input v-model="form.materialBarcode" placeholder="请输入物料条码" />
@ -124,7 +130,7 @@ import { listMaterialInfo, getMaterialInfo, delMaterialInfo, addMaterialInfo, up
import { MaterialInfoVO, MaterialInfoQuery, MaterialInfoForm } from '@/api/wcs/materialInfo/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wcs_is_flag } = toRefs<any>(proxy?.useDict('wcs_is_flag'));
const { wcs_is_flag, wcs_material_type } = toRefs<any>(proxy?.useDict('wcs_is_flag','wcs_material_type'));
const materialInfoList = ref<MaterialInfoVO[]>([]);
const buttonLoading = ref(false);

10
src/views/wcs/pathDetails/index.vue
Unescape Escape View File

@ -64,13 +64,13 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createdTime" width="100">
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -152,7 +152,7 @@ const initFormData: PathDetailsForm = {
endPoint: undefined,
isFlag: 1,
remark: undefined,
createdTime: undefined
createTime: undefined
};
const data = reactive<PageData<PathDetailsForm, PathDetailsQuery>>({
form: { ...initFormData },

10
src/views/wcs/pathInfo/index.vue
Unescape Escape View File

@ -66,13 +66,13 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createdTime" width="150">
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, CREATED_TIME_DISPLAY_FORMAT) }}</span>
<span>{{ parseTime(scope.row.createTime, CREATED_TIME_DISPLAY_FORMAT) }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -166,7 +166,7 @@ import {
CREATED_TIME_PICKER_FORMAT,
CREATED_TIME_VALUE_FORMAT,
getTodayCreatedTimeRange
} from '../utils/createdTimeRange';
} from '../utils/createTimeRange';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wcs_is_flag } = toRefs<any>(proxy?.useDict('wcs_is_flag'));

8
src/views/wcs/storeInfo/index.vue
Unescape Escape View File

@ -54,13 +54,13 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createdTime" width="100">
<el-table-column label="创建时间" align="center" prop="createTime" width="100">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">

12
src/views/wcs/taskQueue/index.vue
Unescape Escape View File

@ -102,13 +102,13 @@
<dict-tag :options="wcs_is_flag" :value="scope.row.isFlag" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180">
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, CREATED_TIME_DISPLAY_FORMAT) }}</span>
<span>{{ parseTime(scope.row.createTime, CREATED_TIME_DISPLAY_FORMAT) }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdByName" width="100" />
<el-table-column label="更新人" align="center" prop="updatedByName" width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="100" />
<el-table-column label="更新人" align="center" prop="updateByName" width="100" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -330,7 +330,7 @@ import {
CREATED_TIME_PICKER_FORMAT,
CREATED_TIME_VALUE_FORMAT,
getTodayCreatedTimeRange
} from '../utils/createdTimeRange';
} from '../utils/createTimeRange';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wcs_is_flag, wcs_task_category, wcs_task_type, wcs_task_status } = toRefs<any>(
@ -377,7 +377,7 @@ const initFormData: TaskQueueForm = {
taskSteps: undefined,
isFlag: 1,
remark: undefined,
createdTime: undefined,
createTime: undefined,
details: []
}
const data = reactive<PageData<TaskQueueForm, TaskQueueQuery>>({

Write Preview
Loading…
Cancel
Save