yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(wms): 出库单主子表增加，出库选中物料计算

Browse Source
dev
wanghao 1 month ago
parent 644e755d0c
commit 08dc5e3730
12 changed files with 273 additions and 134 deletions
Show Stats Download Patch File Download Diff File

6
src/api/wms/outStockBill/types.ts
Unescape Escape View File

@ -93,7 +93,6 @@ export interface OutStockBillVO {
* 更新时间 * 更新时间
*/ */
updateTime: string; updateTime: string;
} }
export interface OutStockBillForm extends BaseEntity { export interface OutStockBillForm extends BaseEntity {
@ -147,11 +146,9 @@ export interface OutStockBillForm extends BaseEntity {
* 出库(单状态1暂存 2审批中 3完成) * 出库(单状态1暂存 2审批中 3完成)
*/ */
outStockBillStatus?: string; outStockBillStatus?: string;
} }
export interface OutStockBillQuery extends PageQuery { export interface OutStockBillQuery extends PageQuery {
/** /**
* 出库单类型 * 出库单类型
*/ */
@ -192,6 +189,3 @@ export interface OutStockBillQuery extends PageQuery {
*/ */
params?: any; params?: any;
} }

16
src/api/wms/outStockDetails/index.ts
Unescape Escape View File

@ -1,6 +1,6 @@
import request from '@/utils/request'; import request from '@/utils/request';
import { AxiosPromise } from 'axios'; import { AxiosPromise } from 'axios';
import { OutStockDetailsVO, OutStockDetailsForm, OutStockDetailsQuery } from '@/api/wms/outStockDetails/types'; import { OutStockDetailsForm, OutStockDetailsQuery, OutStockDetailsVO } from '@/api/wms/outStockDetails/types';
/** /**
* 查询出库单明细列表 * 查询出库单明细列表
@ -67,10 +67,10 @@ export const delOutStockDetails = (outStockDetailsId: string | number | Array<st
* @param query * @param query
* @returns {*} * @returns {*}
*/ */
export function getWmsOutStockDetailsList (query) { export function getWmsOutStockDetailsList(query) {
return request({ return request({
url: '/wms/outStockDetails/getWmsOutStockDetailsList', url: '/wms/outStockDetails/getWmsOutStockDetailsList',
method: 'get', method: 'get',
params: query params: query
}); });
}; }

6
src/api/wms/warehouseInfo/types.ts
Unescape Escape View File

@ -20,7 +20,7 @@ export interface WarehouseInfoVO {
warehouseName: string; warehouseName: string;
/** /**
* 仓库类型（1原材料 8样品 9成品） * 仓库类型（1原材料 8样品 9物料）
*/ */
warehouseType: string; warehouseType: string;
@ -92,7 +92,7 @@ export interface WarehouseInfoForm extends BaseEntity {
warehouseName?: string; warehouseName?: string;
/** /**
* 仓库类型（1原材料 8样品 9成品） * 仓库类型（1原材料 8样品 9物料）
*/ */
warehouseType?: string; warehouseType?: string;
@ -124,7 +124,7 @@ export interface WarehouseInfoQuery extends PageQuery {
warehouseName?: string; warehouseName?: string;
/** /**
* 仓库类型（1原材料 8样品 9成品） * 仓库类型（1原材料 8样品 9物料）
*/ */
warehouseType?: string; warehouseType?: string;

12
src/api/wms/wmsBaseProduct/index.ts
Unescape Escape View File

@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios';
import { WmsBaseProductForm, WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types'; import { WmsBaseProductForm, WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types';
/** /**
* 查询海威成品信息列表 * 查询海威物料信息列表
* @param query * @param query
* @returns {*} * @returns {*}
*/ */
@ -17,7 +17,7 @@ export const listWmsBaseProduct = (query?: WmsBaseProductQuery): AxiosPromise<Wm
}; };
/** /**
* 查询海威成品信息详细 * 查询海威物料信息详细
* @param productId * @param productId
*/ */
export const getWmsBaseProduct = (productId: string | number): AxiosPromise<WmsBaseProductVO> => { export const getWmsBaseProduct = (productId: string | number): AxiosPromise<WmsBaseProductVO> => {
@ -28,7 +28,7 @@ export const getWmsBaseProduct = (productId: string | number): AxiosPromise<WmsB
}; };
/** /**
* 新增海威成品信息 * 新增海威物料信息
* @param data * @param data
*/ */
export const addWmsBaseProduct = (data: WmsBaseProductForm) => { export const addWmsBaseProduct = (data: WmsBaseProductForm) => {
@ -40,7 +40,7 @@ export const addWmsBaseProduct = (data: WmsBaseProductForm) => {
}; };
/** /**
* 修改海威成品信息 * 修改海威物料信息
* @param data * @param data
*/ */
export const updateWmsBaseProduct = (data: WmsBaseProductForm) => { export const updateWmsBaseProduct = (data: WmsBaseProductForm) => {
@ -52,7 +52,7 @@ export const updateWmsBaseProduct = (data: WmsBaseProductForm) => {
}; };
/** /**
* 删除海威成品信息 * 删除海威物料信息
* @param productId * @param productId
*/ */
export const delWmsBaseProduct = (productId: string | number | Array<string | number>) => { export const delWmsBaseProduct = (productId: string | number | Array<string | number>) => {
@ -63,7 +63,7 @@ export const delWmsBaseProduct = (productId: string | number | Array<string | nu
}; };
/** /**
* 下拉框查询海威成品信息列表 * 下拉框查询海威物料信息列表
* @param query * @param query
* @returns {*} * @returns {*}
*/ */

16
src/api/wms/wmsBaseProduct/types.ts
Unescape Escape View File

@ -10,17 +10,17 @@ export interface WmsBaseProductVO {
tenantId: string | number; tenantId: string | number;
/** /**
* 成品编码 * 物料编码
*/ */
productCode: string; productCode: string;
/** /**
* 成品名称 * 物料名称
*/ */
productName: string; productName: string;
/** /**
* 成品描述 * 物料描述
*/ */
productSpe: string; productSpe: string;
@ -84,18 +84,18 @@ export interface WmsBaseProductForm extends BaseEntity {
productId?: string | number; productId?: string | number;
/** /**
* 成品编码 * 物料编码
*/ */
productCode?: string; productCode?: string;
externalBrand?: string; externalBrand?: string;
/** /**
* 成品名称 * 物料名称
*/ */
productName?: string; productName?: string;
/** /**
* 成品描述 * 物料描述
*/ */
productSpe?: string; productSpe?: string;
@ -129,12 +129,12 @@ export interface WmsBaseProductForm extends BaseEntity {
export interface WmsBaseProductQuery extends PageQuery { export interface WmsBaseProductQuery extends PageQuery {
/** /**
* 成品编码 * 物料编码
*/ */
productCode?: string; productCode?: string;
/** /**
* 成品名称 * 物料名称
*/ */
productName?: string; productName?: string;
externalBrand?: string; externalBrand?: string;

76
src/components/WmsInventorySelect/index.vue
Unescape Escape View File

@ -13,7 +13,8 @@
<el-form-item label="物料名称" prop="materialName"> <el-form-item label="物料名称" prop="materialName">
<el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item label="仓库" prop="warehouseId" v-if="!prop.warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable filterable> <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable filterable>
<el-option <el-option
v-for="warehouse in warehouseList" v-for="warehouse in warehouseList"
@ -63,9 +64,9 @@
<vxe-column type="checkbox" width="50" align="center" /> <vxe-column type="checkbox" width="50" align="center" />
<vxe-column key="warehouseName" title="仓库" align="center" field="warehouseName" /> <vxe-column key="warehouseName" title="仓库" align="center" field="warehouseName" />
<vxe-column key="batchNumber" title="批次号" align="center" field="batchNumber" /> <vxe-column key="batchNumber" title="批次号" align="center" field="batchNumber" />
<vxe-column key="productCode" title="成品编码" align="center" field="productCode" /> <vxe-column key="productCode" title="物料编码" align="center" field="productCode" />
<vxe-column key="productName" title="成品名称" align="center" field="productName" /> <vxe-column key="productName" title="物料名称" align="center" field="productName" />
<vxe-column key="productSpe" title="成品描述" align="center" field="productSpe" /> <vxe-column key="productSpe" title="物料描述" align="center" field="productSpe" />
<vxe-column key="externalBrand" title="外部品牌" align="center" field="externalBrand" /> <vxe-column key="externalBrand" title="外部品牌" align="center" field="externalBrand" />
<vxe-column key="inventoryAmount" title="库存数量" align="center" field="inventoryAmount" /> <vxe-column key="inventoryAmount" title="库存数量" align="center" field="inventoryAmount" />
<vxe-column key="unitPrice" title="单价" align="center" field="unitPrice" /> <vxe-column key="unitPrice" title="单价" align="center" field="unitPrice" />
@ -102,13 +103,16 @@ interface PropType {
modelValue?: InventoryDetailsVO[] | InventoryDetailsVO | undefined; modelValue?: InventoryDetailsVO[] | InventoryDetailsVO | undefined;
multiple?: boolean; multiple?: boolean;
data?: string | number | (string | number)[] | undefined; data?: string | number | (string | number)[] | undefined;
warehouseId?: string | number;
} }
const prop = withDefaults(defineProps<PropType>(), { const prop = withDefaults(defineProps<PropType>(), {
multiple: true, multiple: true,
modelValue: undefined, modelValue: undefined,
data: undefined data: undefined,
warehouseId: undefined
}); });
const emit = defineEmits(['update:modelValue', 'confirmCallBack']); const emit = defineEmits(['update:modelValue', 'confirmCallBack']);
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -199,32 +203,6 @@ const handleQuery = () => {
getList(); getList();
}; };
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
queryParams.value.productName = undefined;
queryParams.value.productCode = undefined;
queryParams.value.warehouseId = undefined;
queryParams.value.batchNumber = undefined;
handleQuery();
};
const handleCheckboxChange = (checked) => {
if (!prop.multiple && checked.checked) {
tableRef.value?.setCheckboxRow(selectInventoryList.value, false);
selectInventoryList.value = [];
}
const row = checked.row;
if (checked.checked) {
selectInventoryList.value.push(row);
} else {
selectInventoryList.value = selectInventoryList.value.filter((item) => {
return item.inventoryDetailsId !== row.inventoryDetailsId;
});
}
};
const handleCheckboxAll = (checked) => { const handleCheckboxAll = (checked) => {
const rows = inventoryDetailsList.value; const rows = inventoryDetailsList.value;
if (checked.checked) { if (checked.checked) {
@ -265,22 +243,58 @@ const initSelectInventory = async () => {
const close = () => { const close = () => {
inventoryDialog.closeDialog(); inventoryDialog.closeDialog();
}; };
// ... existing code ...
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
queryParams.value.productName = undefined;
queryParams.value.productCode = undefined;
// 不重置仓库ID，保留传入的筛选条件
if (!prop.warehouseId) {
queryParams.value.warehouseId = undefined;
}
queryParams.value.batchNumber = undefined;
handleQuery();
};
const handleCheckboxChange = (checked) => {
if (!prop.multiple && checked.checked) {
tableRef.value?.setCheckboxRow(selectInventoryList.value, false);
selectInventoryList.value = [];
}
const row = checked.row;
if (checked.checked) {
selectInventoryList.value.push(row);
} else {
selectInventoryList.value = selectInventoryList.value.filter((item) => {
return item.inventoryDetailsId !== row.inventoryDetailsId;
});
}
};
// ... existing code ...
watch( watch(
() => inventoryDialog.visible.value, () => inventoryDialog.visible.value,
async (newValue: boolean) => { async (newValue: boolean) => {
if (newValue) { if (newValue) {
// 重新设置仓库ID筛选条件
if (prop.warehouseId) {
queryParams.value.warehouseId = prop.warehouseId;
}
await getList(); await getList();
await getWarehouseList(); await getWarehouseList();
await initSelectInventory(); await initSelectInventory();
} else { } else {
tableRef.value?.clearCheckboxReserve(); tableRef.value?.clearCheckboxReserve();
tableRef.value?.clearCheckboxRow(); tableRef.value?.clearCheckboxRow();
// 修改重置逻辑，保留传入的仓库ID
resetQuery(); resetQuery();
selectInventoryList.value = []; selectInventoryList.value = [];
} }
} }
); );
// ... existing code ...
defineExpose({ defineExpose({
open: inventoryDialog.openDialog, open: inventoryDialog.openDialog,

20
src/components/WmsProductSelect/index.vue
Unescape Escape View File

@ -7,11 +7,11 @@
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="成品编码" prop="productCode"> <el-form-item label="物料编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入成品编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="成品名称" prop="productName"> <el-form-item label="物料名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="激活标识" prop="activeFlag"> <el-form-item label="激活标识" prop="activeFlag">
<el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable> <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
@ -47,9 +47,9 @@
@checkbox-change="handleCheckboxChange" @checkbox-change="handleCheckboxChange"
> >
<vxe-column type="checkbox" width="50" align="center" /> <vxe-column type="checkbox" width="50" align="center" />
<vxe-column key="productCode" title="成品编码" align="center" field="productCode" /> <vxe-column key="productCode" title="物料编码" align="center" field="productCode" />
<vxe-column key="productName" title="成品名称" align="center" field="productName" /> <vxe-column key="productName" title="物料名称" align="center" field="productName" />
<vxe-column key="productSpe" title="成品描述" align="center" field="productSpe" /> <vxe-column key="productSpe" title="物料描述" align="center" field="productSpe" />
<vxe-column key="unitName" title="单位" align="center" field="unitName" /> <vxe-column key="unitName" title="单位" align="center" field="unitName" />
<vxe-column key="purchasePrice" title="参考成本" align="center" field="purchasePrice" /> <vxe-column key="purchasePrice" title="参考成本" align="center" field="purchasePrice" />
<vxe-column key="foreignPrice" title="统一报价(参考)" align="center" field="foreignPrice" /> <vxe-column key="foreignPrice" title="统一报价(参考)" align="center" field="foreignPrice" />
@ -113,7 +113,7 @@ const queryFormRef = ref<ElFormInstance>();
const tableRef = ref<VxeTableInstance<WmsBaseProductVO>>(); const tableRef = ref<VxeTableInstance<WmsBaseProductVO>>();
const productDialog = useDialog({ const productDialog = useDialog({
title: '成品选择' title: '物料选择'
}); });
const queryParams = ref<WmsBaseProductQuery>({ const queryParams = ref<WmsBaseProductQuery>({
@ -149,7 +149,7 @@ const computedIds = (data) => {
} }
}; };
/** 查询成品信息列表 */ /** 查询物料信息列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
try { try {
@ -157,7 +157,7 @@ const getList = async () => {
wmsBaseProductList.value = res.rows; wmsBaseProductList.value = res.rows;
total.value = res.total; total.value = res.total;
} catch (error) { } catch (error) {
console.error('查询成品列表失败:', error); console.error('查询物料列表失败:', error);
} finally { } finally {
loading.value = false; loading.value = false;
} }

24
src/views/wms/inStockBill/index.vue
Unescape Escape View File

@ -221,9 +221,9 @@
<h4>已选择的物料：</h4> <h4>已选择的物料：</h4>
<el-table :data="selectedProducts" border> <el-table :data="selectedProducts" border>
<!-- <el-table-column prop="materialId" label="物料编码" width="120" header/>--> <!-- <el-table-column prop="materialId" label="物料编码" width="120" header/>-->
<el-table-column prop="productCode" label="成品编码" width="120" /> <el-table-column prop="productCode" label="物料编码" width="120" />
<el-table-column prop="productName" label="成品名称" width="120" /> <el-table-column prop="productName" label="物料名称" width="120" />
<el-table-column prop="productSpe" label="成品描述" width="120" /> <el-table-column prop="productSpe" label="物料描述" width="120" />
<el-table-column prop="batchNumber" label="批次号" width="150"> <el-table-column prop="batchNumber" label="批次号" width="150">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.batchNumber" placeholder="自动生成批次号" :readonly="true" size="small" /> <el-input v-model="scope.row.batchNumber" placeholder="自动生成批次号" :readonly="true" size="small" />
@ -330,21 +330,21 @@ const handleExpandChange = async (row, expandedRows) => {
} }
}; };
// 成品选择 // 物料选择
const productSelectRef = ref(); const productSelectRef = ref();
// 定义选中的成品列表 // 定义选中的物料列表
const selectedProducts = ref([]); const selectedProducts = ref([]);
// 打开成品选择弹窗的方法 // 打开物料选择弹窗的方法
const openProductSelect = () => { const openProductSelect = () => {
productSelectRef.value.open(); productSelectRef.value.open();
}; };
// 处理成品选择回调 // 处理物料选择回调
const handleProductSelect = (products) => { const handleProductSelect = (products) => {
selectedProducts.value = products; selectedProducts.value = products;
// 为每个成品添加批次号 // 为每个物料添加批次号
const timestamp = parseTime(new Date(), '{y}{m}{d}'); const timestamp = parseTime(new Date(), '{y}{m}{d}');
products.forEach((material) => { products.forEach((material) => {
// 生成批次号：供应商代码 + 时间戳 // 生成批次号：供应商代码 + 时间戳
@ -483,6 +483,10 @@ const data = reactive<PageData<InStockBillForm, InStockBillQuery>>({
} }
}, },
rules: { rules: {
// inStockBillId: [{ required: true, message: '入库单ID不能为空', trigger: 'blur' }],
inStockType: [{ required: true, message: '请选择入库单类型', trigger: 'blur' }],
projectId: [{ required: true, message: '请选择项目', trigger: 'blur' }]
// inStockBillId: [{ required: true, message: '入库单ID不能为空', trigger: 'blur' }] // inStockBillId: [{ required: true, message: '入库单ID不能为空', trigger: 'blur' }]
} }
}); });
@ -649,7 +653,7 @@ const handleUpdate = async (row?: InStockBillVO) => {
addDialog.visible = true; addDialog.visible = true;
}; };
/** 提交按钮 */ /*/!** 提交按钮 *!/
const submitForm = () => { const submitForm = () => {
inStockBillFormRef.value?.validate(async (valid: boolean) => { inStockBillFormRef.value?.validate(async (valid: boolean) => {
if (valid) { if (valid) {
@ -664,7 +668,7 @@ const submitForm = () => {
await getList(); await getList();
} }
}); });
}; };*/
/** 删除按钮操作 */ /** 删除按钮操作 */
const handleDelete = async (row?: InStockBillVO) => { const handleDelete = async (row?: InStockBillVO) => {

14
src/views/wms/inventoryDetails/index.vue
Unescape Escape View File

@ -7,11 +7,11 @@
<!-- <el-form-item label="库位编码" prop="locationCode"> <!-- <el-form-item label="库位编码" prop="locationCode">
<el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
</el-form-item>--> </el-form-item>-->
<el-form-item label="成品编码" prop="productCode"> <el-form-item label="物料编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入成品编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="成品名称" prop="productName"> <el-form-item label="物料名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="选择仓库" prop="warehouseId"> <el-form-item label="选择仓库" prop="warehouseId">
@ -63,9 +63,9 @@
<!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" v-if="columns[3].visible" />--> <!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" v-if="columns[3].visible" />-->
<el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[3].visible" /> <el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[3].visible" />
<!-- <el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[4].visible" />--> <!-- <el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[4].visible" />-->
<el-table-column label="成品编码" align="center" prop="productCode" v-if="columns[4].visible" /> <el-table-column label="物料编码" align="center" prop="productCode" v-if="columns[4].visible" />
<el-table-column label="成品名称" align="center" prop="productName" v-if="columns[4].visible" /> <el-table-column label="物料名称" align="center" prop="productName" v-if="columns[4].visible" />
<el-table-column label="成品描述" align="center" prop="productSpe" v-if="columns[4].visible" /> <el-table-column label="物料描述" align="center" prop="productSpe" v-if="columns[4].visible" />
<el-table-column label="外部品牌" align="center" prop="externalBrand" v-if="columns[4].visible" /> <el-table-column label="外部品牌" align="center" prop="externalBrand" v-if="columns[4].visible" />
<el-table-column label="批次号" align="center" prop="batchNumber" v-if="columns[5].visible" /> <el-table-column label="批次号" align="center" prop="batchNumber" v-if="columns[5].visible" />
<el-table-column label="库存数量" align="center" prop="inventoryAmount" v-if="columns[6].visible" /> <el-table-column label="库存数量" align="center" prop="inventoryAmount" v-if="columns[6].visible" />

14
src/views/wms/inventoryDetails/indexCount.vue
Unescape Escape View File

@ -7,11 +7,11 @@
<!-- <el-form-item label="库位编码" prop="locationCode"> <!-- <el-form-item label="库位编码" prop="locationCode">
<el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
</el-form-item>--> </el-form-item>-->
<el-form-item label="成品编码" prop="productCode"> <el-form-item label="物料编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入成品编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="成品名称" prop="productName"> <el-form-item label="物料名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="选择仓库" prop="warehouseId"> <el-form-item label="选择仓库" prop="warehouseId">
@ -54,9 +54,9 @@
</el-table-column> </el-table-column>
<el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[3].visible" /> <el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[3].visible" />
<el-table-column label="成品编码" align="center" prop="productCode" v-if="columns[4].visible" /> <el-table-column label="物料编码" align="center" prop="productCode" v-if="columns[4].visible" />
<el-table-column label="成品名称" align="center" prop="productName" v-if="columns[4].visible" /> <el-table-column label="物料名称" align="center" prop="productName" v-if="columns[4].visible" />
<el-table-column label="成品描述" align="center" prop="productSpe" v-if="columns[4].visible" /> <el-table-column label="物料描述" align="center" prop="productSpe" v-if="columns[4].visible" />
<el-table-column label="外部品牌" align="center" prop="externalBrand" v-if="columns[4].visible" /> <el-table-column label="外部品牌" align="center" prop="externalBrand" v-if="columns[4].visible" />
<el-table-column label="库存数量" align="center" prop="inventoryAmount" v-if="columns[6].visible" /> <el-table-column label="库存数量" align="center" prop="inventoryAmount" v-if="columns[6].visible" />
</el-table> </el-table>

167
src/views/wms/outStockBill/index.vue
Unescape Escape View File

@ -81,10 +81,27 @@
</el-row> </el-row>
</template> </template>
<el-table v-loading="loading" border :data="outStockBillList" @selection-change="handleSelectionChange"> <el-table
<el-table-column type="selection" width="55" align="center" /> v-loading="loading"
border
:data="outStockBillList"
@selection-change="handleSelectionChange"
@expand-change="handleExpandChange"
:row-key="(row) => row.outStockBillId"
>
<el-table-column type="expand">
<template #default="{ row }">
<el-table v-loading="row.loading" border :data="row.data" :style="{ width: '95%', margin: '0 auto' }">
<el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[3].visible" />
<el-table-column label="批次号" align="center" prop="batchNumber" v-if="columns[4].visible" />
<el-table-column label="单价" align="center" prop="unitPrice" v-if="columns[5].visible" />
<el-table-column label="出库数量" align="center" prop="outStockAmount" v-if="columns[6].visible" />
<el-table-column label="单位" align="center" prop="unitName" v-if="columns[7].visible" />
<el-table-column label="总价" align="center" prop="totalPrice" v-if="columns[8].visible" />
</el-table>
</template>
</el-table-column>
<el-table-column label="出库单ID" align="center" prop="outStockBillId" v-if="columns[0].visible" /> <el-table-column label="出库单ID" align="center" prop="outStockBillId" v-if="columns[0].visible" />
<el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible" /> <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible" />
<el-table-column label="出库单号" align="center" prop="outStockCode" v-if="columns[2].visible" /> <el-table-column label="出库单号" align="center" prop="outStockCode" v-if="columns[2].visible" />
<el-table-column label="仓库" align="center" prop="warehouseId" v-if="columns[12].visible"> <el-table-column label="仓库" align="center" prop="warehouseId" v-if="columns[12].visible">
@ -232,23 +249,53 @@
<div v-if="selectInventorys.length > 0" style="margin-top: 20px"> <div v-if="selectInventorys.length > 0" style="margin-top: 20px">
<h4>已选择的物料：</h4> <h4>已选择的物料：</h4>
<el-table border :data="selectInventorys"> <el-table border :data="selectInventorys">
<el-table-column label="出库单明细ID" align="center" prop="outStockDetailsId" />
<el-table-column label="物料ID" align="center" prop="materielId" />
<el-table-column label="批次号" align="center" prop="batchNumber" /> <el-table-column label="批次号" align="center" prop="batchNumber" />
<el-table-column label="单价" align="center" prop="unitPrice" /> <el-table-column label="物料编码" align="center" prop="productCode" />
<el-table-column label="出库数量" align="center" prop="outStockAmount" /> <el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="单位" align="center" prop="unitName" /> <el-table-column label="单价" align="center" prop="unitPrice" width="80" />
<el-table-column label="总价" align="center" prop="totalPrice" /> <el-table-column label="当前库存" align="center" prop="inventoryAmount" width="90" />
<el-table-column label="出库数量" align="center" prop="outStockAmount" width="140">
<template #default="scope">
<el-input-number
v-model="scope.row.outStockAmount"
:min="0"
:precision="2"
:step="0.5"
:max="scope.row.inventoryAmount"
@change="calculateTotalPrice(scope.row)"
controls-position="right"
size="small"
placeholder="请输入出库数量"
/>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unitName" width="80" />
<el-table-column label="总价" align="center" prop="totalPrice" width="80">
<template #default="scope">
{{ scope.row.totalPrice || '0.00' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="60">
<template #default="scope">
<el-button link type="danger" icon="Delete" @click="removeOutDetail(scope.$index)"></el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</el-card> </el-card>
<wms-inventory-select ref="inventorySelectRef" :multiple="true" @confirmCallBack="handleInventorySelect" /> <wms-inventory-select ref="inventorySelectRef" :multiple="true" :warehouse-id="form.warehouseId" @confirmCallBack="handleInventorySelect" />
</div> </div>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer" style="display: flex; justify-content: space-between; align-items: center; width: 100%">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> <div class="total-price-summary">
<el-button @click="cancel">取 消</el-button> <span style="font-weight: bold; color: #409eff">总价合计: {{ totalPriceSum }} 元</span>
</div>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -256,12 +303,14 @@
</template> </template>
<script setup name="OutStockBill" lang="ts"> <script setup name="OutStockBill" lang="ts">
import { addOutStockBill, delOutStockBill, getOutStockBill, listOutStockBill, updateOutStockBill } from '@/api/wms/outStockBill'; import { addOutStockBill, delOutStockBill, getOutStockBill, listOutStockBill } from '@/api/wms/outStockBill';
import { OutStockBillForm, OutStockBillQuery, OutStockBillVO } from '@/api/wms/outStockBill/types'; import { OutStockBillForm, OutStockBillQuery, OutStockBillVO } from '@/api/wms/outStockBill/types';
import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo'; import { getErpProjectInfoList } from '@/api/oa/erp/projectInfo';
import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo'; import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo'; import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo';
import WmsInventorySelect from '@/components/WmsInventorySelect/index.vue'; import WmsInventorySelect from '@/components/WmsInventorySelect/index.vue';
import { ElMessage } from 'element-plus';
import { getWmsOutStockDetailsList } from '@/api/wms/outStockDetails';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { wms_in_stock_bill_status, out_stock_type, flow_status } = toRefs<any>( const { wms_in_stock_bill_status, out_stock_type, flow_status } = toRefs<any>(
@ -345,15 +394,34 @@ const data = reactive<PageData<OutStockBillForm, OutStockBillQuery>>({
outStockBillStatus: undefined, outStockBillStatus: undefined,
warehouseId: undefined, warehouseId: undefined,
createTime: undefined, createTime: undefined,
orderByColumn: 'createTime',
isAsc: 'desc',
params: {} params: {}
}, },
rules: { rules: {
outStockBillId: [{ required: true, message: '出库单ID不能为空', trigger: 'blur' }] outStockBillId: [{ required: true, message: '出库单ID不能为空', trigger: 'blur' }],
warehouseId: [{ required: true, message: '请选择仓库', trigger: 'blur' }],
outStockType: [{ required: true, message: '请选择出库单类型', trigger: 'blur' }],
projectId: [{ required: true, message: '请选择项目', trigger: 'blur' }]
} }
}); });
const { queryParams, form, rules } = toRefs(data); const { queryParams, form, rules } = toRefs(data);
/**点击展开子表*/
// ... existing code ...
const handleExpandChange = async (row, expandedRows) => {
if (expandedRows.length && !row.data) {
try {
row.loading = true;
const res = await getWmsOutStockDetailsList({ outStockBillId: row.outStockBillId });
row.data = res.data;
} finally {
row.loading = false;
}
}
};
/** 获取项目列表 */ /** 获取项目列表 */
const getProjectInfoList = async () => { const getProjectInfoList = async () => {
const res = await getErpProjectInfoList({}); const res = await getErpProjectInfoList({});
@ -389,16 +457,47 @@ const getWarehouseName = (warehouseId) => {
const warehouse = warehouseInfoList.value.find((item) => item.warehouseId === warehouseId); const warehouse = warehouseInfoList.value.find((item) => item.warehouseId === warehouseId);
return warehouse ? warehouse.warehouseName : warehouseId; return warehouse ? warehouse.warehouseName : warehouseId;
}; };
/** 打开库存选择器 */
const openInventorySelect = () => { const openInventorySelect = () => {
if (!form.value.warehouseId) {
ElMessage.warning('请先选择仓库');
return;
}
inventorySelectRef.value.warehouseId = form.value.warehouseId;
inventorySelectRef.value.open(); inventorySelectRef.value.open();
}; };
/** 处理库存选择器确认选择 */
const handleInventorySelect = (selectedInventorys) => { const handleInventorySelect = (selectedInventorys) => {
// selectedInventorys 就是用户选择的库存数据数组
selectInventorys.value = selectedInventorys; selectInventorys.value = selectedInventorys;
console.log(selectedInventorys); console.log(selectedInventorys);
// 这里可以进一步处理选中的库存数据
}; };
/** 删除选中的出库明细 */
const removeOutDetail = (index) => {
selectInventorys.value.splice(index, 1);
};
/** 计算每行总金额 */
const calculateTotalPrice = (data) => {
if (data.outStockAmount && data.unitPrice) {
data.totalPrice = (data.outStockAmount * data.unitPrice).toFixed(2);
} else {
data.totalPrice = 0;
}
};
// 计算所有选中库存的总价合计
const totalPriceSum = computed(() => {
if (!selectInventorys.value || selectInventorys.value.length === 0) {
return '0.00';
}
const sum = selectInventorys.value.reduce((total, item) => {
const outStockAmount = item.outStockAmount || 0;
const unitPrice = item.unitPrice || 0;
return total + outStockAmount * unitPrice;
}, 0);
return sum.toFixed(2);
});
/** 查询出库单列表 */ /** 查询出库单列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
@ -443,6 +542,7 @@ const handleSelectionChange = (selection: OutStockBillVO[]) => {
/** 新增按钮操作 */ /** 新增按钮操作 */
const handleAdd = () => { const handleAdd = () => {
reset(); reset();
selectInventorys.value = [];
dialog.visible = true; dialog.visible = true;
dialog.title = '添加出库单'; dialog.title = '添加出库单';
}; };
@ -461,11 +561,38 @@ const handleUpdate = async (row?: OutStockBillVO) => {
const submitForm = () => { const submitForm = () => {
outStockBillFormRef.value?.validate(async (valid: boolean) => { outStockBillFormRef.value?.validate(async (valid: boolean) => {
if (valid) { if (valid) {
if (selectInventorys.value.length === 0) {
ElMessage.warning('请选择出库明细');
return;
}
// 验证物料的出库数量都大于0
const validOutStockDetails = selectInventorys.value.every((item) => item.outStockAmount > 0);
if (!validOutStockDetails) {
ElMessage.warning('出库数量必须大于0');
return;
}
buttonLoading.value = true; buttonLoading.value = true;
if (form.value.outStockBillId) { if (form.value.outStockBillId) {
await updateOutStockBill(form.value).finally(() => (buttonLoading.value = false)); ElMessage.error('暂不允许修改');
// await updateOutStockBill(form.value).finally(() => (buttonLoading.value = false));
} else { } else {
await addOutStockBill(form.value).finally(() => (buttonLoading.value = false)); const submitFlowData = {
...form.value,
outStockDetailsList: selectInventorys.value.filter((item) => ({
warehouseId: form.value.warehouseId,
materielId: item.productId,
batchNumber: item.batchNumber,
unitPrice: item.unitPrice,
outStockAmount: item.outStockAmount,
unitName: item.unitName,
totalPrice: item.totalPrice,
inProjectId: item.projectId,
outProjectId: form.value.projectId,
inventoryDetailsId: item.inventoryDetailsId,
oldInventoryAmount: item.inventoryAmount
}))
};
await addOutStockBill(submitFlowData).finally(() => (buttonLoading.value = false));
} }
proxy?.$modal.msgSuccess('操作成功'); proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false; dialog.visible = false;

36
src/views/wms/wmsBaseProduct/index.vue
Unescape Escape View File

@ -4,11 +4,11 @@
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px"> <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="成品编码" prop="productCode"> <el-form-item label="物料编码" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="请输入成品编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="成品名称" prop="productName"> <el-form-item label="物料名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入成品名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="激活标识" prop="activeFlag"> <el-form-item label="激活标识" prop="activeFlag">
@ -52,10 +52,10 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料ID" align="center" prop="productId" v-if="columns[0].visible" /> <el-table-column label="物料ID" align="center" prop="productId" v-if="columns[0].visible" />
<el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible" /> <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible" />
<el-table-column label="成品编码" align="center" prop="productCode" v-if="columns[2].visible" /> <el-table-column label="物料编码" align="center" prop="productCode" v-if="columns[2].visible" />
<el-table-column label="成品名称" align="center" prop="productName" v-if="columns[3].visible" /> <el-table-column label="物料名称" align="center" prop="productName" v-if="columns[3].visible" />
<el-table-column label="外部品牌规格" align="center" prop="externalBrand" v-if="columns[3].visible" /> <el-table-column label="外部品牌规格" align="center" prop="externalBrand" v-if="columns[3].visible" />
<el-table-column label="成品描述" align="center" prop="productSpe" v-if="columns[4].visible" /> <el-table-column label="物料描述" align="center" prop="productSpe" v-if="columns[4].visible" />
<el-table-column label="单位" align="center" prop="unitName" v-if="columns[5].visible" /> <el-table-column label="单位" align="center" prop="unitName" v-if="columns[5].visible" />
<el-table-column label="参考成本" align="center" prop="purchasePrice" v-if="columns[6].visible" /> <el-table-column label="参考成本" align="center" prop="purchasePrice" v-if="columns[6].visible" />
<el-table-column label="统一报价(参考)" align="center" prop="foreignPrice" v-if="columns[7].visible" /> <el-table-column label="统一报价(参考)" align="center" prop="foreignPrice" v-if="columns[7].visible" />
@ -92,16 +92,16 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card> </el-card>
<!-- 添加或修改海威成品信息对话框 --> <!-- 添加或修改海威物料信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="wmsBaseProductFormRef" :model="form" :rules="rules" label-width="120px"> <el-form ref="wmsBaseProductFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="成品编码" prop="productCode"> <el-form-item label="物料编码" prop="productCode">
<el-input v-model="form.productCode" placeholder="请输入成品编码" /> <el-input v-model="form.productCode" placeholder="请输入物料编码" />
</el-form-item> </el-form-item>
<el-form-item label="成品名称" prop="productName"> <el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入成品名称" /> <el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item> </el-form-item>
<el-form-item label="成品描述" prop="productSpe"> <el-form-item label="物料描述" prop="productSpe">
<el-input v-model="form.productSpe" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.productSpe" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
@ -167,9 +167,9 @@ const dialog = reactive<DialogOption>({
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
{ key: 0, label: `物料ID`, visible: false }, { key: 0, label: `物料ID`, visible: false },
{ key: 1, label: `租户编号`, visible: false }, { key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `成品编码`, visible: true }, { key: 2, label: `物料编码`, visible: true },
{ key: 3, label: `成品名称`, visible: true }, { key: 3, label: `物料名称`, visible: true },
{ key: 4, label: `成品描述`, visible: true }, { key: 4, label: `物料描述`, visible: true },
{ key: 5, label: `单位`, visible: true }, { key: 5, label: `单位`, visible: true },
{ key: 6, label: `参考成本`, visible: true }, { key: 6, label: `参考成本`, visible: true },
{ key: 7, label: `统一报价(参考)`, visible: true }, { key: 7, label: `统一报价(参考)`, visible: true },
@ -205,7 +205,7 @@ const data = reactive<PageData<WmsBaseProductForm, WmsBaseProductQuery>>({
}, },
rules: { rules: {
// productId: [{ required: true, message: '物料ID不能为空', trigger: 'blur' }], // productId: [{ required: true, message: '物料ID不能为空', trigger: 'blur' }],
productName: [{ required: true, message: '成品名称不能为空', trigger: 'blur' }], productName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
unitId: [{ required: true, message: '单位不能为空', trigger: 'change' }] unitId: [{ required: true, message: '单位不能为空', trigger: 'change' }]
} }
}); });
@ -217,7 +217,7 @@ const getUnitInfoListSelect = async () => {
const res = await getBaseUnitInfoList(null); const res = await getBaseUnitInfoList(null);
unitInfoList.value = res.data; unitInfoList.value = res.data;
}; };
/** 查询海威成品信息列表 */ /** 查询海威物料信息列表 */
const getList = async () => { const getList = async () => {
loading.value = true; loading.value = true;
const res = await listWmsBaseProduct(queryParams.value); const res = await listWmsBaseProduct(queryParams.value);

Write Preview
Loading…
Cancel
Save