From 149a036f820d14f9379ff592534ec4ef6d61bd4c Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Sun, 18 Jan 2026 11:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=87=BA=E6=9C=AC=E4=BB=93=E5=BA=93=E4=BB=BB=E6=84=8F=E8=B4=A7?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/ViewHandAllotStock.java | 37 +++++++++++++++++++ .../impl/ViewHandAllotStockServiceImpl.java | 3 +- .../mapper/out/ViewHandAllotStockMapper.xml | 13 ++++++- ruoyi-ui/src/views/stock/pointOut.vue | 36 ++++++++++++++++++ 4 files changed, 87 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java index 5061d37..7fe61a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java @@ -164,6 +164,43 @@ public class ViewHandAllotStock extends BaseEntity @Excel(name = "货位名称") private String cargoSpaceName; + private String roadwayId; + private String thePlatoon; + private String theColumn; + private String theFloor; + + public String getRoadwayId() { + return roadwayId; + } + + public void setRoadwayId(String roadwayId) { + this.roadwayId = roadwayId; + } + + public String getThePlatoon() { + return thePlatoon; + } + + public void setThePlatoon(String thePlatoon) { + this.thePlatoon = thePlatoon; + } + + public String getTheColumn() { + return theColumn; + } + + public void setTheColumn(String theColumn) { + this.theColumn = theColumn; + } + + public String getTheFloor() { + return theFloor; + } + + public void setTheFloor(String theFloor) { + this.theFloor = theFloor; + } + public void setStockId(String stockId) { this.stockId = stockId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java index b866841..cd72049 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/service/impl/ViewHandAllotStockServiceImpl.java @@ -62,11 +62,13 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService if (first.isPresent()){ //二联合普通人员 viewHandAllotStock.setWarehouseId("02"); + viewHandAllotStock.setModel(Convert.toStr(SecurityUtils.getDeptId())); } Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); if (first1.isPresent()){ //三联合普通人员 viewHandAllotStock.setWarehouseId("01"); + viewHandAllotStock.setModel(Convert.toStr(SecurityUtils.getDeptId())); } Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); if (first2.isPresent()){ @@ -78,7 +80,6 @@ public class ViewHandAllotStockServiceImpl implements IViewHandAllotStockService //三联合管理员 viewHandAllotStock.setWarehouseId("01"); } - viewHandAllotStock.setModel(Convert.toStr(SecurityUtils.getDeptId())); } return viewHandAllotStockMapper.selectViewHandAllotStockList(viewHandAllotStock); } diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml index 421858f..5ada1e4 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml @@ -42,10 +42,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + - select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name from view_hand_allot_stock vhat + select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name,roadway_id, + the_platoon, + the_column, + the_floor from view_hand_allot_stock vhat