增加 调拨,修改页面字段

master
wanghao 3 months ago
parent 6893baac23
commit 796a0154b0

@ -0,0 +1,77 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { HppTransferVO, HppTransferForm, HppTransferQuery } from '@/api/wms/hppTransfer/types';
/**
*
* @param query
* @returns {*}
*/
export const listHppTransfer = (query?: HppTransferQuery): AxiosPromise<HppTransferVO[]> => {
return request({
url: '/wms/hppTransfer/list',
method: 'get',
params: query
});
};
/**
*
* @param transferId
*/
export const getHppTransfer = (transferId: string | number): AxiosPromise<HppTransferVO> => {
return request({
url: '/wms/hppTransfer/' + transferId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addHppTransfer = (data: HppTransferForm) => {
return request({
url: '/wms/hppTransfer',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updateHppTransfer = (data: HppTransferForm) => {
return request({
url: '/wms/hppTransfer',
method: 'put',
data: data
});
};
/**
*
* @param transferId
*/
export const delHppTransfer = (transferId: string | number | Array<string | number>) => {
return request({
url: '/wms/hppTransfer/' + transferId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getWmsHppTransferList (query) {
return request({
url: '/wms/hppTransfer/getWmsHppTransferList',
method: 'get',
params: query
});
};

@ -0,0 +1,114 @@
export interface HppTransferVO {
/**
*
*/
transferId: string | number;
/**
* ID
*/
materialId: string | number;
/**
*
*/
cardNo: string;
/**
*
*/
shelfNo: string;
/**
*
*/
storePlaceCode: string;
/**
*
*/
transferPlaceCode: string;
/**
*
*/
createBy: number;
/**
*
*/
createTime: string;
}
export interface HppTransferForm extends BaseEntity {
/**
*
*/
transferId: string | number;
/**
* ID
*/
materialId?: string | number;
/**
*
*/
cardNo?: string;
/**
*
*/
shelfNo?: string;
/**
*
*/
storePlaceCode?: string;
/**
*
*/
transferPlaceCode?: string;
}
export interface HppTransferQuery extends PageQuery {
/**
*
*/
transferId: string | number;
/**
* ID
*/
materialId?: string | number;
/**
*
*/
cardNo?: string;
/**
*
*/
shelfNo?: string;
/**
*
*/
storePlaceCode?: string;
/**
*
*/
transferPlaceCode?: string;
/**
*
*/
params?: any;
}

@ -7,7 +7,7 @@
<el-form-item label="流水卡号" prop="cardNo">
<el-input v-model="queryParams.cardNo" placeholder="请输入流水卡号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工装架子号" prop="shelfNo">
<el-form-item label="架子号" prop="shelfNo">
<el-input v-model="queryParams.shelfNo" placeholder="请输入工装架子号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="库位" prop="storePlaceId">

@ -11,8 +11,8 @@
<el-form-item label="库位代码" prop="storePlaceCode">
<el-input v-model="queryParams.storePlaceCode" placeholder="请输入库位代码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="特殊库位" prop="specitialType">
<el-select v-model="queryParams.specitialType" placeholder="请选择特殊库位" clearable >
<el-form-item label="工装类型" prop="specitialType">
<el-select v-model="queryParams.specitialType" placeholder="请选择工装类型" clearable >
<el-option v-for="dict in wms_specitial_location" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
@ -53,13 +53,13 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="库位名" align="center" prop="storePlaceName" v-if="columns[6].visible"/>
<el-table-column label="库位代码" align="center" prop="storePlaceCode" v-if="columns[7].visible"/>
<el-table-column label="仓库id" align="center" prop="storeId" v-if="columns[8].visible"/>
<el-table-column label="所属仓库" align="center" prop="storeName" v-if="columns[8].visible"/>
<el-table-column label="使用状态" align="center" prop="usedFlag" v-if="columns[9].visible">
<template #default="scope">
<dict-tag :options="wms_halfproduct_used" :value="scope.row.usedFlag"/>
</template>
</el-table-column>
<el-table-column label="特殊库位" align="center" prop="specitialType" v-if="columns[10].visible">
<el-table-column label="工装类型" align="center" prop="specitialType" v-if="columns[10].visible">
<template #default="scope">
<dict-tag :options="wms_specitial_location" :value="scope.row.specitialType"/>
</template>
@ -92,7 +92,7 @@
<el-form-item label="库位代码" prop="storePlaceCode">
<el-input v-model="form.storePlaceCode" placeholder="请输入库位代码" />
</el-form-item>
<el-form-item label="仓库id" prop="storeId">
<el-form-item label="所属仓库" prop="storeId">
<el-select v-model="form.storeId" placeholder="请选择所属仓库">
<el-option
v-for="item in StoreList"
@ -102,8 +102,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="特殊库位" prop="specitialType">
<el-select v-model="form.specitialType" placeholder="请选择特殊库位">
<el-form-item label="工装类型" prop="specitialType">
<el-select v-model="form.specitialType" placeholder="请选择工装类型">
<el-option
v-for="dict in wms_specitial_location"
:key="dict.value"
@ -167,9 +167,9 @@ const columns = ref<FieldOption[]>([
{ key: 5, label: `租户`, visible: true },
{ key: 6, label: `库位名`, visible: true },
{ key: 7, label: `库位代码`, visible: true },
{ key: 8, label: `仓库id`, visible: true },
{ key: 8, label: `所属仓库`, visible: true },
{ key: 9, label: `使用状态`, visible: true },
{ key: 10, label: `特殊库位`, visible: true },
{ key: 10, label: `工装类型`, visible: true },
{ key: 11, label: `位置类型`, visible: true },
]);
@ -198,23 +198,23 @@ const data = reactive<PageData<HppStorePlaceForm, HppStorePlaceQuery>>({
}
},
rules: {
objId: [
{ required: true, message: "主键id不能为空", trigger: "blur" }
],
storePlaceName: [
{ required: true, message: "库位名不能为空", trigger: "blur" }
],
// objId: [
// { required: true, message: "id", trigger: "blur" }
// ],
// storePlaceName: [
// { required: true, message: "", trigger: "blur" }
// ],
storePlaceCode: [
{ required: true, message: "库位代码不能为空", trigger: "blur" }
],
// storeId: [
// { required: true, message: "id", trigger: "blur" }
// { required: true, message: "", trigger: "blur" }
// ],
usedFlag: [
{ required: true, message: "使用状态不能为空", trigger: "blur" }
],
specitialType: [
{ required: true, message: "特殊库位不能为空", trigger: "change" }
{ required: true, message: "工装类型不能为空", trigger: "change" }
],
positionType: [
{ required: true, message: "位置类型不能为空", trigger: "change" }

@ -0,0 +1,267 @@
<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="物料ID" prop="materialId">
<el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="流水卡号" prop="cardNo">
<el-input v-model="queryParams.cardNo" placeholder="请输入流水卡号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工装号" prop="shelfNo">
<el-input v-model="queryParams.shelfNo" placeholder="请输入工装架子号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="库位编码" prop="storePlaceCode">
<el-input v-model="queryParams.storePlaceCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="调拨库位" prop="transferPlaceCode">
<el-input v-model="queryParams.transferPlaceCode" 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>
</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="['wms:hppTransfer:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:hppTransfer:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:hppTransfer:remove']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:hppTransfer: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="hppTransferList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="表主键" align="center" prop="transferId" v-if="columns[0].visible"/>
<el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[2].visible"/>
<el-table-column label="流水卡号" align="center" prop="cardNo" v-if="columns[3].visible"/>
<el-table-column label="工装架子号" align="center" prop="shelfNo" v-if="columns[4].visible"/>
<el-table-column label="库位编码" align="center" prop="storePlaceCode" v-if="columns[5].visible"/>
<el-table-column label="调拨库位" align="center" prop="transferPlaceCode" v-if="columns[6].visible"/>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<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="['wms:hppTransfer:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:hppTransfer: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="hppTransferFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="物料ID" prop="materialId">
<el-input v-model="form.materialId" placeholder="请输入物料ID" />
</el-form-item>
<el-form-item label="流水卡号" prop="cardNo">
<el-input v-model="form.cardNo" placeholder="请输入流水卡号" />
</el-form-item>
<el-form-item label="工装号" prop="shelfNo">
<el-input v-model="form.shelfNo" placeholder="请输入工装架子号" />
</el-form-item>
<el-form-item label="库位编码" prop="storePlaceCode">
<el-input v-model="form.storePlaceCode" placeholder="请输入库位编码" />
</el-form-item>
<el-form-item label="调拨库位" prop="transferPlaceCode">
<el-input v-model="form.transferPlaceCode" placeholder="请输入调拨库位" />
</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="HppTransfer" lang="ts">
import { listHppTransfer, getHppTransfer, delHppTransfer, addHppTransfer, updateHppTransfer } from '@/api/wms/hppTransfer';
import { HppTransferVO, HppTransferQuery, HppTransferForm } from '@/api/wms/hppTransfer/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const hppTransferList = ref<HppTransferVO[]>([]);
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 hppTransferFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `表主键`, visible: false },
{ key: 1, label: `租户号`, visible: false },
{ key: 2, label: `物料ID`, visible: false },
{ key: 3, label: `流水卡号`, 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: `更新时间`, visible: true },
{ key: 11, label: `创建部门`, visible: true },
]);
const initFormData: HppTransferForm = {
transferId: undefined,
materialId: undefined,
cardNo: undefined,
shelfNo: undefined,
storePlaceCode: undefined,
transferPlaceCode: undefined,
}
const data = reactive<PageData<HppTransferForm, HppTransferQuery>>({
form: {...initFormData},
queryParams: {
transferId: undefined,
pageNum: 1,
pageSize: 10,
materialId: undefined,
cardNo: undefined,
shelfNo: undefined,
storePlaceCode: undefined,
transferPlaceCode: undefined,
params: {
}
},
rules: {
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询半成品调拨列表 */
const getList = async () => {
loading.value = true;
const res = await listHppTransfer(queryParams.value);
hppTransferList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
hppTransferFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: HppTransferVO[]) => {
ids.value = selection.map(item => item.transferId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加半成品调拨";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: HppTransferVO) => {
reset();
const _transferId = row?.transferId || ids.value[0]
const res = await getHppTransfer(_transferId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改半成品调拨";
}
/** 提交按钮 */
const submitForm = () => {
hppTransferFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.transferId) {
await updateHppTransfer(form.value).finally(() => buttonLoading.value = false);
} else {
await addHppTransfer(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: HppTransferVO) => {
const _transferIds = row?.transferId || ids.value;
await proxy?.$modal.confirm('是否确认删除半成品调拨编号为"' + _transferIds + '"的数据项?').finally(() => loading.value = false);
await delHppTransfer(_transferIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('wms/hppTransfer/export', {
...queryParams.value
}, `hppTransfer_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>

@ -271,7 +271,9 @@
placeholder="请点击检索物料"
@click="handleMaterialAdd('material', scope.$index)">
<template #append>
<el-icon class="el-input__icon"><search/></el-icon>
<el-icon class="el-input__icon">
<search/>
</el-icon>
</template>
</el-input>
</template>
@ -441,7 +443,8 @@
v-for="dict in wms_barcode_if"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="已包数量" prop="printedNum">
@ -484,7 +487,13 @@
</template>
<script setup name="Linkage" lang="ts">
import { listWmsPurchaseOrder, getWmsPurchaseOrder, delWmsPurchaseOrder, addWmsPurchaseOrder, updateWmsPurchaseOrder } from '@/api/wms/wmsPurchaseOrder';
import {
listWmsPurchaseOrder,
getWmsPurchaseOrder,
delWmsPurchaseOrder,
addWmsPurchaseOrder,
updateWmsPurchaseOrder
} from '@/api/wms/wmsPurchaseOrder';
import {WmsPurchaseOrderVO, WmsPurchaseOrderQuery, WmsPurchaseOrderForm} from '@/api/wms/wmsPurchaseOrder/types';
import {reactive, onMounted} from 'vue'
import {ElMessage, ElMessageBox} from 'element-plus'
@ -492,13 +501,23 @@ import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
import {UserVO} from "@/api/system/user/types";
import {listUser} from "@/api/system/user";
import {getBaseSupplierInfoList} from '@/api/mes/baseSupplierInfo'
import { listWmsPurchaseOrderDetail, getWmsPurchaseOrderDetail, delWmsPurchaseOrderDetail, addWmsPurchaseOrderDetail, updateWmsPurchaseOrderDetail } from '@/api/wms/wmsPurchaseOrderDetail';
import { WmsPurchaseOrderDetailVO, WmsPurchaseOrderDetailQuery, WmsPurchaseOrderDetailForm } from '@/api/wms/wmsPurchaseOrderDetail/types';
import {
listWmsPurchaseOrderDetail,
getWmsPurchaseOrderDetail,
delWmsPurchaseOrderDetail,
addWmsPurchaseOrderDetail,
updateWmsPurchaseOrderDetail
} from '@/api/wms/wmsPurchaseOrderDetail';
import {
WmsPurchaseOrderDetailVO,
WmsPurchaseOrderDetailQuery,
WmsPurchaseOrderDetailForm
} from '@/api/wms/wmsPurchaseOrderDetail/types';
import {
getMaterialList, getInstockMaterialList
} from '@/api/wms/linkage'
import {getBaseMaterialCategoryListInWMS} from '@/api/wms/baseMaterialCategory';
const showSearch = ref(true);
const {proxy} = getCurrentInstance() as ComponentInternalInstance;
const {
wms_barcode_if,
@ -515,6 +534,7 @@ interface User {
name: string
address: string
}
let supplierList = ref([])
const parentTableTotal = ref(0)
const dialogVisible = ref(false)
@ -619,7 +639,6 @@ getParentTable()
// Object.assign(childrenTableInfoForm.value, res.data);
// }
//
const query = async () => {

Loading…
Cancel
Save