Merge projectA into B with conflict resolution

src/api/materials/appointment/index.ts

@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 设计人员
+// 新增
+export const designUserAdd = (data) => {
+  return request({
+    url: '/cailiaoshebei/purchaseUser/addOrUpdate',
+    method: 'post',
+    data: data
+  });
+};
+
+// 查询
+export const designUserDetail = (projectId) => {
+  return request({
+    url: `/cailiaoshebei/purchaseUser/byProject/${projectId}`,
+    method: 'get'
+  });
+};
+
+// 查询
+export const systemUserList = (query) => {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params: query
+  });
+};

src/api/materials/batchPlan/index.ts

@@ -0,0 +1,172 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types';
+
+/**
+ * 查询物资-材料设备列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCailiaoshebei = (query?: any): AxiosPromise<CailiaoshebeiVO[]> => {
+  return request({
+    url: '/cailiaoshebei/materialbatchdemandplan/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物资-材料设备详细
+ * @param id
+ */
+export const getCailiaoshebei = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物资-材料设备
+ * @param data
+ */
+export const addCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/materialbatchdemandplan',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物资-材料设备
+ * @param data
+ */
+export const updateCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/batch',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备
+ * @param id
+ */
+export const delCailiaoshebei = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/remove/' + id,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次列表
+ * @param query
+ * @returns {*}
+ */
+export const listBatch = (query?: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 新增物资-材料设备批次
+ * @param data
+ */
+export const getBatch = (query: any) => {
+  const config: any = {
+    url: '/cailiaoshebei/materialbatchdemandplan/list',
+    method: 'get',
+    params: query
+  };
+
+  // 如果 query.token 存在，就覆盖请求头里的 token
+  if (query.token) {
+    config.headers = {
+      Authorization: query.token
+    };
+  }
+
+  return request(config);
+};
+
+/**
+ * 删除物资-材料设备批次
+ * @param ids
+ */
+export const delBatch = (ids: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/' + ids,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次详情
+ * @param id
+ */
+export const getPcDetail = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/materialbatchdemandplan/spQuery/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 查询物资-材料设备选择列表
+ * @param query
+ * @returns {*}
+ */
+export const listSelectCailiaoshebei = (query?: any): AxiosPromise<CailiaoshebeiVO[]> => {
+  return request({
+    url: '/cailiaoshebei/materialbatchdemandplan/masterDataList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询字典数据
+ * @param dictType
+ * @returns {*}
+ */
+export const getDictList = (query: any): AxiosPromise<any[]> => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc/engineeringList',
+    method: 'get',
+    params: query
+  });
+};
+export const coryEngineeringList = (query: any): AxiosPromise<any[]> => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/coryEngineeringList',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 获取到物资状态为已完成的版本
+ */
+export const obtainTheVersion = (query: any) => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/obtainTheVersion',
+    method: 'get',
+    params: query
+  });
+};
+/**
+ * 获取到物资剩余量
+ */
+export const mrpBaseRemaining = (query: any) => {
+  return request({
+    url: '/cailiaoshebei/mrpBase/remaining',
+    method: 'get',
+    params: query
+  });
+};

src/api/materials/batchPlan/types.ts

@@ -0,0 +1,229 @@
+export interface CailiaoshebeiVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+  cailiaoshebeiId?: string | number;
+  /**
+   * 批次ID
+   */
+  batchId: string | number;
+
+  /**
+   * 供货商ID
+   */
+  supplierId: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier: string;
+
+  /**
+   * 设备材料名称
+   */
+  name: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply: string;
+
+  /**
+   * 规格型号
+   */
+  specification: string;
+
+  /**
+   * 特征描述
+   */
+  signalment: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime: string;
+
+  /**
+   * 计量单位
+   */
+  unit: string;
+
+  /**
+   * 计划数量
+   */
+  plan: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface CailiaoshebeiForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+  projectId?: string | number;
+  batchNumber?: string | number;
+  addDataList?: any[];
+  approvalProject?: string;
+  /**
+   * 批次ID
+   */
+  batchId?: string | number;
+
+  /**
+   * 供货商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier?: string;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 特征描述
+   */
+  signalment?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime?: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime?: string;
+
+  /**
+   * 计量单位
+   */
+  unit?: string;
+
+  /**
+   * 计划数量
+   */
+  plan?: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface CailiaoshebeiQuery extends PageQuery {
+  /**
+   * 批次ID
+   */
+  batchId?: string | number;
+  projectId?: string | number;
+  batchNumber?: string;
+  /**
+   * 供货商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier?: string;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 特征描述
+   */
+  signalment?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime?: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime?: string;
+
+  /**
+   * 计量单位
+   */
+  unit?: string;
+
+  /**
+   * 计划数量
+   */
+  plan?: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/materials/cailiaoshebei/index.ts

@@ -0,0 +1,110 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types';
+
+/**
+ * 查询物资-材料设备列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCailiaoshebei = (query?: CailiaoshebeiQuery): AxiosPromise<CailiaoshebeiVO[]> => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物资-材料设备详细
+ * @param id
+ */
+export const getCailiaoshebei = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物资-材料设备
+ * @param data
+ */
+export const addCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物资-材料设备
+ * @param data
+ */
+export const updateCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备
+ * @param id
+ */
+export const delCailiaoshebei = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/remove/' + id,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次列表
+ * @param query
+ * @returns {*}
+ */
+export const listBatch = (query?: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/pcList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 新增物资-材料设备批次
+ * @param data
+ */
+export const getBatch = (data: any) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/pcAdd',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备批次
+ * @param ids
+ */
+export const delBatch = (ids: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/pcDelete/' + ids,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次详情
+ * @param id
+ */
+export const getPcDetail = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/spQuery/' + id,
+    method: 'get'
+  });
+};

src/api/materials/cailiaoshebei/types.ts

@@ -0,0 +1,231 @@
+export interface CailiaoshebeiVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 批次ID
+   */
+  batchId: string | number;
+
+  /**
+   * 供货商ID
+   */
+  supplierId: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier: string;
+
+  /**
+   * 设备材料名称
+   */
+  name: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply: string;
+
+  /**
+   * 规格型号
+   */
+  specification: string;
+
+  /**
+   * 特征描述
+   */
+  signalment: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime: string;
+
+  /**
+   * 计量单位
+   */
+  unit: string;
+
+  /**
+   * 计划数量
+   */
+  plan: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface CailiaoshebeiForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+  projectId?: string | number;
+  batchNumber?: string | number;
+  approvalDesign?: string;
+  bo: any;
+  file: string;
+
+  /**
+   * 批次ID
+   */
+  batchId?: string | number;
+
+  /**
+   * 供货商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier?: string;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 特征描述
+   */
+  signalment?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime?: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime?: string;
+
+  /**
+   * 计量单位
+   */
+  unit?: string;
+
+  /**
+   * 计划数量
+   */
+  plan?: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface CailiaoshebeiQuery extends PageQuery {
+  /**
+   * 批次ID
+   */
+  batchId?: string | number;
+  projectId?: string | number;
+  batchNumber?: string;
+  /**
+   * 供货商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier?: string;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 特征描述
+   */
+  signalment?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime?: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime?: string;
+
+  /**
+   * 计量单位
+   */
+  unit?: string;
+
+  /**
+   * 计划数量
+   */
+  plan?: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/materials/materialIssue/index.ts

@@ -61,3 +61,17 @@ export const delMaterialIssue = (id: string | number | Array<string | number>) =
     method: 'delete'
   });
 };
+//获取一起名称
+export const getMaterialName = (id: any) => {
+  return request({
+    url: '/materials/materials/inventoryNumber/' + id,
+    method: 'get'
+  });
+};
+//获取出库记录
+export const inventoryList = (id: any) => {
+  return request({
+    url: '/materials/materialIssue/inventory/list/' + id,
+    method: 'get'
+  });
+};

src/api/materials/materialReceive/index.ts

@@ -61,3 +61,16 @@ export const delMaterialReceive = (id: string | number | Array<string | number>)
     method: 'delete'
   });
 };
+/**
+ * 获取合同列表数据
+ * @param id
+ */
+export const getContractNameList = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/materials/materialReceive/ctrList',
+    params: {
+      projectId: id
+    },
+    method: 'get'
+  });
+};

src/api/materials/materialsInventory/types.ts

@@ -82,7 +82,10 @@ export interface MaterialsInventoryForm extends BaseEntity {
    * 主键id
    */
   id?: string | number;
-
+  /**
+   * 使用部位
+   */
+  usePart?: string;
   /**
    * 材料id
    */

src/api/materials/materialsUseRecord/index.ts

@@ -0,0 +1,70 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MaterialsUseRecordVO, MaterialsUseRecordForm, MaterialsUseRecordQuery } from '@/api/materials/materialsUseRecord/types';
+
+/**
+ * 查询材料使用登记列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMaterialsUseInventory = (query?: MaterialsUseRecordQuery): AxiosPromise<MaterialsUseRecordVO[]> => {
+  return request({
+    url: '/materials/materialsInventory/list',
+    method: 'get',
+    params: query
+  });
+};
+export const listMaterialsUseRecord = (query?: MaterialsUseRecordQuery): AxiosPromise<MaterialsUseRecordVO[]> => {
+  return request({
+    url: '/materials/materialsUseRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询材料使用登记详细
+ * @param id
+ */
+export const getMaterialsUseRecord = (id: string | number): AxiosPromise<MaterialsUseRecordVO> => {
+  return request({
+    url: '/materials/materialsUseRecord/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增材料使用登记
+ * @param data
+ */
+export const addMaterialsUseRecord = (data: MaterialsUseRecordForm) => {
+  return request({
+    url: '/materials/materialsUseRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改材料使用登记
+ * @param data
+ */
+export const updateMaterialsUseRecord = (data: MaterialsUseRecordForm) => {
+  return request({
+    url: '/materials/materialsUseRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除材料使用登记
+ * @param id
+ */
+export const delMaterialsUseRecord = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/materials/materialsUseRecord/' + id,
+    method: 'delete'
+  });
+};

src/api/materials/materialsUseRecord/types.ts

@@ -0,0 +1,111 @@
+export interface MaterialsUseRecordVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 库存ID
+   */
+  inventoryId: string | number;
+
+  /**
+   * 使用部位
+   */
+  usePart: string;
+
+  /**
+   * 使用数量
+   */
+  useNumber: number;
+
+  /**
+   * 剩余量
+   */
+  residueNumber: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface MaterialsUseRecordForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 库存ID
+   */
+  inventoryId?: string | number;
+
+  /**
+   * 使用部位
+   */
+  usePart?: string;
+
+  /**
+   * 使用数量
+   */
+  useNumber?: number;
+
+  /**
+   * 剩余量
+   */
+  residueNumber?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface MaterialsUseRecordQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 库存ID
+   */
+  inventoryId?: string | number;
+
+  /**
+   * 使用部位
+   */
+  usePart?: string;
+
+  /**
+   * 使用数量
+   */
+  useNumber?: number;
+
+  /**
+   * 剩余量
+   */
+  residueNumber?: string | number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/materials/orderEquipment/index.ts

@@ -0,0 +1,110 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types';
+
+/**
+ * 查询物资-材料设备列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCailiaoshebei = (query?: any): AxiosPromise<CailiaoshebeiVO[]> => {
+  return request({
+    url: '/cailiaoshebei/materialsorder/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物资-材料设备详细
+ * @param id
+ */
+export const getCailiaoshebei = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物资-材料设备
+ * @param data
+ */
+export const addCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/materialsorder/modifyTheOrderForm',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 修改物资-材料设备
+ * @param data
+ */
+export const updateCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备
+ * @param id
+ */
+export const delCailiaoshebei = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/remove/' + id,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次列表
+ * @param query
+ * @returns {*}
+ */
+export const listBatch = (query?: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/materialsorder/pcPlanList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 新增物资-材料设备批次
+ * @param data
+ */
+export const getBatch = (data: any) => {
+  return request({
+    url: '/cailiaoshebei/materialbatchdemandplan/pcAdd',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备批次
+ * @param ids
+ */
+export const delBatch = (ids: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/materialbatchdemandplan/' + ids,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次详情
+ * @param id
+ */
+export const getPcDetail = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/materialsorder/spQuery/' + id,
+    method: 'get'
+  });
+};

src/api/materials/orderEquipment/types.ts

@@ -0,0 +1,229 @@
+export interface CailiaoshebeiVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 批次ID
+   */
+  batchId: string | number;
+
+  /**
+   * 供货商ID
+   */
+  supplierId: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier: string;
+
+  /**
+   * 设备材料名称
+   */
+  name: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply: string;
+
+  /**
+   * 规格型号
+   */
+  specification: string;
+
+  /**
+   * 特征描述
+   */
+  signalment: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime: string;
+
+  /**
+   * 计量单位
+   */
+  unit: string;
+
+  /**
+   * 计划数量
+   */
+  plan: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface CailiaoshebeiForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+  projectId?: string | number;
+  batchNumber?: string | number;
+  addDataList?: any[];
+
+  /**
+   * 批次ID
+   */
+  batchId?: string | number;
+
+  /**
+   * 供货商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier?: string;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 特征描述
+   */
+  signalment?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime?: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime?: string;
+
+  /**
+   * 计量单位
+   */
+  unit?: string;
+
+  /**
+   * 计划数量
+   */
+  plan?: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface CailiaoshebeiQuery extends PageQuery {
+  /**
+   * 批次ID
+   */
+  batchId?: string | number;
+  projectId?: string | number;
+  batchNumber?: string;
+  /**
+   * 供货商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier?: string;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 特征描述
+   */
+  signalment?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime?: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime?: string;
+
+  /**
+   * 计量单位
+   */
+  unit?: string;
+
+  /**
+   * 计划数量
+   */
+  plan?: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/materials/orderMaterials/index.ts

@@ -0,0 +1,102 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types';
+
+/**
+ * 查询物资-材料设备列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCailiaoshebei = (query?: CailiaoshebeiQuery): AxiosPromise<CailiaoshebeiVO[]> => {
+  return request({
+    url: '/cailiaoshebei/materialsorder/planExecutionTrackingList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物资-材料设备详细
+ * @param id
+ */
+export const getCailiaoshebei = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物资-材料设备
+ * @param data
+ */
+export const addCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/materialsorder/changeTheStatusOfTheMaterials',
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data: data
+  });
+};
+
+/**
+ * 修改物资-材料设备
+ * @param data
+ */
+export const updateCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/materialsorder/changeTheStatusOfTheMaterials',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备
+ * @param id
+ */
+export const delCailiaoshebei = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/remove/' + id,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次列表
+ * @param query
+ * @returns {*}
+ */
+export const listBatch = (query?: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/materialsorder/trackPcPlanList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 新增物资-材料设备批次
+ * @param data
+ */
+export const getBatch = (data: any) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/pcAdd',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备批次
+ * @param ids
+ */
+export const delBatch = (ids: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/pcDelete/' + ids,
+    method: 'delete'
+  });
+};

src/api/materials/overallPlanMaterialSupply/index.ts

@@ -0,0 +1,43 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+// 获取主数据列表
+export const obtainMasterDataList = (params: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/queryList',
+    method: 'get',
+    params
+  });
+};
+
+// 总供应计划列表
+export const totalsupplyplan = (params: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/list',
+    method: 'get',
+    params
+  });
+};
+// 总供应计划详细信息
+export const totalSupplyplanDetails = (id: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/' + id,
+    method: 'get'
+  });
+};
+// 修改物资-总供应计划
+export const materialChangeSupplyplan = (data: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan',
+    method: 'put',
+    data
+  });
+};
+
+// 总供应计划-批量编辑
+export const totalSupplyplanBatchEdit = (data: any): AxiosPromise => {
+  return request({
+    url: '/design/totalsupplyplan/batchEdit',
+    method: 'put',
+    data
+  });
+};

src/api/materials/purchaseDoc/index.ts

@@ -0,0 +1,130 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { PurchaseDocVO, PurchaseDocForm, PurchaseDocQuery } from '@/api/cailiaoshebei/purchaseDoc/types';
+
+/**
+ * 查询物资-采购联系单列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listPurchaseDoc = (query?: PurchaseDocQuery): AxiosPromise<PurchaseDocVO[]> => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物资-采购联系单详细
+ * @param id
+ */
+export const getPurchaseDoc = (id: string | number): AxiosPromise<PurchaseDocVO> => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物资-采购联系单
+ * @param data
+ */
+export const addPurchaseDoc = (data: PurchaseDocForm) => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物资-采购联系单
+ * @param data
+ */
+export const updatePurchaseDoc = (data: PurchaseDocForm) => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-采购联系单
+ * @param id
+ */
+export const delPurchaseDoc = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc/' + id,
+    method: 'delete'
+  });
+};
+
+export const uploadCode = (data: any) => {
+  const config: any = {
+    url: '/cailiaoshebei/ltn/link',
+    method: 'post',
+    data: data
+  };
+  // 如果 query.token 存在，就覆盖请求头里的 token
+  if (data.token) {
+    config.headers = {
+      Authorization: data.token
+    };
+  }
+
+  return request(config);
+};
+
+// 获取物流单号
+export const ltnList = (data: any) => {
+  const config: any = {
+    url: '/cailiaoshebei/ltn/list?docId=' + data.docId,
+    method: 'get'
+  };
+  // 如果 query.token 存在，就覆盖请求头里的 token
+  if (data.token) {
+    config.headers = {
+      Authorization: data.token
+    };
+  }
+
+  return request(config);
+};
+
+export const listLink = (data: any) => {
+  return request({
+    url: '/cailiaoshebei/ltn/list',
+    method: 'get',
+    params: data
+  });
+};
+/**
+ * 通过采购单获取需求
+ * @param id
+ */
+export const purchaseDocPlanList = (id) => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc/planList/' + id,
+    method: 'get'
+  });
+};
+/**
+ * 通过物流单号 物流详情
+ * @param id
+ */
+export const logisticsDetial = (id) => {
+  return request({
+    url: '/cailiaoshebei/ltn/logistics/' + id,
+    method: 'get'
+  });
+};
+
+export const getDetailBASE = (id) => {
+  return request({
+    url: '/cailiaoshebei/purchaseDoc/pdf/' + id,
+    method: 'get'
+  });
+};

src/api/materials/purchaseDoc/types.ts

@@ -0,0 +1,296 @@
+export interface PurchaseDocVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 采购单编号
+   */
+  docCode: string;
+
+  /**
+   * 供应商
+   */
+  supplier: string;
+
+  /**
+   * 事由
+   */
+  reason: string;
+
+  /**
+   * 设备统称
+   */
+  name: string;
+
+  /**
+   * 到货日期
+   */
+  arrivalDate: string;
+
+  /**
+   * 设计负责人联系方式
+   */
+  designDirectorTel: string;
+
+  /**
+   * 现场技术负责人联系方式
+   */
+  technicalDirectorTel: string;
+
+  /**
+   * 收货地址
+   */
+  receivingAddress: string;
+
+  /**
+   * 联系人
+   */
+  contacts: string;
+
+  /**
+   * 项目负责人
+   */
+  projectDirector: string;
+
+  /**
+   * 采购经办人
+   */
+  purchasingAgent: string;
+
+  /**
+   * 日期
+   */
+  preparedDate: string;
+
+  /**
+   * 反馈文件地址
+   */
+  feedbackUrl: string;
+
+  /**
+   * 签收单位
+   */
+  signingUnit: string;
+
+  /**
+   * 签收人
+   */
+  signingPerson: string;
+
+  /**
+   * 签收日期
+   */
+  signingDate: string;
+
+  /**
+   * 审核状态
+   */
+  status: string;
+
+}
+
+export interface PurchaseDocForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 采购单编号
+   */
+  docCode?: string;
+
+  /**
+   * 供应商
+   */
+  supplier?: string;
+
+  /**
+   * 事由
+   */
+  reason?: string;
+
+  /**
+   * 设备统称
+   */
+  name?: string;
+
+  /**
+   * 到货日期
+   */
+  arrivalDate?: string;
+
+  /**
+   * 设计负责人联系方式
+   */
+  designDirectorTel?: string;
+
+  /**
+   * 现场技术负责人联系方式
+   */
+  technicalDirectorTel?: string;
+
+  /**
+   * 收货地址
+   */
+  receivingAddress?: string;
+
+  /**
+   * 联系人
+   */
+  contacts?: string;
+
+  /**
+   * 项目负责人
+   */
+  projectDirector?: string;
+
+  /**
+   * 采购经办人
+   */
+  purchasingAgent?: string;
+
+  /**
+   * 日期
+   */
+  preparedDate?: string;
+
+  /**
+   * 反馈文件地址
+   */
+  feedbackUrl?: string;
+
+  /**
+   * 签收单位
+   */
+  signingUnit?: string;
+
+  /**
+   * 签收人
+   */
+  signingPerson?: string;
+
+  /**
+   * 签收日期
+   */
+  signingDate?: string;
+
+  /**
+   * 审核状态
+   */
+  status?: string;
+
+}
+
+export interface PurchaseDocQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 采购单编号
+   */
+  docCode?: string;
+
+  /**
+   * 供应商
+   */
+  supplier?: string;
+
+  /**
+   * 事由
+   */
+  reason?: string;
+
+  /**
+   * 设备统称
+   */
+  name?: string;
+
+  /**
+   * 到货日期
+   */
+  arrivalDate?: string;
+
+  /**
+   * 设计负责人联系方式
+   */
+  designDirectorTel?: string;
+
+  /**
+   * 现场技术负责人联系方式
+   */
+  technicalDirectorTel?: string;
+
+  /**
+   * 收货地址
+   */
+  receivingAddress?: string;
+
+  /**
+   * 联系人
+   */
+  contacts?: string;
+
+  /**
+   * 项目负责人
+   */
+  projectDirector?: string;
+
+  /**
+   * 采购经办人
+   */
+  purchasingAgent?: string;
+
+  /**
+   * 日期
+   */
+  preparedDate?: string;
+
+  /**
+   * 反馈文件地址
+   */
+  feedbackUrl?: string;
+
+  /**
+   * 签收单位
+   */
+  signingUnit?: string;
+
+  /**
+   * 签收人
+   */
+  signingPerson?: string;
+
+  /**
+   * 签收日期
+   */
+  signingDate?: string;
+
+  /**
+   * 审核状态
+   */
+  status?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/materials/repertory/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RepertoryVO, RepertoryForm, RepertoryQuery } from '@/api/materials/repertory/types';
+
+/**
+ * 查询物资-库存详情列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listRepertory = (query?: RepertoryQuery): AxiosPromise<RepertoryVO[]> => {
+  return request({
+    url: '/cailiaoshebei/repertory/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物资-库存详情详细
+ * @param id
+ */
+export const getRepertory = (id: string | number): AxiosPromise<RepertoryVO> => {
+  return request({
+    url: '/cailiaoshebei/repertory/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物资-库存详情
+ * @param data
+ */
+export const addRepertory = (data: RepertoryForm) => {
+  return request({
+    url: '/cailiaoshebei/repertory',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物资-库存详情
+ * @param data
+ */
+export const updateRepertory = (data: RepertoryForm) => {
+  return request({
+    url: '/cailiaoshebei/repertory',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-库存详情
+ * @param id
+ */
+export const delRepertory = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/repertory/' + id,
+    method: 'delete'
+  });
+};

src/api/materials/repertory/types.ts

@@ -0,0 +1,81 @@
+export interface RepertoryVO {
+  /**
+   * ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 设备材料名称
+   */
+  name: string;
+
+  /**
+   * 规格型号
+   */
+  specification: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface RepertoryForm extends BaseEntity {
+  /**
+   * ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface RepertoryQuery extends PageQuery {
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/materials/repertoryDetails/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RepertoryDetailsVO, RepertoryDetailsForm, RepertoryDetailsQuery } from '@/api/materials/repertoryDetails/types';
+
+/**
+ * 查询物资-库存列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listRepertoryDetails = (query?: RepertoryDetailsQuery): AxiosPromise<RepertoryDetailsVO[]> => {
+  return request({
+    url: '/cailiaoshebei/repertoryDetails/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物资-库存详细
+ * @param id
+ */
+export const getRepertoryDetails = (id: string | number): AxiosPromise<RepertoryDetailsVO> => {
+  return request({
+    url: '/cailiaoshebei/repertoryDetails/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物资-库存
+ * @param data
+ */
+export const addRepertoryDetails = (data: RepertoryDetailsForm) => {
+  return request({
+    url: '/cailiaoshebei/repertoryDetails',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物资-库存
+ * @param data
+ */
+export const updateRepertoryDetails = (data: RepertoryDetailsForm) => {
+  return request({
+    url: '/cailiaoshebei/repertoryDetails',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-库存
+ * @param id
+ */
+export const delRepertoryDetails = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/repertoryDetails/' + id,
+    method: 'delete'
+  });
+};

src/api/materials/repertoryDetails/types.ts

@@ -0,0 +1,187 @@
+export interface RepertoryDetailsVO {
+  /**
+   * ID
+   */
+  id: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId: string | number;
+
+  /**
+   * 库存ID
+   */
+  repertoryId: string | number;
+
+  /**
+   * 数据来源ID
+   */
+  materialsorderId: string | number;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 原始数量
+   */
+  originalQuantity: number;
+
+  /**
+   * 变更原因
+   */
+  changeReasons: string;
+
+  /**
+   * 变更数量
+   */
+  changeQuantity: number;
+
+  /**
+   * 最终数量
+   */
+  finalNumber: number;
+
+  /**
+   * 操作状态(字典)
+   */
+  operationStatus: string;
+
+  /**
+   * 操作人
+   */
+  operationName: string;
+
+  /**
+   * 操作人联系电话
+   */
+  operationPhone: string;
+}
+
+export interface RepertoryDetailsForm extends BaseEntity {
+  /**
+   * ID
+   */
+  id?: string | number;
+
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+
+  /**
+   * 库存ID
+   */
+  repertoryId?: string | number;
+
+  /**
+   * 数据来源ID
+   */
+  materialsorderId?: string | number;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 原始数量
+   */
+  originalQuantity?: number;
+
+  /**
+   * 变更原因
+   */
+  changeReasons?: string;
+
+  /**
+   * 变更数量
+   */
+  changeQuantity?: number;
+
+  /**
+   * 最终数量
+   */
+  finalNumber?: number;
+
+  /**
+   * 操作状态(字典)
+   */
+  operationStatus?: string;
+
+  /**
+   * 操作人
+   */
+  operationName?: string;
+
+  /**
+   * 操作人联系电话
+   */
+  operationPhone?: string;
+}
+
+export interface RepertoryDetailsQuery extends PageQuery {
+  /**
+   * 项目ID
+   */
+  projectId?: string | number;
+  id?: string | number;
+  name?: string;
+
+  /**
+   * 库存ID
+   */
+  repertoryId?: string | number;
+
+  /**
+   * 数据来源ID
+   */
+  materialsorderId?: string | number;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 原始数量
+   */
+  originalQuantity?: number;
+
+  /**
+   * 变更原因
+   */
+  changeReasons?: string;
+
+  /**
+   * 变更数量
+   */
+  changeQuantity?: number;
+
+  /**
+   * 最终数量
+   */
+  finalNumber?: number;
+
+  /**
+   * 操作状态(字典)
+   */
+  operationStatus?: string;
+
+  /**
+   * 操作人
+   */
+  operationName?: string;
+
+  /**
+   * 操作人联系电话
+   */
+  operationPhone?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/materials/suppliesprice/index.ts

@@ -0,0 +1,110 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CailiaoshebeiVO, CailiaoshebeiForm, CailiaoshebeiQuery } from '@/api/materials/cailiaoshebei/types';
+
+/**
+ * 查询物资-材料设备列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCailiaoshebei = (query?: CailiaoshebeiQuery): AxiosPromise<CailiaoshebeiVO[]> => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/listPlan',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物资-材料设备详细
+ * @param id
+ */
+export const getCailiaoshebei = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/getInfoPlanSon/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物资-材料设备
+ * @param data
+ */
+export const addCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物资-材料设备
+ * @param data
+ */
+export const updateCailiaoshebei = (data: CailiaoshebeiForm) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/editPlanSon',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备
+ * @param id
+ */
+export const delCailiaoshebei = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/remove/' + id,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次列表
+ * @param query
+ * @returns {*}
+ */
+export const listBatch = (query?: any): AxiosPromise => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/pcPlanList',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 新增物资-材料设备批次
+ * @param data
+ */
+export const getBatch = (data: any) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/pcAdd',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 删除物资-材料设备批次
+ * @param ids
+ */
+export const delBatch = (ids: string | number | Array<string | number>) => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/pcDelete/' + ids,
+    method: 'delete'
+  });
+};
+
+/**
+ * 查询物资-材料设备批次详情
+ * @param id
+ */
+export const getPcDetail = (id: string | number): AxiosPromise<CailiaoshebeiVO> => {
+  return request({
+    url: '/cailiaoshebei/cailiaoshebei/spQueryPlan/' + id,
+    method: 'get'
+  });
+};

src/api/materials/suppliesprice/types.ts

@@ -0,0 +1,228 @@
+export interface CailiaoshebeiVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 批次ID
+   */
+  batchId: string | number;
+
+  /**
+   * 供货商ID
+   */
+  supplierId: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier: string;
+
+  /**
+   * 设备材料名称
+   */
+  name: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply: string;
+
+  /**
+   * 规格型号
+   */
+  specification: string;
+
+  /**
+   * 特征描述
+   */
+  signalment: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime: string;
+
+  /**
+   * 计量单位
+   */
+  unit: string;
+
+  /**
+   * 计划数量
+   */
+  plan: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface CailiaoshebeiForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+  projectId?: string | number;
+  batchNumber?: string | number;
+
+  /**
+   * 批次ID
+   */
+  batchId?: string | number;
+
+  /**
+   * 供货商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier?: string;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 特征描述
+   */
+  signalment?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime?: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime?: string;
+
+  /**
+   * 计量单位
+   */
+  unit?: string;
+
+  /**
+   * 计划数量
+   */
+  plan?: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface CailiaoshebeiQuery extends PageQuery {
+  /**
+   * 批次ID
+   */
+  batchId?: string | number;
+  projectId?: string | number;
+  batchNumber?: string;
+  /**
+   * 供货商ID
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供货商
+   */
+  supplier?: string;
+
+  /**
+   * 设备材料名称
+   */
+  name?: string;
+
+  /**
+   * 供货来源(字典)
+   */
+  supply?: string;
+
+  /**
+   * 规格型号
+   */
+  specification?: string;
+
+  /**
+   * 特征描述
+   */
+  signalment?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 计划到场时间
+   */
+  arrivalTime?: string;
+
+  /**
+   * 计划完成时间
+   */
+  finishTime?: string;
+
+  /**
+   * 计量单位
+   */
+  unit?: string;
+
+  /**
+   * 计划数量
+   */
+  plan?: number;
+
+  /**
+   * 实际数量
+   */
+  realQuantity?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/materials/usageMaterials/index.ts

@@ -0,0 +1,81 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+// 查询物资-使用情况列表
+export const useMaterialsQueryList = (params: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupply/list',
+        method: 'get',
+        params
+    });
+};
+
+// 新增物资
+export const newMaterialsAdd = (data: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupply',
+        method: 'post',
+        data
+    });
+};
+// 修改物资
+export const materialsEdit = (data: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupply',
+        method: 'put',
+        data
+    });
+};
+// 删除物资
+export const materialsDel = (id: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupply/' + id,
+        method: 'delete',
+    });
+};
+// 获取物资详情
+export const queryMaterialsInfo = (id: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupply/' + id,
+        method: 'get',
+    });
+};
+
+
+// 查询物资子数据列表
+export const materialsUsageDetails = (query: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupplySon/list',
+        method: 'get',
+        params: query
+    });
+};
+// 获取物资-使用情况子数据详细信息
+export const materialsSonDetails = (id: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupplySon/' + id,
+        method: 'get',
+    });
+};
+// 新增物资-使用情况子数据
+export const materialsSonAdd = (data: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupplySon',
+        method: 'post',
+        data
+    });
+};
+//修改物资-使用情况子数据
+export const materialsSonEdit = (data: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupplySon',
+        method: 'put',
+        data
+    });
+};
+//   删除物资-使用情况子数据
+export const materialsSonDel = (id: any): AxiosPromise => {
+    return request({
+        url: '/cailiaoshebei/physicalsupplySon/' + id,
+        method: 'delete',
+    });
+};