合并

src/api/materials/company/index.ts

@@ -14,6 +14,18 @@ export const listCompany = (query?: CompanyQuery): AxiosPromise<CompanyVO[]> =>
     method: 'get',
     params: query
   });
+}; /**
+ * 查询材料提供商
+ * @param query
+ * @returns {*}
+ */
+
+export const supplierInputGet = (query?) => {
+  return request({
+    url: '/supplierInput/supplierInput/getList',
+    method: 'get',
+    params: query
+  });
 };
 
 /**

src/api/materials/materialIssue/index.ts

@@ -75,3 +75,11 @@ export const inventoryList = (id: any) => {
     method: 'get'
   });
 };
+
+//获取材料表信息
+export const getMaterialInfo = (id: any) => {
+  return request({
+    url: '/materials/materials/listByFormCode/' + id,
+    method: 'get'
+  });
+};

src/api/materials/materialOutbound/index.ts

@@ -0,0 +1,27 @@
+import request from '@/utils/request';
+
+//获取出库材料得列表
+export const outboundMaterials = (query?: any) => {
+  return request({
+    url: '/materials/materials/listRelevancy',
+    method: 'get',
+    params: query
+  });
+};
+//新增出库
+export const addOutbound = (data?: any) => {
+  return request({
+    url: '/materials/materialsInventory',
+    method: 'post',
+    data
+  });
+};
+
+//获取材料列表
+export const getMaterialsList = (query?: any) => {
+  return request({
+    url: '/materials/materials/list',
+    method: 'get',
+    params: query
+  });
+};

src/api/materials/materialsInventory/index.ts

@@ -61,3 +61,13 @@ export const delMaterialsInventory = (id: string | number | Array<string | numbe
     method: 'delete'
   });
 };
+
+//获取新的列表数据
+export const getLedgerList = (query?: any) => {
+  return request({
+    url: '/materials/materials/listUseDetail',
+    method: 'get',
+    params: query
+  });
+};
+//导出

src/api/materials/materialsUseRecord/types.ts

@@ -33,7 +33,6 @@ export interface MaterialsUseRecordVO {
    * 备注
    */
   remark: string;
-
 }
 
 export interface MaterialsUseRecordForm extends BaseEntity {
@@ -71,11 +70,9 @@ export interface MaterialsUseRecordForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface MaterialsUseRecordQuery extends PageQuery {
-
   /**
    * 项目ID
    */
@@ -101,11 +98,9 @@ export interface MaterialsUseRecordQuery extends PageQuery {
    */
   residueNumber?: string | number;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+  materialsId?: string | number;
 }
-
-
-