From a53e2ef0c07c683000b4537033b8cf1c49d16f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Wed, 18 Jun 2025 17:52:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index cf6a0c4..21bb3cb 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -31,7 +31,7 @@
盘点单数
- +
@@ -168,10 +168,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 => { From 7bab82f2175cdace9a0a6992c840e3d8187d10dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Thu, 19 Jun 2025 15:57:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=B8=8EKPI=E4=BB=93=E5=BA=93=E6=9D=83=E9=99=90=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E5=BA=93=E5=AD=98=E6=B1=87=E6=80=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockSummary/domain/StockSummary.java | 2 +- .../ViewFlatWarehouseInFlowController.java | 4 +- .../domain/ViewStockoutHistory.java | 13 + .../mapper/search/StockSummaryMapper.xml | 73 ++++-- .../search/ViewFlatWarehouseInFlowMapper.xml | 3 + .../search/ViewFlatWarehouseOutFlowMapper.xml | 3 + .../mapper/search/ViewInJobFlowMapper.xml | 3 + .../mapper/search/ViewOutJobFlowMapper.xml | 3 + .../mapper/search/ViewStockDetailMapper.xml | 3 + .../mapper/search/ViewStockSecureMapper.xml | 3 + .../mapper/search/ViewStockWarningMapper.xml | 3 + .../search/ViewStockinHistoryMapper.xml | 3 + .../search/ViewStockoutHistoryMapper.xml | 9 +- ruoyi-ui/src/api/search/ViewInJobFlow.js | 8 +- ruoyi-ui/src/views/kpi/inAnalysis/index.vue | 6 +- ruoyi-ui/src/views/kpi/outAnalysis/index.vue | 6 +- .../src/views/kpi/roadwayAnalysis/index.vue | 6 +- .../src/views/kpi/spaceAnalysis/index.vue | 6 +- .../src/views/search/StockSummary/index.vue | 227 ++++++++++++------ .../search/ViewFlatWarehouseOutFlow/index.vue | 6 +- .../src/views/search/ViewInJobFlow/index.vue | 42 +++- .../src/views/search/ViewOutJobFlow/index.vue | 25 ++ .../views/search/ViewStockDetail/index.vue | 41 +++- .../views/search/ViewStockSecure/index.vue | 25 ++ .../views/search/ViewStockWarning/index.vue | 25 ++ .../views/search/ViewStockinHistory/index.vue | 41 +++- .../search/ViewStockoutHistory/index.vue | 28 ++- 27 files changed, 477 insertions(+), 140 deletions(-) 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/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..f7f9f65 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..74627c8 100644 --- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue @@ -1,6 +1,16 @@