Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/api/Inventory/InventoryCheck.js

@@ -105,7 +105,7 @@ export function searchStandardPartOut(data1) {
     data: {
       type: '1',
       name: '库存管理_库存盘点_标准件出库记录',
-      param: '组件零件流水号=' + data1
+      param: '采购合同明细流水号=' + data1
     }
   })
 }
@@ -211,6 +211,30 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p
     }
   })
 }
+// 车间采购外购件出库记录查询
+export function searchShopPurchasePartOut(teampart) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_库存盘点_车间外购件出库记录',
+      param: '请购单明细流水号=' + teampart
+    }
+  })
+}
+// 车间采购外购件入库记录查询
+export function searchShopPurchasePartIn(teampart) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_库存盘点_车间外购件入库记录',
+      param: '请购单明细流水号=' + teampart
+    }
+  })
+}
 // 车间采购库存盘点修改
 export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, craftnumber, materialType, materiallocate, name, mode, picture, type, material) {
   return request({

src/api/Inventory/SubstitutePart.js

@@ -36,26 +36,26 @@ export function searchTeam(machineNumber) {
   })
 }
 // 外购件、标准件查询
-export function searchPurchasePart(project_check, project, machine_check, machine, group_check, group) {
+export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '库存管理_外购件出库_零件查询',
-      param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group
+      param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 被替换件查询
-export function searchSubstituted(material_check, material) {
+export function searchSubstituted() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '库存管理_替换件_被替换件查询',
-      param: '物料名称_check=' + material_check + '&物料名称=' + material
+      name: '库存管理_离线外购件_出库查询'
     }
   })
 }