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

src/api/Inventory/Inboundscanning.js

@@ -45,14 +45,13 @@ export function getinventory() {
   })
 }
 // 货位查询
-export function getlocate(housenumber) {
+export function getlocate() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '库存管理_货位主文件_查询数据',
-      param: '仓库流水号=' + housenumber + '=int'
+      name: '库存管理_货位主文件_查询数据_查询全部'
     }
   })
 }

src/api/Inventory/StockInquiry.js

@@ -37,3 +37,15 @@ export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSi
     }
   })
 }
+export function getTable1(num1, num2, num3, num4, num5, num6, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_库存管理_基本件出库记录查询',
+      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}