diff --git a/src/api/wms/sampleDisposalRecord/index.ts b/src/api/wms/sampleDisposalRecord/index.ts new file mode 100644 index 0000000..59e8840 --- /dev/null +++ b/src/api/wms/sampleDisposalRecord/index.ts @@ -0,0 +1,76 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { SampleDisposalRecordVO, SampleDisposalRecordForm, SampleDisposalRecordQuery } from '@/api/wms/sampleDisposalRecord/types'; + +/** + * 查询样品处置记录列表 + * @param query + * @returns {*} + */ + +export const listSampleDisposalRecord = (query?: SampleDisposalRecordQuery): AxiosPromise => { + return request({ + url: '/wms/sampleDisposalRecord/list', + method: 'get', + params: query + }); +}; + +/** + * 查询样品处置记录详细 + * @param sampleRecordId + */ +export const getSampleDisposalRecord = (sampleRecordId: string | number): AxiosPromise => { + return request({ + url: '/wms/sampleDisposalRecord/' + sampleRecordId, + method: 'get' + }); +}; + +/** + * 新增样品处置记录 + * @param data + */ +export const addSampleDisposalRecord = (data: SampleDisposalRecordForm) => { + return request({ + url: '/wms/sampleDisposalRecord', + method: 'post', + data: data + }); +}; + +/** + * 修改样品处置记录 + * @param data + */ +export const updateSampleDisposalRecord = (data: SampleDisposalRecordForm) => { + return request({ + url: '/wms/sampleDisposalRecord', + method: 'put', + data: data + }); +}; + +/** + * 删除样品处置记录 + * @param sampleRecordId + */ +export const delSampleDisposalRecord = (sampleRecordId: string | number | Array) => { + return request({ + url: '/wms/sampleDisposalRecord/' + sampleRecordId, + method: 'delete' + }); +}; + +/** + * 下拉框查询样品处置记录列表 + * @param query + * @returns {*} + */ +export function getWmsSampleDisposalRecordList (query) { + return request({ + url: '/wms/sampleDisposalRecord/getWmsSampleDisposalRecordList', + method: 'get', + params: query + }); +}; diff --git a/src/api/wms/sampleDisposalRecord/types.ts b/src/api/wms/sampleDisposalRecord/types.ts new file mode 100644 index 0000000..3e97408 --- /dev/null +++ b/src/api/wms/sampleDisposalRecord/types.ts @@ -0,0 +1,126 @@ +export interface SampleDisposalRecordVO { + /** + * 样品处理记录ID + */ + sampleRecordId: string | number; + + /** + * 物料ID + */ + materielId: string | number; + + /** + * 批次号 + */ + batchNumber: string; + + /** + * 处置数量 + */ + disposalQty: number; + + /** + * 单位 + */ + unitName: string; + + /** + * 处置类型 + */ + disposalType: string; + + /** + * 创建部门 + */ + createDept: number; + + /** + * 创建人 + */ + createBy: number; + + /** + * 创建时间 + */ + createTime: string; + + /** + * 更新人 + */ + updateBy: number; + + /** + * 更新时间 + */ + updateTime: string; + + /** + * 样品台账ID + */ + sampleLedgerId: string | number; + +} + +export interface SampleDisposalRecordForm extends BaseEntity { + /** + * 样品处理记录ID + */ + sampleRecordId?: string | number; + + /** + * 物料ID + */ + materielId?: string | number; + + /** + * 批次号 + */ + batchNumber?: string; + + /** + * 处置数量 + */ + disposalQty?: number; + + /** + * 单位 + */ + unitName?: string; + + /** + * 处置类型 + */ + disposalType?: string; + + /** + * 样品台账ID + */ + sampleLedgerId?: string | number; + +} + +export interface SampleDisposalRecordQuery extends PageQuery { + + /** + * 批次号 + */ + batchNumber?: string; + + /** + * 处置类型 + */ + disposalType?: string; + + /** + * 样品台账ID + */ + sampleLedgerId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/wms/sampleLedger/index.ts b/src/api/wms/sampleLedger/index.ts new file mode 100644 index 0000000..9cd99f4 --- /dev/null +++ b/src/api/wms/sampleLedger/index.ts @@ -0,0 +1,76 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { SampleLedgerForm, SampleLedgerQuery, SampleLedgerVO } from '@/api/wms/sampleLedger/types'; + +/** + * 查询样品管理列表 + * @param query + * @returns {*} + */ + +export const listSampleLedger = (query?: SampleLedgerQuery): AxiosPromise => { + return request({ + url: '/wms/sampleLedger/list', + method: 'get', + params: query + }); +}; + +/** + * 查询样品管理详细 + * @param sampleLedgerId + */ +export const getSampleLedger = (sampleLedgerId: string | number): AxiosPromise => { + return request({ + url: '/wms/sampleLedger/' + sampleLedgerId, + method: 'get' + }); +}; + +/** + * 新增样品管理 + * @param data + */ +export const addSampleLedger = (data: SampleLedgerForm[]) => { + return request({ + url: '/wms/sampleLedger', + method: 'post', + data: data + }); +}; + +/** + * 修改样品管理 + * @param data + */ +export const updateSampleLedger = (data: SampleLedgerForm) => { + return request({ + url: '/wms/sampleLedger', + method: 'put', + data: data + }); +}; + +/** + * 删除样品管理 + * @param sampleLedgerId + */ +export const delSampleLedger = (sampleLedgerId: string | number | Array) => { + return request({ + url: '/wms/sampleLedger/' + sampleLedgerId, + method: 'delete' + }); +}; + +/** + * 下拉框查询样品管理列表 + * @param query + * @returns {*} + */ +export function getWmsSampleLedgerList(query) { + return request({ + url: '/wms/sampleLedger/getWmsSampleLedgerList', + method: 'get', + params: query + }); +} diff --git a/src/api/wms/sampleLedger/types.ts b/src/api/wms/sampleLedger/types.ts new file mode 100644 index 0000000..207d9e2 --- /dev/null +++ b/src/api/wms/sampleLedger/types.ts @@ -0,0 +1,204 @@ +export interface SampleLedgerVO { + /** + * 样品台账ID + */ + sampleLedgerId: string | number; + + /** + * 出库仓库 + */ + warehouseId: string | number; + + /** + * 项目ID + */ + projectId: string | number; + + /** + * 物料ID + */ + materielId: string | number; + + /** + * 批次号 + */ + batchNumber: string; + + /** + * 借出数量 + */ + lentQty: number; + + /** + * 单位 + */ + unitName: string; + + /** + * 未处理数量 + */ + returnQty: number; + + /** + * 客户ID + */ + customerId: string | number; + + /** + * 联系人 + */ + customerUser: string; + + /** + * 联系电话 + */ + customerNumber: string; + + /** + * 用途 + */ + lentRemark: string; + + /** + * 样品状态 + */ + sampleState: string; + + /** + * 创建部门 + */ + createDept: number; + + /** + * 创建人 + */ + createBy: number; + + /** + * 创建时间 + */ + createTime: string; + + /** + * 更新人 + */ + updateBy: number; + + /** + * 更新时间 + */ + updateTime: string; + /** + * 是否归还 + */ + isReturn?: string; +} + +export interface SampleLedgerForm extends BaseEntity { + /** + * 样品台账ID + */ + sampleLedgerId?: string | number; + + /** + * 出库仓库 + */ + warehouseId?: string | number; + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 物料ID + */ + materielId?: string | number; + + /** + * 批次号 + */ + batchNumber?: string; + + /** + * 借出数量 + */ + lentQty?: number; + + /** + * 单位 + */ + unitName?: string; + + /** + * 未处理数量 + */ + returnQty?: number; + + /** + * 客户ID + */ + customerId?: string | number; + + /** + * 联系人 + */ + customerUser?: string; + + /** + * 联系电话 + */ + customerNumber?: string; + + /** + * 用途 + */ + lentRemark?: string; + + /** + * 样品状态 + */ + sampleState?: string; + /** + * 是否归还 + */ + isReturn?: string; +} + +export interface SampleLedgerQuery extends PageQuery { + /** + * 出库仓库 + */ + warehouseId?: string | number; + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 物料ID + */ + materielId?: string | number; + + /** + * 批次号 + */ + batchNumber?: string; + sampleState?: string; + productName?: string; + + /** + * 客户ID + */ + customerId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; + /** + * 是否归还 + */ + isReturn?: string; +} diff --git a/src/views/wms/sampleDisposalRecord/index.vue b/src/views/wms/sampleDisposalRecord/index.vue new file mode 100644 index 0000000..c6d80bf --- /dev/null +++ b/src/views/wms/sampleDisposalRecord/index.vue @@ -0,0 +1,289 @@ + + + diff --git a/src/views/wms/sampleLedger/index.vue b/src/views/wms/sampleLedger/index.vue new file mode 100644 index 0000000..c63de0e --- /dev/null +++ b/src/views/wms/sampleLedger/index.vue @@ -0,0 +1,616 @@ + + +