diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml index 546fd3e..d0cbcfd 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml @@ -36,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -48,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bs.quantity, -- 数量 bs.spare6, -- 金额 bp.price, --单价 - bp.spare1, --产品状态 + bp.spare1 as productType, --产品状态 bp.unit, -- 单位 bp.cargo_no, --图号 bs.order_id, --合同号 @@ -69,7 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bs.stock_id, --库存编码 bs.stock_status, --库存状态 bs.lot_no, --批次号 - bs.out_quantity + bs.out_quantity, + bs.spare4, --来源 + bs.spare1 --用途 from bas_stock bs left join bas_product bp on bs.product_id = bp.product_id left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml index 6717b02..27025a2 100644 --- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml @@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -69,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bs.quantity, -- 数量 bs.spare6, -- 金额 bp.price, --单价 - bp.spare1, --产品状态 + bp.spare1 as productType, --产品状态 bp.unit, -- 单位 bp.cargo_no, --图号 bs.order_id, --合同号 @@ -90,7 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bs.stock_id, --库存编码 bs.stock_status, --库存状态 bs.lot_no, --批次号 - bs.out_quantity + bs.out_quantity, + bs.spare4, --来源 + bs.spare1 --用途 from bas_stock bs left join bas_product bp on bs.product_id = bp.product_id left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id diff --git a/ruoyi-ui/src/api/stock/management.js b/ruoyi-ui/src/api/stock/management.js index b2ed2d3..d265873 100644 --- a/ruoyi-ui/src/api/stock/management.js +++ b/ruoyi-ui/src/api/stock/management.js @@ -9,6 +9,14 @@ export function listManagement(query) { }) } +export function stockManagementList(query) { + return request({ + url: '/stock/management/list', + method: 'get', + params: query + }) +} + // 查询库存信息详细 export function getManagement(stockId) { return request({ diff --git a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue index a22dce5..776bf73 100644 --- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue @@ -294,9 +294,9 @@ - + @@ -324,6 +324,16 @@ + + + + + + @@ -454,72 +464,7 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - onlyIdentity: null, - stockId: null, - cargoSpaceId: null, - trayCode: null, - quantity: null, - jobId: null, - lotNo: null, - stockinDetailId: null, - inDate: null, - warehouseId: null, - warehouseName: null, - stackingId: null, - cargoSpaceName: null, - roadwayId: null, - cargoSpaceStatus: null, - stockStatus: null, - productStatus: null, - locked: null, - productGuid: null, - productId: null, - productName: null, - spec: null, - unit: null, - price: null, - parentId: null, - cargoNo: null, - spare1: null, - spare2: null, - spare3: null, - spare4: null, - spare5: null, - spare6: null, - spare7: null, - spare8: null, - spare9: null, - spare10: null, - spare11: null, - spare12: null, - spare13: null, - spare14: null, - spare15: null, - spare16: null, - spare17: null, - spare18: null, - spare19: null, - spare20: null, - spare21: null, - spare22: null, - spare23: null, - spare24: null, - spare25: null, - spare26: null, - spare27: null, - spare28: null, - spare29: null, - spare30: null, - spare31: null, - spare32: null, - spare33: null, - spare34: null, - spare35: null, - spare36: null, - spare37: null, - spare38: null, - spare39: null, - remark: null + }, // 表单参数 form: {}, diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue index cda33f8..f59716e 100644 --- a/ruoyi-ui/src/views/stock/management/index.vue +++ b/ruoyi-ui/src/views/stock/management/index.vue @@ -285,9 +285,9 @@ - + @@ -315,6 +315,16 @@ + + + + + +