From 856f4878964658892660bb9da48bc4b7832f1c82 Mon Sep 17 00:00:00 2001 From: wanghao Date: Tue, 2 Dec 2025 08:55:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E7=89=A9=E6=96=99=E8=B0=83?= =?UTF-8?q?=E6=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/materialTransferRecord/index.ts | 76 +++ src/api/wms/materialTransferRecord/types.ts | 155 +++++ src/api/wms/outStockBill/types.ts | 4 + src/api/wms/sampleLedger/types.ts | 12 + .../wms/materialTransferRecord/index.vue | 425 +++++++++++++ src/views/wms/outStockDetails/index.vue | 67 ++- src/views/wms/sampleDisposalRecord/index.vue | 562 +++++++++--------- src/views/wms/sampleLedger/index.vue | 123 +++- 8 files changed, 1122 insertions(+), 302 deletions(-) create mode 100644 src/api/wms/materialTransferRecord/index.ts create mode 100644 src/api/wms/materialTransferRecord/types.ts create mode 100644 src/views/wms/materialTransferRecord/index.vue diff --git a/src/api/wms/materialTransferRecord/index.ts b/src/api/wms/materialTransferRecord/index.ts new file mode 100644 index 0000000..285bc53 --- /dev/null +++ b/src/api/wms/materialTransferRecord/index.ts @@ -0,0 +1,76 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { MaterialTransferRecordVO, MaterialTransferRecordForm, MaterialTransferRecordQuery } from '@/api/wms/materialTransferRecord/types'; + +/** + * 查询物料调拨列表 + * @param query + * @returns {*} + */ + +export const listMaterialTransferRecord = (query?: MaterialTransferRecordQuery): AxiosPromise => { + return request({ + url: '/wms/materialTransferRecord/list', + method: 'get', + params: query + }); +}; + +/** + * 查询物料调拨详细 + * @param transferRecordId + */ +export const getMaterialTransferRecord = (transferRecordId: string | number): AxiosPromise => { + return request({ + url: '/wms/materialTransferRecord/' + transferRecordId, + method: 'get' + }); +}; + +/** + * 新增物料调拨 + * @param data + */ +export const addMaterialTransferRecord = (data: MaterialTransferRecordForm | MaterialTransferRecordForm[]) => { + return request({ + url: '/wms/materialTransferRecord', + method: 'post', + data: data + }); +}; + +/** + * 修改物料调拨 + * @param data + */ +export const updateMaterialTransferRecord = (data: MaterialTransferRecordForm) => { + return request({ + url: '/wms/materialTransferRecord', + method: 'put', + data: data + }); +}; + +/** + * 删除物料调拨 + * @param transferRecordId + */ +export const delMaterialTransferRecord = (transferRecordId: string | number | Array) => { + return request({ + url: '/wms/materialTransferRecord/' + transferRecordId, + method: 'delete' + }); +}; + +/** + * 下拉框查询物料调拨列表 + * @param query + * @returns {*} + */ +export function getWmsMaterialTransferRecordList (query) { + return request({ + url: '/wms/materialTransferRecord/getWmsMaterialTransferRecordList', + method: 'get', + params: query + }); +}; diff --git a/src/api/wms/materialTransferRecord/types.ts b/src/api/wms/materialTransferRecord/types.ts new file mode 100644 index 0000000..2b26445 --- /dev/null +++ b/src/api/wms/materialTransferRecord/types.ts @@ -0,0 +1,155 @@ +export interface MaterialTransferRecordVO { + /** + * 调拨记录ID + */ + transferRecordId: string | number; + + /** + * 物料ID + */ + materielId: string | number; + + /** + * 批次号 + */ + batchNumber: string; + + /** + * 调拨数量 + */ + transferQty: number; + + /** + * 单位 + */ + unitName: string; + + /** + * 调出仓库 + */ + transferOutStoreId: string | number; + + /** + * 调入仓库 + */ + transferInStoreId: string | number; + + /** + * 库存id + */ + inventoryDetailsId: string | number; + + /** + * 租户编号 + */ + tenantId: string | number; + + /** + * 删除标志（0代表存在 1代表删除） + */ + delFlag: string; + + /** + * 创建部门 + */ + createDept: number; + + /** + * 创建人 + */ + createBy: number; + + /** + * 调拨时间 + */ + createTime: string; + + /** + * 更新人 + */ + updateBy: number; + + /** + * 更新时间 + */ + updateTime: string; +} + +export interface MaterialTransferRecordForm extends BaseEntity { + transferRecordId?: string | number; + + /** + * 物料ID + */ + materielId?: string | number; + + /** + * 批次号 + */ + batchNumber?: string; + + /** + * 调拨数量 + */ + transferQty?: number; + + /** + * 单位 + */ + unitName?: string; + productCode?: string; + productName?: string; + + /** + * 调出仓库 + */ + transferOutStoreId?: string | number; + + /** + * 调入仓库 + */ + transferInStoreId?: string | number; + + /** + * 库存id + */ + inventoryDetailsId?: string | number; +} + +export interface MaterialTransferRecordQuery extends PageQuery { + /** + * 物料ID + */ + materielId?: string | number; + /** + * 物料编码 + */ + productCode?: string; + + /** + * 物料名称 + */ + productName?: string; + + /** + * 批次号 + */ + batchNumber?: string; + + /** + * 调出仓库 + */ + transferOutStoreId?: string | number; + + /** + * 调入仓库 + */ + transferInStoreId?: string | number; + orderByColumn: string; + isAsc: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/wms/outStockBill/types.ts b/src/api/wms/outStockBill/types.ts index 9e92381..3d8167a 100644 --- a/src/api/wms/outStockBill/types.ts +++ b/src/api/wms/outStockBill/types.ts @@ -184,8 +184,12 @@ export interface OutStockBillQuery extends PageQuery { */ createTime?: string; + orderByColumn?: string; + /** * 日期范围参数 */ params?: any; + + isAsc?: string; } diff --git a/src/api/wms/sampleLedger/types.ts b/src/api/wms/sampleLedger/types.ts index 207d9e2..bcd2952 100644 --- a/src/api/wms/sampleLedger/types.ts +++ b/src/api/wms/sampleLedger/types.ts @@ -163,6 +163,16 @@ export interface SampleLedgerForm extends BaseEntity { * 是否归还 */ isReturn?: string; + + /** + * 处置类型 + */ + disposalType: string; + + /** + * 处置数量 + */ + disposalQty: number; } export interface SampleLedgerQuery extends PageQuery { @@ -170,6 +180,8 @@ export interface SampleLedgerQuery extends PageQuery { * 出库仓库 */ warehouseId?: string | number; + orderByColumn: string; + isAsc: string; /** * 项目ID diff --git a/src/views/wms/materialTransferRecord/index.vue b/src/views/wms/materialTransferRecord/index.vue new file mode 100644 index 0000000..f07d52d --- /dev/null +++ b/src/views/wms/materialTransferRecord/index.vue @@ -0,0 +1,425 @@ + + + diff --git a/src/views/wms/outStockDetails/index.vue b/src/views/wms/outStockDetails/index.vue index 37ae0dc..99608d4 100644 --- a/src/views/wms/outStockDetails/index.vue +++ b/src/views/wms/outStockDetails/index.vue @@ -4,9 +4,12 @@
- - + + + + + @@ -39,7 +42,7 @@ - - + + + +