Merge remote-tracking branch 'origin/master'

master
夜笙歌 7 days ago
commit b71b68a527

@ -16,6 +16,20 @@ export const listInventory = (query?: InventoryQuery): AxiosPromise<InventoryVO[
});
};
/**
*
* @param query
* @returns {*}
*/
export const listInventoryAlarm = (query?: InventoryQuery): AxiosPromise<InventoryVO[]> => {
return request({
url: '/wms/inventory/listInventoryAlarm',
method: 'get',
params: query
});
};
/**
*
* @param inventoryId

@ -84,7 +84,7 @@ export const constantRoutes: RouteRecordRaw[] = [
path: 'instockDetail',
component: () => import('@/views/wms/instockDetail/index.vue'),
name: 'instockDetail',
meta: { title: '入库明细', icon: 'dashboard', affix: true },
meta: { title: '入库明细', icon: 'dashboard'},
hidden: true
}
]
@ -98,7 +98,7 @@ export const constantRoutes: RouteRecordRaw[] = [
path: 'allocateOrderDetail',
component: () => import('@/views/wms/allocateOrderDetail/index.vue'),
name: 'allocateOrderDetail',
meta: { title: '调拨单明细', icon: 'dashboard', affix: true },
meta: { title: '调拨单明细', icon: 'dashboard'},
hidden: true
}
]
@ -112,7 +112,7 @@ export const constantRoutes: RouteRecordRaw[] = [
path: 'outStockDetail',
component: () => import('@/views/wms/outstockDetail/index.vue'),
name: 'outstockDetail',
meta: { title: '出库明细', icon: 'dashboard', affix: true },
meta: { title: '出库明细', icon: 'dashboard' },
hidden: true
}
]
@ -218,22 +218,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
meta: { title: '请假申请', activeMenu: '/workflow/leave', noCache: true }
}
]
},
{
path: '/mes/product-plan',
component: Layout,
hidden: true,
permissions: ['mes:orderInfo:edit'],
children: [
{
path: 'index/:productOrderId(\\d+)',
component: () => import('@/views/mes/orderInfo/editProductPlan.vue'),
name: 'productPlanEdit',
meta: { title: '生产派工', activeMenu: '/mes/productplan', noCache: true }
}
]
},
];
/**

@ -393,15 +393,15 @@ const data = reactive<PageData<AllocateOrderForm, AllocateOrderQuery>>({
auditComments: [
{ required: true, message: "审核意见不能为空", trigger: "blur" }
],
createOut: [
{ required: true, message: "是否创建出库单不能为空", trigger: "blur" }
],
// createOut: [
// { required: true, message: "", trigger: "blur" }
// ],
outCode: [
{ required: true, message: "出库单号不能为空", trigger: "blur" }
],
createIn: [
{ required: true, message: "是否创建入库单不能为空", trigger: "blur" }
],
// createIn: [
// // { required: true, message: "", trigger: "blur" }
// ],
inCode: [
{ required: true, message: "入库单号不能为空", trigger: "blur" }
],

@ -0,0 +1,365 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="表主键" prop="inventoryId">
<el-input v-model="queryParams.inventoryId" placeholder="请输入表主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="批次码" prop="batchCode">
<el-input v-model="queryParams.batchCode" 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="locationCode">
<el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料大类" prop="materialCategories">
<el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="库存数量" prop="inventoryQty">
<el-input v-model="queryParams.inventoryQty" placeholder="请输入库存数量" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="锁定状态" prop="lockState">
<el-input v-model="queryParams.lockState" placeholder="请输入锁定状态" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="库存状态" prop="inventoryStatus">
<el-select v-model="queryParams.inventoryStatus" placeholder="请选择库存状态" clearable >
<el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item> -->
<el-form-item label="仓库ID" prop="storeId">
<el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
<el-option
v-for="item in baseStoreList"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<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:inventory:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:inventory:edit']"></el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:inventory:remove']"></el-button>
</el-col> -->
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:inventory:export']"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="inventoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="表主键" align="center" prop="inventoryId" v-if="columns[0].visible"/> -->
<el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[2].visible"/>
<!-- <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[3].visible"/> -->
<el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[4].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="material_mategories" :value="scope.row.materialCategories"/>
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="inventoryQty" v-if="columns[6].visible"/>
<el-table-column label="锁定状态" align="center" prop="lockState" v-if="columns[8].visible">
<template #default="scope">
<dict-tag :options="lock_state" :value="scope.row.lockState"/>
</template>
</el-table-column>
<el-table-column label="库存状态" align="center" prop="inventoryStatus" v-if="columns[9].visible">
<template #default="scope">
<dict-tag :options="inventory_status" :value="scope.row.inventoryStatus"/>
</template>
</el-table-column>
<el-table-column label="仓库ID" align="center" prop="warehouseCode" v-if="columns[10].visible"/>
<el-table-column label="上限" align="center" prop="maxStockAmount"/>
<el-table-column label="下限" align="center" prop="minStockAmount"/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:inventory:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:inventory:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column> -->
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改物料库存对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="inventoryFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="表主键" prop="inventoryId">
<el-input v-model="form.inventoryId" placeholder="请输入表主键" />
</el-form-item>
<el-form-item label="批次码" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次码" />
</el-form-item>
<el-form-item label="物料id" prop="materialId">
<el-input v-model="form.materialId" placeholder="请输入物料id" />
</el-form-item>
<el-form-item label="库位编码" prop="locationCode">
<el-input v-model="form.locationCode" placeholder="请输入库位编码" />
</el-form-item>
<el-form-item label="物料大类" prop="materialCategories">
<el-input v-model="form.materialCategories" placeholder="请输入物料大类" />
</el-form-item>
<el-form-item label="库存数量" prop="inventoryQty">
<el-input v-model="form.inventoryQty" placeholder="请输入库存数量" />
</el-form-item>
<!-- <el-form-item label="锁定状态" prop="lockState">
<el-input v-model="form.lockState" placeholder="请输入锁定状态" />
</el-form-item>
<el-form-item label="库存状态" prop="inventoryStatus">
<el-radio-group v-model="form.inventoryStatus">
<el-radio
v-for="dict in ${dictType}"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item> -->
<el-form-item label="仓库ID" prop="storeId">
<el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
<el-option
v-for="item in baseStoreList"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
></el-option>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Inventory" lang="ts">
import { listInventory, getInventory, delInventory, addInventory, updateInventory, listInventoryAlarm } from '@/api/wms/inventory';
import { InventoryVO, InventoryQuery, InventoryForm } from '@/api/wms/inventory/types';
import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { lock_state, inventory_status, material_mategories } = toRefs<any>(proxy?.useDict('lock_state', 'inventory_status', 'material_mategories'));
const inventoryList = ref<InventoryVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const inventoryFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `表主键`, visible: true },
{ key: 1, label: `租户号`, visible: true },
{ key: 2, label: `批次码`, visible: true },
{ key: 3, label: `物料id`, visible: true },
{ key: 4, label: `库位编码`, visible: true },
{ key: 5, label: `物料大类`, visible: true },
{ key: 6, label: `库存数量`, visible: true },
{ key: 7, label: `更新时间`, visible: true },
{ key: 8, label: `锁定状态`, visible: true },
{ key: 9, label: `库存状态`, visible: true },
{ key: 10, label: `仓库ID`, visible: true },
// { key: 11, label: `${comment}`, visible: true },
// { key: 12, label: `${comment}`, visible: true },
// { key: 13, label: `${comment}`, visible: true },
]);
const initFormData: InventoryForm = {
inventoryId: undefined,
batchCode: undefined,
materialId: undefined,
locationCode: undefined,
materialCategories: undefined,
inventoryQty: undefined,
lockState: undefined,
inventoryStatus: undefined,
storeId: undefined,
}
const data = reactive<PageData<InventoryForm, InventoryQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
inventoryId: undefined,
batchCode: undefined,
materialId: undefined,
locationCode: undefined,
materialCategories: undefined,
inventoryQty: undefined,
lockState: undefined,
inventoryStatus: undefined,
storeId: undefined,
params: {
}
},
rules: {
inventoryId: [
{ required: true, message: "表主键不能为空", trigger: "blur" }
],
batchCode: [
{ required: true, message: "批次码不能为空", trigger: "blur" }
],
materialId: [
{ required: true, message: "物料id不能为空", trigger: "blur" }
],
locationCode: [
{ required: true, message: "库位编码不能为空", trigger: "blur" }
],
materialCategories: [
{ required: true, message: "物料大类不能为空", trigger: "blur" }
],
inventoryQty: [
{ required: true, message: "库存数量不能为空", trigger: "blur" }
],
lockState: [
{ required: true, message: "锁定状态不能为空", trigger: "blur" }
],
inventoryStatus: [
{ required: true, message: "库存状态不能为空", trigger: "change" }
],
storeId: [
{ required: true, message: "仓库ID不能为空", trigger: "blur" }
],
}
});
const { queryParams, form, rules } = toRefs(data);
let baseStoreList = ref([]);
/** 查询车间下拉树结构 */
const getBaseWarehouseListsss = async () => {
let res = await getBaseWarehouseList(null);
baseStoreList.value = res.data;
};
/** 查询物料库存告警列表 */
const getList = async () => {
loading.value = true;
const res = await listInventoryAlarm(queryParams.value);
inventoryList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
inventoryFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: InventoryVO[]) => {
ids.value = selection.map(item => item.inventoryId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加物料库存";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: InventoryVO) => {
reset();
const _inventoryId = row?.inventoryId || ids.value[0]
const res = await getInventory(_inventoryId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改物料库存";
}
/** 提交按钮 */
const submitForm = () => {
inventoryFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.inventoryId) {
await updateInventory(form.value).finally(() => buttonLoading.value = false);
} else {
await addInventory(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: InventoryVO) => {
const _inventoryIds = row?.inventoryId || ids.value;
await proxy?.$modal.confirm('是否确认删除物料库存编号为"' + _inventoryIds + '"的数据项?').finally(() => loading.value = false);
await delInventory(_inventoryIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('wms/inventory/export', {
...queryParams.value
}, `inventory_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getBaseWarehouseListsss();
getList();
});
</script>
Loading…
Cancel
Save