refactor(wms): 调整多个 WMS 组件的显示逻辑

- 在 instockPrint types 中添加了 isAgv 和 agvStatus 字段
- 在 baseMaterialInfo组件中注释掉了安全库存列
- 在 instockDetail 组件中移除了 AGV 状态和完成数量列
- 在 instockOrderCopy 组件中注释掉了质检标识列
- 在 instockPrint 组件中注释掉了多个表单字段和按钮
- 在 outstockRecord 和 returnOrder 组件中隐藏了物料大类列
master
zangch@mesnac.com 5 months ago
parent 2c38a69726
commit 6922644ebe

@ -81,6 +81,15 @@ export interface InstockPrintVO {
*/
createTime?: string;
/**
* AGV01
*/
isAgv?: string;
/**
* AGV0 / 1 / 2
*/
agvStatus?: string;
}
@ -167,6 +176,15 @@ export interface InstockPrintForm extends BaseEntity {
*/
createTime?: string;
/**
* AGV01
*/
isAgv?: string;
/**
* AGV0 / 1 / 2
*/
agvStatus?: string;
}
export interface InstockPrintQuery extends PageQuery {
@ -254,6 +272,17 @@ export interface InstockPrintQuery extends PageQuery {
actualInboundTime?: string;
/**
* AGV01
*/
isAgv?: string;
/**
* AGV0 / 1 / 2
*/
agvStatus?: string;
/**
*
*/

@ -85,7 +85,7 @@
</el-table-column>
<el-table-column label="最大库存" align="center" prop="maxStockAmount" v-if="columns[11].visible"/>
<el-table-column label="最小库存" align="center" prop="minStockAmount" v-if="columns[12].visible"/>
<el-table-column label="安全库存" align="center" prop="safeStockAmount" v-if="columns[13].visible"/>
<!-- <el-table-column label="安全库存" align="center" prop="safeStockAmount" v-if="columns[13].visible"/>-->
<el-table-column label="质检要求" align="center" prop="inspectionRequest" v-if="columns[10].visible">
<template #default="scope">
<dict-tag :options="inspection_request" :value="scope.row.inspectionRequest"/>
@ -148,7 +148,6 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="物料规格" prop="materialSpec">
@ -326,7 +325,7 @@ const columns = ref<FieldOption[]>([
{ key: 10, label: `质检要求`, visible: true },
{ key: 11, label: `最大库存`, visible: true },
{ key: 12, label: `最小库存`, visible: true },
{ key: 13, label: `安全库存`, visible: true },
// { key: 13, label: ``, visible: true },
]);
const initFormData: BaseMaterialInfoForm = {

@ -92,8 +92,6 @@
</el-table-column>
<el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[13].visible">
</el-table-column> -->
<el-table-column label="AGv状态" align="center" prop="agvStatus" v-if="columns[6].visible"/>
<el-table-column label="完成数量" align="center" prop="completeQty" v-if="columns[7].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<!-- <el-tooltip content="修改" placement="top">
@ -205,8 +203,7 @@ const columns = ref<FieldOption[]>([
{ key: 3, label: `入库数量`, visible: true },
{ key: 4, label: `物料规格`, visible: true },
{ key: 5, label: `计量单位名称`, visible: true },
{ key: 6, label: `AGV状态`, visible: true },
{ key: 7, label:'完成数量',visible: true}
]);
const initFormData: InstockDetailForm = {
@ -223,9 +220,6 @@ const initFormData: InstockDetailForm = {
unitName: undefined,
codeYesNo: undefined,
materialCategoryId: undefined,
isAgv: '0',
completeQty: undefined,
agvStatus: undefined,
}
const data = reactive<PageData<InstockDetailForm, InstockDetailQuery>>({
form: {...initFormData},
@ -246,9 +240,6 @@ const data = reactive<PageData<InstockDetailForm, InstockDetailQuery>>({
codeYesNo: undefined,
materialCategoryId: undefined,
materialCategoryName: undefined,//
isAgv: '0',
completeQty: undefined,
agvStatus: undefined,
params: {
}
},

@ -125,11 +125,11 @@
<el-table-column label="物料编码" align="center" prop="materialCode"/>
<el-table-column label="物料名称" align="center" prop="materialName"/>
<el-table-column label="入库数量" align="center" prop="instockQty"/>
<el-table-column label="质检标识" align="center" prop="isInspection">
<!-- <el-table-column label="质检标识" align="center" prop="isInspection">
<template #default="scope">
<dict-tag :options="wsm_is_inspection" :value="scope.row.isInspection"/>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column label="已分包数量" align="center" prop="printedNum" />
<el-table-column label="物料规格" align="center" prop="materialSpe"/>
<el-table-column label="计量单位名称" align="center" prop="unitName"/>

@ -19,7 +19,7 @@
<el-form-item label="分包数量" prop="apportionQty">
<el-input v-model="queryParams.apportionQty" placeholder="请输入分包数量" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="物料" prop="materialId">
<!-- <el-form-item label="物料" prop="materialId">
<el-select v-model="queryParams.materialId" placeholder="请选择物料">
<el-option
v-for="item in materialList"
@ -28,29 +28,29 @@
:value="item.materialId"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<!-- <el-form-item label="物料编码" prop="materialCode">
<el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="物料名称" prop="materialName">
<!-- <el-form-item label="物料名称" prop="materialName">
<el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料规格" prop="materialSpe">
</el-form-item>-->
<!-- <el-form-item label="物料规格" prop="materialSpe">
<el-input v-model="queryParams.materialSpe" placeholder="请输入物料规格" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="计量单位名称" prop="unitName" label-width="120px">
<el-input v-model="queryParams.unitName" placeholder="请输入计量单位名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="是否有条码" prop="codeYesNo" label-width="120px">
<el-select v-model="queryParams.codeYesNo" placeholder="请选择物料大类">
<el-option
v-for="dict in wms_barcode_if"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<!-- <el-form-item label="是否有条码" prop="codeYesNo" label-width="120px">-->
<!-- <el-select v-model="queryParams.codeYesNo" placeholder="请选择物料大类">-->
<!-- <el-option-->
<!-- v-for="dict in wms_barcode_if"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料大类" prop="materialCategoryId">-->
<!-- <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类">-->
@ -75,15 +75,15 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:instockPrint:add']"></el-button>
<!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:instockPrint:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:instockPrint:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:instockPrint:remove']"></el-button>
<el-col :span="1.5">-->
<!-- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:instockPrint:remove']"></el-button>
</el-col>
<el-col :span="1.5">
<el-col :span="1.5">-->
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:instockPrint:export']"></el-button>
</el-col>
<el-col :span="1.5">

@ -220,7 +220,7 @@ 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: 7, label: `物料大类`, visible: false },
{ key: 8, label: `出库人`, visible: true },
{ key: 9, label: `提交时间`, visible: true },
{ key: 10, label: `erp同步状态`, visible: false },

@ -404,7 +404,7 @@ const columns = ref<FieldOption[]>([
{ key: 4, label: `实际退库人`, visible: true },
{ key: 5, label: `实际退库时间`, visible: true },
{ key: 6, label: `物料名称`, visible: true },
{ key: 7, label: `物料大类`, visible: true },
{ key: 7, label: `物料大类`, visible: false },
{ key: 8, label: `批次条码`, visible: true },
{ key: 9, label: `计划数量`, visible: true },
{ key: 10, label: `仓库名称`, visible: true },

Loading…
Cancel
Save