diff --git a/src/api/wms/linkage/index.ts b/src/api/wms/linkage/index.ts index dee7c9e..4d23130 100644 --- a/src/api/wms/linkage/index.ts +++ b/src/api/wms/linkage/index.ts @@ -48,6 +48,13 @@ export const addAllocateOrder = (data) => { }; export const getMaterialList = (query) => { + return request({ + url: '/wms/inventory/getMaterialInfoList', + method: 'get', + params: query + }); +}; +export const getInstockMaterialList = (query) => { return request({ url: '/wms/baseMaterialInfo/materialList', method: 'get', diff --git a/src/api/wms/psmArea/index.ts b/src/api/wms/psmArea/index.ts new file mode 100644 index 0000000..4601d48 --- /dev/null +++ b/src/api/wms/psmArea/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { PsmAreaVO, PsmAreaForm, PsmAreaQuery } from '@/api/wms/psmArea/types'; + +/** + * 查询成品库区列表 + * @param query + * @returns {*} + */ + +export const listPsmArea = (query?: PsmAreaQuery): AxiosPromise => { + return request({ + url: '/system/psmArea/list', + method: 'get', + params: query + }); +}; + +/** + * 查询成品库区详细 + * @param areaId + */ +export const getPsmArea = (areaId: string | number): AxiosPromise => { + return request({ + url: '/system/psmArea/' + areaId, + method: 'get' + }); +}; + +/** + * 新增成品库区 + * @param data + */ +export const addPsmArea = (data: PsmAreaForm) => { + return request({ + url: '/system/psmArea', + method: 'post', + data: data + }); +}; + +/** + * 修改成品库区 + * @param data + */ +export const updatePsmArea = (data: PsmAreaForm) => { + return request({ + url: '/system/psmArea', + method: 'put', + data: data + }); +}; + +/** + * 删除成品库区 + * @param areaId + */ +export const delPsmArea = (areaId: string | number | Array) => { + return request({ + url: '/system/psmArea/' + areaId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询成品库区列表 + * @param query + * @returns {*} + */ +export function getWmsPsmAreaList (query) { + return request({ + url: '/system/psmArea/getWmsPsmAreaList', + method: 'get', + params: query + }); +}; diff --git a/src/api/wms/psmArea/types.ts b/src/api/wms/psmArea/types.ts new file mode 100644 index 0000000..4efa5b9 --- /dev/null +++ b/src/api/wms/psmArea/types.ts @@ -0,0 +1,76 @@ +export interface PsmAreaVO { + /** + * 主键 + */ + areaId: string | number; + + /** + * 库区名称 + */ + areaName: string; + + /** + * 库区代码 + */ + areaCode: string; + + /** + * 仓库 + */ + warehouseId: string | number; + +} + +export interface PsmAreaForm extends BaseEntity { + /** + * 主键 + */ + areaId?: string | number; + + /** + * 库区名称 + */ + areaName?: string; + + /** + * 库区代码 + */ + areaCode?: string; + + /** + * 仓库 + */ + warehouseId?: string | number; + +} + +export interface PsmAreaQuery extends PageQuery { + + /** + * 主键 + */ + areaId?: string | number; + + /** + * 库区名称 + */ + areaName?: string; + + /** + * 库区代码 + */ + areaCode?: string; + + /** + * 仓库 + */ + warehouseId?: string | number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/wms/psmStorage/index.ts b/src/api/wms/psmStorage/index.ts index 9d3a07b..d13542d 100644 --- a/src/api/wms/psmStorage/index.ts +++ b/src/api/wms/psmStorage/index.ts @@ -15,6 +15,27 @@ export const listPsmStorage = (query?: PsmStorageQuery): AxiosPromise => { + return request({ + url: '/wms/psmStorage/expiredList', + method: 'get', + params: query + }); +}; +/** + * 查询将要过期成品库存列表 + */ +export const expiringList = (query?: PsmStorageQuery): AxiosPromise => { + return request({ + url: '/wms/psmStorage/expiringList', + method: 'get', + params: query + }); +}; + /** * 查询成品库存详细 diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue index c635982..64a2cc0 100644 --- a/src/views/wms/instockOrderCopy/index.vue +++ b/src/views/wms/instockOrderCopy/index.vue @@ -484,7 +484,7 @@ import {listUser} from "@/api/system/user"; import { listInstockDetail, getInstockDetail, delInstockDetail, addInstockDetail, updateInstockDetail, getMaterialListVo } from '@/api/wms/instockDetail'; import { InstockDetailVO, InstockDetailQuery, InstockDetailForm } from '@/api/wms/instockDetail/types'; import { - getMaterialList + getMaterialList, getInstockMaterialList } from '@/api/wms/linkage' const {proxy} = getCurrentInstance() as ComponentInternalInstance; @@ -697,7 +697,7 @@ const parentTableDelete = async (e) => { // 获取物料列表 const setMaterialList = (materialCategories) => { - getMaterialList({materialCategories}).then(e => { + getInstockMaterialList({"materialCategories":materialCategories}).then(e => { materialList.value = e.data }) } diff --git a/src/views/wms/linkage/index.vue b/src/views/wms/linkage/index.vue index 9d9e52c..d883178 100644 --- a/src/views/wms/linkage/index.vue +++ b/src/views/wms/linkage/index.vue @@ -150,7 +150,7 @@ - + - +