diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java index 59dabf6..8e654c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java @@ -16,7 +16,7 @@ public class StockSummary extends BaseEntity private static final long serialVersionUID = 1L; /** 序号 */ - @Excel(name = "序号") +// @Excel(name = "序号") private Long onlyIdentity; /** 物料编码 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java index 8bd3740..2a6bfbd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/controller/ViewFlatWarehouseInFlowController.java @@ -2,6 +2,8 @@ package com.ruoyi.search.ViewFlatWarehouseInFlow.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.domain.BaseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -114,7 +116,7 @@ public class ViewFlatWarehouseInFlowController extends BaseController @GetMapping("/warehouseList") public TableDataInfo warehouseList() { - startPage(); +// startPage(); BasWarehouse basWarehouse = new BasWarehouse(); basWarehouse.setWarehouseType("3"); List list = basWarehouseService.selectBasWarehouseList(basWarehouse); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java index f1719a3..695000d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java @@ -20,6 +20,10 @@ public class ViewStockoutHistory extends BaseEntity @Excel(name = "出库单号") private String stockoutId; + /** 仓库ID */ + @Excel(name = "仓库ID") + private String warehouseId; + /** 出库类型 */ @Excel(name = "出库类型") private String outType; @@ -124,6 +128,14 @@ public class ViewStockoutHistory extends BaseEntity @Excel(name = "备注") private String remark; + public String getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(String warehouseId) { + this.warehouseId = warehouseId; + } + public String getPrice() { return price; } @@ -384,6 +396,7 @@ public class ViewStockoutHistory extends BaseEntity public String toString() { return "ViewStockoutHistory{" + "stockoutId='" + stockoutId + '\'' + + ", warehouseId='" + warehouseId + '\'' + ", outType='" + outType + '\'' + ", createDate='" + createDate + '\'' + ", createManId='" + createManId + '\'' + diff --git a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml index aaae76e..30ca9fd 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml @@ -44,7 +44,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s.cargo_space_id as roadway_id, SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity FROM bas_stock s - LEFT JOIN bas_product p ON s.product_guid = p.product_guid + LEFT JOIN bas_product p ON s.product_id = p.product_id + + AND p.product_id like concat('%', #{productId}, '%') + AND p.product_name like concat('%', #{productName}, '%') + AND p.spec like concat('%', #{spec}, '%') + AND p.unit like concat('%', #{unit}, '%') + AND p.price like concat('%', #{price}, '%') + AND p.spare1 like concat('%', #{spare1}, '%') + AND p.spare2 like concat('%', #{spare2}, '%') + AND p.spare5 like concat('%', #{spare5}, '%') + AND p.spare6 like concat('%', #{spare6}, '%') + AND p.spare8 like concat('%', #{spare8}, '%') + AND p.spare7 like concat('%', #{spare7}, '%') + AND p.spare7 like concat('%', #{remark}, '%')} + AND s.lot_no like concat('%', #{lotNo}, '%') + AND s.warehouse_id like concat('%', #{warehouseId}, '%') + AND s.cargo_space_id like concat('%', #{roadwayId}, '%') + + ${params.warehouseDataScope} + + GROUP BY ,p.product_id @@ -52,12 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,p.spec ,p.unit ,p.price - p.spare1, - p.spare2, - p.spare5, - p.spare6, - p.spare8, - p.spare7, + ,p.spare1 + ,p.spare2 + ,p.spare5 + ,p.spare6 + ,p.spare8 + ,p.spare7 ,s.lot_no ,s.warehouse_id ,s.cargo_space_id @@ -67,30 +87,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 1 as group_all, SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity FROM bas_stock s - LEFT JOIN bas_product p ON s.product_guid = p.product_guid + LEFT JOIN bas_product p ON s.product_id = p.product_id + + AND p.product_id like concat('%', #{productId}, '%') + AND p.product_name like concat('%', #{productName}, '%') + AND p.spec like concat('%', #{spec}, '%') + AND p.unit like concat('%', #{unit}, '%') + AND p.price like concat('%', #{price}, '%') + AND p.spare1 like concat('%', #{spare1}, '%') + AND p.spare2 like concat('%', #{spare2}, '%') + AND p.spare5 like concat('%', #{spare5}, '%') + AND p.spare6 like concat('%', #{spare6}, '%') + AND p.spare8 like concat('%', #{spare8}, '%') + AND p.spare7 like concat('%', #{spare7}, '%') + AND p.spare7 like concat('%', #{remark}, '%')} + AND s.lot_no like concat('%', #{lotNo}, '%') + AND s.warehouse_id like concat('%', #{warehouseId}, '%') + AND s.cargo_space_id like concat('%', #{roadwayId}, '%') + + ${params.warehouseDataScope} + + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml index cae8304..3dfa7ef 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml @@ -65,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spare6 like concat('%', #{spare6}, '%') and spare7 like concat('%', #{spare7}, '%') and spare8 like concat('%', #{spare8}, '%') + + ${params.warehouseDataScope} + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml index a654fa5..3e2db5e 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml @@ -87,6 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spare6 like concat('%', #{spare6}, '%') and spare7 like concat('%', #{spare7}, '%') and spare8 like concat('%', #{spare8}, '%') + + ${params.warehouseDataScope} + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml index babd1d8..2585db7 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml @@ -91,6 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spare6 like concat('%', #{spare6}, '%') and spare7 like concat('%', #{spare7}, '%') and spare8 like concat('%', #{spare8}, '%') + + ${params.warehouseDataScope} + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml index c62a7f4..c62d191 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml @@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spare6 like concat('%', #{spare6}, '%') and spare7 like concat('%', #{spare7}, '%') and spare8 like concat('%', #{spare8}, '%') + + ${params.warehouseDataScope} + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml index e734a00..a816d51 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml @@ -118,6 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and this_cargo_area like concat('%', #{thisCargoArea}, '%') and spare7 like concat('%', #{spare7}, '%') and spare8 like concat('%', #{spare8}, '%') + + ${params.warehouseDataScope} + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml index 3ee316b..32bd330 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml @@ -118,6 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and this_cargo_area like concat('%', #{thisCargoArea}, '%') and spare7 like concat('%', #{spare7}, '%') and spare8 like concat('%', #{spare8}, '%') + + ${params.warehouseDataScope} + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml index 06f6049..e2e62df 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml @@ -100,6 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spare6 like concat('%', #{spare6}, '%') and spare7 like concat('%', #{spare7}, '%') and spare8 like concat('%', #{spare8}, '%') + + ${params.warehouseDataScope} + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml index 8c5cbe4..cd62cf3 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -35,13 +36,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history + select stockout_id,warehouse_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history diff --git a/ruoyi-ui/src/api/search/ViewInJobFlow.js b/ruoyi-ui/src/api/search/ViewInJobFlow.js index ace8294..3e6af4c 100644 --- a/ruoyi-ui/src/api/search/ViewInJobFlow.js +++ b/ruoyi-ui/src/api/search/ViewInJobFlow.js @@ -1,5 +1,11 @@ import request from '@/utils/request' - +// 查询仓库列表 +export function warehouseList() { + return request({ + url: '/bas/warehouse/list', + method: 'get' + }) +} // 查询入库作业流水列表 export function listViewInJobFlow(query) { return request({ diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 01301d6..e923245 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -1,5 +1,39 @@ // en.js export default { + viewsMain: { + systemTitle: 'Fortucky Management System', + title: 'Home', + inboundOrders: 'Inbound Orders', + outboundOrders: 'Outbound Orders', + inventoryOrders: 'Inventory Orders', + totalOrders: 'Total Orders', + weeklyStats: 'Weekly In/Out Statistics', + locationStats: 'Location Statistics', + documentList: 'Document List', + documentId: 'Document ID', + type: 'Type', + status: 'Status', + executingTasks: 'Executing Tasks', + taskId: 'Task ID', + pendingTasks: 'Pending Tasks', + priority: 'Priority', + // Document Types + inbound: 'Inbound', + outbound: 'Outbound', + inventory: 'Inventory', + // Document Status + unexecuted: 'Unexecuted', + reviewing: 'Reviewing', + executing: 'Executing', + + emptyLocation:"emptyLocation", + fullLocation:"fullLocation", + inboundAllocated:"inboundAllocated", + outboundAllocated:"outboundAllocated", + inboundNeedCheck:"inboundNeedCheck", + outboundNeedCheck:"outboundNeedCheck", + }, + login: { title: 'FORTUCKY WMS SYSTEM', @@ -628,23 +662,7 @@ export default { }, - viewsMain: { - systemTitle: 'RuoYi Admin', - title: 'homePage', - unfinishedInboundTask: 'Unfinished Inbound Task Overview', - taskKey: 'Task Key', - unfinishedInboundTaskName: 'Unfinished Inbound Task', - totalUnfinishedCount: 'Total Unfinished Count', - todayUnfinishedCount: 'Today Unfinished Count', - finishedInboundTask: 'Finished Inbound Task Overview', - finishedInboundTaskName: 'Finished Inbound Task', - totalFinishedCount: 'Total Finished Count', - todayFinishedCount: 'Today Finished Count', - unfinishedOutboundTask: 'Unfinished Outbound Task Overview', - unfinishedOutboundTaskName: 'Unfinished Outbound Task', - finishedOutboundTask: 'Finished Outbound Task Overview', - finishedOutboundTaskName: 'Finished Outbound Task' - }, + searchViewStockSecure: { stockId: 'Stock ID', diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 2b90636..c262ff2 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -635,23 +635,7 @@ export default { }, - viewsMain: { - systemTitle: '福莱瑞达管理系统', - title: '首页', - unfinishedInboundTask: '未完成入库任务概览', - taskKey: '任务键值', - unfinishedInboundTaskName: '未完成入库任务', - totalUnfinishedCount: '全部未完成数量', - todayUnfinishedCount: '今日未完成数量', - finishedInboundTask: '已完成入库任务概览', - finishedInboundTaskName: '已完成入库任务', - totalFinishedCount: '全部已完成数量', - todayFinishedCount: '今日已完成数量', - unfinishedOutboundTask: '未完成出库任务概览', - unfinishedOutboundTaskName: '未完成出库任务', - finishedOutboundTask: '已完成出库任务概览', - finishedOutboundTaskName: '已完成出库任务' - }, + searchViewStockSecure: { stockId: '库存ID', @@ -3174,5 +3158,38 @@ export default { editSuccess: '修改成功', deleteSuccess: '删除成功', deleteConfirm: '是否确认删除客户编号为"{ids}"的数据项？' + }, + viewsMain: { + systemTitle: '福莱瑞达管理系统', + title: '首页', + inboundOrders: '入库单数', + outboundOrders: '出库单数', + inventoryOrders: '盘点单数', + totalOrders: '总单据数', + weeklyStats: '近一周入库出库统计', + locationStats: '库位统计', + documentList: '单据列表', + documentId: '单据编号', + type: '类型', + status: '状态', + executingTasks: '正执行任务', + taskId: '任务编号', + pendingTasks: '待执行任务', + priority: '优先级', + // 单据类型 + inbound: '入库', + outbound: '出库', + inventory: '盘点', + // 单据状态 + unexecuted: '未执行', + reviewing: '审核中', + executing: '正执行', + // 饼图 + emptyLocation:"空货位", + fullLocation:"满货位", + inboundAllocated:"入库已分配", + outboundAllocated:"出库已分配", + inboundNeedCheck:"入库需盘点", + outboundNeedCheck:"出库需盘点", } } diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index cf6a0c4..3d1f6ef 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -8,7 +8,7 @@
-
入库单数
+
{{ $t('viewsMain.inboundOrders') }}
@@ -19,7 +19,7 @@
-
出库单数
+
{{ $t('viewsMain.outboundOrders') }}
@@ -30,8 +30,8 @@
-
盘点单数
- +
{{ $t('viewsMain.inventoryOrders') }}
+
@@ -41,7 +41,7 @@
-
总单据数
+
{{ $t('viewsMain.totalOrders') }}
@@ -53,7 +53,7 @@
- 近一周入库出库统计 + {{ $t('viewsMain.weeklyStats') }}
@@ -61,7 +61,7 @@
- 库位统计 + {{ $t('viewsMain.locationStats') }}
@@ -73,39 +73,39 @@
- 单据列表 + {{ $t('viewsMain.documentList') }}
- - - + + +
- 正执行任务 + {{ $t('viewsMain.executingTasks') }}
- - - + + +
- 待执行任务 + {{ $t('viewsMain.pendingTasks') }}
- - - + + +
@@ -140,7 +140,14 @@ export default { actualData: [] }, pieChartData: { - labels: ['空货位', '满货位', '入库已分配', '出库已分配', '入库需盘点', '出库需盘点'], + labels: [ + this.$t('viewsMain.emptyLocation'), // 空货位 + this.$t('viewsMain.fullLocation'), // 满货位 + this.$t('viewsMain.inboundAllocated'), // 入库已分配 + this.$t('viewsMain.outboundAllocated'), // 出库已分配 + this.$t('viewsMain.inboundNeedCheck'), // 入库需盘点 + this.$t('viewsMain.outboundNeedCheck') // 出库需盘点 + ], datasets: [{ data: [], backgroundColor: ['#36f7c4', '#ffc240', '#34bfa3', '#ff5f5f', '#ffd700', '#c669cd'] @@ -168,10 +175,11 @@ export default { getListData() { // 所有单据数量 finishCount().then(response => { + console.log(response) this.quantity.inbound_order = response.data.stockinCount this.quantity.outbound_order = response.data.stockoutCount this.quantity.inventory_sheet = response.data.stockcheckCount - this.quantity.total_documents = response.data.stockinCount + response.data.stockoutCount + response.data.stockcheckCount + this.quantity.total_documents = Number(response.data.stockinCount) + Number(response.data.stockoutCount) + Number(response.data.stockcheckCount) }) // 周入库出库作业 weekjob().then(response => { @@ -196,22 +204,22 @@ export default { type_(row, column) { const type = row.type if (type == 1) { - return "入库" + return this.$t('viewsMain.inbound') // 入库 } else if (type == 2) { - return "出库" + return this.$t('viewsMain.outbound') // 出库 } else if (type == 3) { - return "盘点" + return this.$t('viewsMain.inventory') // 盘点 } return "" }, status_(row, column) { const status = row.status if (status == 1) { - return "未执行" + return this.$t('viewsMain.unexecuted') // 未执行 } else if (status == 2) { - return "审核中" + return this.$t('viewsMain.reviewing') // 审核中 } else if (status == 3) { - return "正执行" + return this.$t('viewsMain.executing') // 正执行 } return "" } diff --git a/ruoyi-ui/src/views/kpi/inAnalysis/index.vue b/ruoyi-ui/src/views/kpi/inAnalysis/index.vue index 9c8c43e..01e4a5d 100644 --- a/ruoyi-ui/src/views/kpi/inAnalysis/index.vue +++ b/ruoyi-ui/src/views/kpi/inAnalysis/index.vue @@ -84,7 +84,11 @@ export default { /** 查询仓库列表 */ getWarehouseList() { // TODO: 调用获取仓库列表接口 - listWarehouse().then(response => { + var quaryParam = { + pageNum:1, + pageSize:99 + } + listWarehouse(quaryParam).then(response => { this.warehouseOptions = response.rows; }); // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}]; diff --git a/ruoyi-ui/src/views/kpi/outAnalysis/index.vue b/ruoyi-ui/src/views/kpi/outAnalysis/index.vue index ab6a47b..d14cb29 100644 --- a/ruoyi-ui/src/views/kpi/outAnalysis/index.vue +++ b/ruoyi-ui/src/views/kpi/outAnalysis/index.vue @@ -84,7 +84,11 @@ export default { /** 查询仓库列表 */ getWarehouseList() { // TODO: 调用获取仓库列表接口 - listWarehouse().then(response => { + var quaryParam = { + pageNum:1, + pageSize:99 + } + listWarehouse(quaryParam).then(response => { this.warehouseOptions = response.rows; }); // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}]; diff --git a/ruoyi-ui/src/views/kpi/roadwayAnalysis/index.vue b/ruoyi-ui/src/views/kpi/roadwayAnalysis/index.vue index d4da18c..ea67b2a 100644 --- a/ruoyi-ui/src/views/kpi/roadwayAnalysis/index.vue +++ b/ruoyi-ui/src/views/kpi/roadwayAnalysis/index.vue @@ -97,7 +97,11 @@ export default { /** 查询仓库列表 */ getWarehouseList() { // TODO: 调用获取仓库列表接口 - listWarehouse().then(response => { + var quaryParam = { + pageNum:1, + pageSize:99 + } + listWarehouse(quaryParam).then(response => { this.warehouseOptions = response.rows; }); // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}]; diff --git a/ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue b/ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue index e960e95..74fdfe0 100644 --- a/ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue +++ b/ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue @@ -72,7 +72,11 @@ export default { /** 查询仓库列表 */ getWarehouseList() { // TODO: 调用获取仓库列表接口 - listWarehouse().then(response => { + var quaryParam = { + pageNum:1, + pageSize:99 + } + listWarehouse(quaryParam).then(response => { this.warehouseOptions = response.rows; }); // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}]; diff --git a/ruoyi-ui/src/views/search/StockSummary/index.vue b/ruoyi-ui/src/views/search/StockSummary/index.vue index 190f377..9573020 100644 --- a/ruoyi-ui/src/views/search/StockSummary/index.vue +++ b/ruoyi-ui/src/views/search/StockSummary/index.vue @@ -1,6 +1,35 @@ diff --git a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue index 4698edf..af56135 100644 --- a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue @@ -382,7 +382,11 @@ export default { methods: { /** 查询仓库列表 */ getWarehouseList() { - warehouseList().then(response => { + var quaryParam = { + pageNum:1, + pageSize:99 + } + warehouseList(quaryParam).then(response => { this.warehouseOptions = response.rows; }); // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}]; diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue index b5bee4e..839d364 100644 --- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue @@ -1,6 +1,16 @@