完善库存查询、出入库查询、配件库存查询

yxt-as-ui/src/api/Common/dictcommons.js

@@ -365,7 +365,7 @@ export function getGoodsCategory(params) {
   })
 }
 
-// 查询分公司orgSidPath下的所有仓库
+// 查询分公司orgSidPath下的所有仓库(可传参数仓库类型)
 export function getAllWarehouse(params) {
   return request({
     url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
@@ -403,3 +403,12 @@ export function getAllRackByKQSid(data) {
     params: data
   })
 }
+
+// 根据仓库sid查询库区
+export function getWarehouseareas(data) {
+  return request({
+    url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+    method: 'get',
+    params: data
+  })
+}

yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js

@@ -23,46 +23,5 @@ export default {
         'Content-Type': 'application/json'
       }
     })
-  },
-  // 选择厂家
-  choiceManufacturer: function(params) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-  // 查询所有仓库
-  getWarehouses: function(params) {
-    return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-  // 根据仓库查询库区
-  getWarehouseareas: function(data) {
-    return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
-      method: 'get',
-      params: data,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-  // 根据库区查询库位
-  getAllRackByKQSid: function(data) {
-    return request({
-      url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid',
-      method: 'get',
-      params: data
-    })
   }
 }

yxt-as-ui/src/api/storage/oldPartsInvertory.js

@@ -40,32 +40,5 @@ export default {
         'Content-Type': 'application/json'
       }
     })
-    },
-    // 查询所有仓库
-    getWarehouses: function(params) {
-        return request({
-            url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
-            method: 'post',
-            data: params,
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        })
-    },
-    // 根据仓库查询库区
-    getWarehouseareas: function(data) {
-        return request({
-            url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
-            method: 'get',
-            params: data
-        })
-    },
-    // 根据库区查询库位
-    getAllRackByKQSid: function(data) {
-        return request({
-            url: '/wms/apiadmin/base/wmswarehouserack/getAllRackByKQSid',
-            method: 'get',
-            params: data
-        })
   }
 }

yxt-as-ui/src/views/storage/inventory/inventory.vue

@@ -206,7 +206,7 @@ export default {
   },
   methods: {
     init() {
-      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }

yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue

@@ -228,7 +228,7 @@ export default {
           this.busType_list = res.data
         }
       })
-      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }

yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue

@@ -121,6 +121,7 @@ import req from '@/api/storage/oldPartsInAndOutStorage.js'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import { typeValues } from '@/api/Common/dictcommons'
+import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons'
 import req2 from '@/api/goods/factory.js'
 
 export default {
@@ -204,7 +205,7 @@ export default {
   },
   methods: {
     init() {
-      req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }
@@ -354,7 +355,7 @@ export default {
       }
     },
     getWarehouseAreaList(sid) {
-      req.getWarehouseareas({ ckSid: sid }).then((res) => {
+      getWarehouseareas({ ckSid: sid }).then((res) => {
         if (res.success) {
           this.warehouseAreaList = res.data
         }
@@ -372,7 +373,7 @@ export default {
       }
     },
     getWareHouseCodeList(sid) {
-      req.getAllRackByKQSid({ kqSid: sid }).then((res) => {
+      getAllRackByKQSid({ kqSid: sid }).then((res) => {
         if (res.success) {
           this.warehouseRackCodeList = res.data
         }

yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue

@@ -97,6 +97,7 @@ import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import req from '@/api/storage/oldPartsInvertory.js'
 import divInfo from './oldPartsInvertoryInfo.vue'
+import { getAllRackByKQSid, getAllWarehouse, getWarehouseareas } from '@/api/Common/dictcommons'
 
 export default {
   components: {
@@ -330,7 +331,7 @@ export default {
       this.viewState = 1
     },
     getWarehouseList() {
-      req.getWarehouses({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }
@@ -350,7 +351,7 @@ export default {
       }
     },
     getWarehouseAreaList(sid) {
-      req.getWarehouseareas({ ckSid: sid }).then((res) => {
+      getWarehouseareas({ ckSid: sid }).then((res) => {
         if (res.success) {
           this.warehouseAreaList = res.data
         }
@@ -368,7 +369,7 @@ export default {
       }
     },
     getWareHouseCodeList(sid) {
-      req.getAllRackByKQSid({ kqSid: sid }).then((res) => {
+      getAllRackByKQSid({ kqSid: sid }).then((res) => {
         if (res.success) {
           this.warehouseRackCodeList = res.data
         }

yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue

@@ -165,7 +165,7 @@ export default {
   },
   methods: {
     init() {
-      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '配件库' }).then((res) => {
         if (res.success) {
           this.warehouseList = res.data
         }