From 6f392fef5741b0b9ca5547b38fcd82660fde65cd Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 8 Dec 2025 11:58:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(kpi):=20=E8=B0=83=E6=95=B4=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=88=86=E6=9E=90=E4=B8=8E=E8=AE=A1=E5=88=92=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BB=A5=E6=94=AF=E6=8C=81=E6=8C=89=E5=B1=82=E6=95=B0?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改库位平面图查询逻辑，将巷道+排号筛选改为层数筛选 - 更新后端接口getPlatoons和getChartData，参数从roadwayId改为theFloor - 新增getFloors接口用于获取指定仓库的楼层数据 - 前端页面替换巷道/排号选择器为层数选择器 - 优化图表标题和提示信息显示逻辑，适配新的筛选方式 - 修复部分坐标轴标签生成逻辑，确保正确展示行列信息 - 调整物料编码字段宽度，改善表格布局 - 注释掉空间分析页面中的巷道筛选项 - 修正产品导入时字段映射错误的问题 --- .../api/service/impl/ToErpServiceImpl.java | 6 +- .../ruoyi/kpi/controller/KpiController.java | 25 ++++-- .../com/ruoyi/kpi/service/KpiService.java | 4 +- .../kpi/service/impl/KpiServiceImpl.java | 77 ++++++++++++----- .../service/impl/OutStockoutServiceImpl.java | 2 +- ruoyi-ui/src/api/kpi/spacePlan.js | 7 ++ ruoyi-ui/src/views/bas/basProduct/index.vue | 2 +- .../src/views/kpi/spaceAnalysis/index.vue | 4 +- ruoyi-ui/src/views/kpi/spacePlan/index.vue | 84 +++++++++---------- 9 files changed, 131 insertions(+), 80 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 3d7e34a..a9822d8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -115,10 +115,10 @@ public class ToErpServiceImpl implements IToErpService { AspResponse responseBean = JSONUtil.toBean(body, AspResponse.class); for (List row : responseBean.getBody().getSource().getTable().getRows()) { BasProduct product = new BasProduct(); - product.setProductGuid(row.get(0)); - product.setProductId(row.get(0)); + product.setProductGuid(row.get(2)); + product.setProductId(row.get(2)); product.setProductName(row.get(1)); - product.setCargoNo(row.get(2)); + product.setCargoNo(row.get(0)); product.setSpec(row.get(3)); product.setUnit(row.get(4)); product.setSpare1(row.get(5)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java index c1bae58..641ca8c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/controller/KpiController.java @@ -107,6 +107,18 @@ public class KpiController extends BaseController { return success(kpiService.getRoadways(warehouseId)); } + /** + * 获取货位楼层数据 + * + * @param warehouseId 仓库ID + * @return 货位楼层数据 + */ + + @GetMapping("/getFloors") + public AjaxResult getFloors(@RequestParam("warehouseId") String warehouseId){ + return success(kpiService.getFloors(warehouseId)); + } + /** * 获取货位排数据 * @@ -116,23 +128,22 @@ public class KpiController extends BaseController { */ @GetMapping("/getPlatoons") public AjaxResult getPlatoons(@RequestParam("warehouseId") String warehouseId, - @RequestParam("roadwayId") String roadwayId){ - return success(kpiService.getPlatoons(warehouseId,roadwayId)); + @RequestParam("theFloor") String theFloor){ + return success(kpiService.getPlatoons(warehouseId,theFloor)); } /** * 获取库存平面图 * * @param warehouseId 仓库ID - * @param roadwayId 巷道ID - * @param thePlatoon 排 + * @param theFloor 层数 * @return 库存平面图数据 */ @GetMapping("/getChartData") public AjaxResult getChartData(@RequestParam("warehouseId") String warehouseId, - @RequestParam("roadwayId") String roadwayId, - @RequestParam("thePlatoon") String thePlatoon){ - return success(kpiService.getChartData(warehouseId,roadwayId,thePlatoon)); + @RequestParam("theFloor") String theFloor + ){ + return success(kpiService.getChartData(warehouseId,theFloor)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/KpiService.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/KpiService.java index f9265fd..efb404e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/KpiService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/KpiService.java @@ -40,7 +40,7 @@ public interface KpiService { Map getPlatoons(String warehouseId, String roadwayId); - Map getChartData(String warehouseId, String roadwayId, String thePlatoon); + Map getChartData(String warehouseId, String theFloor); Map getChartMag(String warehouseId, String theColumn, String theFloor, String thePlatoon); @@ -48,4 +48,6 @@ public interface KpiService { // 新增：根据仓库和巷道统计各状态货位数量 Map getSpaceStatusCounts(String warehouseId, String roadwayId); + + Map getFloors(String warehouseId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java index 8653548..66eba62 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java @@ -33,7 +33,7 @@ public class KpiServiceImpl implements KpiService @Autowired private BasCargoSpaceMapper basCargoSpaceMapper; - + @Autowired private BasStockMapper basStockMapper; /** @@ -317,6 +317,36 @@ public class KpiServiceImpl implements KpiService return res; } + @Override + public Map getFloors(String warehouseId) { + Map response = new HashMap<>(); + + // 查询指定仓库和巷道的排号信息 + BasCargoSpace queryParams = new BasCargoSpace(); + queryParams.setWarehouseId(warehouseId); + List list = basCargoSpaceMapper.selectBasCargoSpaceList(queryParams); + + // 使用TreeSet去重并排序排号 + Set platoonSet = new TreeSet<>(); + for (BasCargoSpace space : list) { + if (space.getTheFloor() != null) { + platoonSet.add(space.getTheFloor()); + } + } + + // 转换为前端下拉框所需的格式 + List> platoons = new ArrayList<>(); + for (Long platoon : platoonSet) { + Map platoonMap = new HashMap<>(); + platoonMap.put("value", platoon.toString()); + platoonMap.put("label", platoon + "层"); + platoons.add(platoonMap); + } + + response.put("data", platoons); + return response; + } + @Override public Map getRoadways(String warehouseId){ Map response = new HashMap<>(); @@ -348,13 +378,13 @@ public class KpiServiceImpl implements KpiService } @Override - public Map getPlatoons(String warehouseId, String roadwayId){ + public Map getPlatoons(String warehouseId, String theFloor){ Map response = new HashMap<>(); // 查询指定仓库和巷道的排号信息 BasCargoSpace queryParams = new BasCargoSpace(); queryParams.setWarehouseId(warehouseId); - queryParams.setRoadwayId(roadwayId); + queryParams.setTheFloor(Long.valueOf(theFloor)); List list = basCargoSpaceMapper.selectBasCargoSpaceList(queryParams); // 使用TreeSet去重并排序排号 @@ -379,14 +409,11 @@ public class KpiServiceImpl implements KpiService } @Override - public Map getChartData(String warehouseId, String roadwayId, String thePlatoon) { + public Map getChartData(String warehouseId, String theFloor) { // 查询指定仓库、巷道和排号的货位信息 BasCargoSpace queryParams = new BasCargoSpace(); queryParams.setWarehouseId(warehouseId); - queryParams.setRoadwayId(roadwayId); - if (thePlatoon != null) { - queryParams.setThePlatoon(Long.parseLong(thePlatoon)); - } + queryParams.setTheFloor(Long.valueOf(theFloor)); List list = basCargoSpaceMapper.selectBasCargoSpaceList(queryParams); // 用于存储不同状态的货位坐标 @@ -405,11 +432,11 @@ public class KpiServiceImpl implements KpiService for (BasCargoSpace space : list) { // 收集列和层信息 columnSet.add(space.getTheColumn()); - floorSet.add(space.getTheFloor()); + floorSet.add(space.getThePlatoon()); // 根据状态分类处理 if (space.getStatus() != null) { - String coordinate = "[" + space.getTheColumn() + "," + space.getTheFloor() + "," + space.getStatus() + "],"; + String coordinate = "[" + space.getTheColumn() + "," + space.getThePlatoon() + "," + space.getStatus() + "],"; switch (Integer.parseInt(space.getStatus())) { case 1: empty += coordinate; break; case 2: full += coordinate; break; @@ -424,15 +451,19 @@ public class KpiServiceImpl implements KpiService // 构建列和层的标签 StringBuilder columnLabels = new StringBuilder(); for (Long col : columnSet) { - columnLabels.append("'").append(col).append(MessageUtils.message("kpi.spacePlan.column")).append("',"); + columnLabels.append("'").append(col).append("列").append("',"); } - String column = "[" + columnLabels.toString() + "]"; + String column = "[" + columnLabels + "]"; StringBuilder floorLabels = new StringBuilder(); for (Long floor : floorSet) { - floorLabels.append("'").append(floor).append(MessageUtils.message("kpi.spacePlan.floor")).append("',"); + if (floor==7){ + floorLabels.append("'").append(6).append("排").append("',"); + } + floorLabels.append("'").append(floor).append("排").append("',"); } - String floor = "[" + floorLabels.toString() + "]"; + //floorLabels.append("6排"); + String floor = "[" + floorLabels + "]"; // 返回结果 Map map = new HashMap<>(); @@ -469,7 +500,7 @@ public class KpiServiceImpl implements KpiService info.append("货位名称：").append(space.getCargoSpaceName()).append("
"); info.append("是否锁定：").append("Y".equals(space.getLocked()) ? "是" : "否").append("
"); info.append("托盘条码：").append(space.getTrayCode() != null ? space.getTrayCode() : "无").append("
"); - + // 根据cargoSpaceId查询BasStock表，获取productId和productName BasStock stockQuery = new BasStock(); stockQuery.setCargoSpaceId(space.getCargoSpaceId()); @@ -499,13 +530,13 @@ public class KpiServiceImpl implements KpiService mydoJobParam.setInOut(inOut); List datesBetween = DateUtil.rangeToList(DateUtil.parseDate(startTime), DateUtil.parseDate(endTime), DateField.DAY_OF_MONTH); List list = mydoJobFinishMapper.selectMydoJobFinishListByMydoJob(mydoJobParam); - + // 获取所有巷道ID（1和2） List roadwayIds = Arrays.asList("1", "2"); - + List xAxis = new ArrayList<>(); List> series = new ArrayList<>(); - + // 为每个巷道创建一个系列 for (String roadwayId : roadwayIds) { Map seriesItem = new HashMap<>(); @@ -515,25 +546,25 @@ public class KpiServiceImpl implements KpiService seriesItem.put("data", data); series.add(seriesItem); } - + // 按日期统计每个巷道的数量 for (DateTime dateTime : datesBetween) { xAxis.add(DateUtil.format(dateTime, "yyyy-MM-dd")); - + // 统计每个巷道在当天的数量 for (int i = 0; i < roadwayIds.size(); i++) { String roadwayId = roadwayIds.get(i); long count = list.stream() - .filter(mydoJob -> roadwayId.equals(mydoJob.getRoadwayId()) + .filter(mydoJob -> roadwayId.equals(mydoJob.getRoadwayId()) && DateUtil.isIn(mydoJob.getCreateTime(), DateUtil.beginOfDay(dateTime), DateUtil.endOfDay(dateTime))) .count(); - + @SuppressWarnings("unchecked") List data = (List) series.get(i).get("data"); data.add(count); } } - + res.put("xAxis", xAxis); res.put("series", series); return AjaxResult.success(res); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java index 64d7f87..ef3f7bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java @@ -155,7 +155,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService public String updateOutStockoutStatus(String[] stockoutIds, String status, String newStatus,String exitId) { HashMap map = new HashMap<>(); StringBuilder stringBuilder = new StringBuilder(); - if (status.equals("4")){ + if ("4".equals(status)){ for(String stockoutId:stockoutIds){ ReceiveOutStockConfirm receiveOutStockConfirm = new ReceiveOutStockConfirm(); OutStockout outStockout = selectOutStockoutByStockoutGuid(stockoutId); diff --git a/ruoyi-ui/src/api/kpi/spacePlan.js b/ruoyi-ui/src/api/kpi/spacePlan.js index fbe3330..88417ee 100644 --- a/ruoyi-ui/src/api/kpi/spacePlan.js +++ b/ruoyi-ui/src/api/kpi/spacePlan.js @@ -9,6 +9,13 @@ export function getRoadways(query) { params: query }) } +export function getFloors(query) { + return request({ + url: '/kpi/getFloors', + method: 'get', + params: query + }) +} //获取排列表 export function getPlatoons(query) { return request({ diff --git a/ruoyi-ui/src/views/bas/basProduct/index.vue b/ruoyi-ui/src/views/bas/basProduct/index.vue index 4f1e474..6cec3c4 100644 --- a/ruoyi-ui/src/views/bas/basProduct/index.vue +++ b/ruoyi-ui/src/views/bas/basProduct/index.vue @@ -98,7 +98,7 @@ - + diff --git a/ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue b/ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue index ec88752..ea536d4 100644 --- a/ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue +++ b/ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue @@ -13,7 +13,7 @@ - + 搜索 diff --git a/ruoyi-ui/src/views/kpi/spacePlan/index.vue b/ruoyi-ui/src/views/kpi/spacePlan/index.vue index be43080..72d1876 100644 --- a/ruoyi-ui/src/views/kpi/spacePlan/index.vue +++ b/ruoyi-ui/src/views/kpi/spacePlan/index.vue @@ -13,18 +13,18 @@ /> - - - - + + + + - + @@ -36,7 +36,7 @@