From fc19ea65297f748cbeba76241540858746ac7f56 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 22 Dec 2023 15:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../win/module/wms/controller/index/IndexController.java | 4 ++-- .../com/win/module/wms/service/balance/BalanceService.java | 3 ++- .../win/module/wms/service/balance/BalanceServiceImpl.java | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java index f8eba884..1fe39f71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java @@ -125,7 +125,7 @@ public class IndexController { dataMap.put("totalLocationCount", locationService.getTotalLocationCount());//总库位数 dataMap.put("stagnantBalanceList", balanceService.getStagnantBalanceList());//呆滞库存预警 dataMap.put("overdueBalanceList", balanceService.getOverdueBalanceList());//超期库存预警 - dataMap.put("warningBalanceList", balanceService.getWarningBalanceList());//高低储预警 + dataMap.put("warningBalanceList", balanceService.getWarningBalanceList("RAW"));//高低储预警 dataMap.put("jobCount", getMaterialJobCountMap()); return success(dataMap); } @@ -151,7 +151,7 @@ public class IndexController { dataMap.put("deliverPlanTodayCount", deliverPlanMainService.getDeliverPlanToday());//今日发货计划(未发货) dataMap.put("stagnantBalanceList", balanceService.getStagnantBalanceList());//呆滞库存预警 dataMap.put("overdueBalanceList", balanceService.getOverdueBalanceList());//超期库存预警 - dataMap.put("warningBalanceList", balanceService.getWarningBalanceList());//高低储预警 + dataMap.put("warningBalanceList", balanceService.getWarningBalanceList("FG"));//高低储预警 dataMap.put("jobCount", getProductJobCountMap()); return success(dataMap); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java index 5f79a496..b74eb021 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java @@ -109,7 +109,8 @@ public interface BalanceService { /** * 高低储预警 + * @param locationType 库位类型 * @return 高低储预警 */ - List getWarningBalanceList(); + List getWarningBalanceList(String locationType); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index 0dc50dee..05919295 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -290,8 +290,10 @@ public class BalanceServiceImpl implements BalanceService { } @Override - public List getWarningBalanceList() { - List balanceDOList = balanceMapper.selectList(new QueryWrapper<>()); + public List getWarningBalanceList(String locationType) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.inSql("location_code", "SELECT `code` FROM basic_location WHERE `type`='" + locationType + "'"); + List balanceDOList = balanceMapper.selectList(queryWrapper); List balanceRespVOList = new ArrayList<>(); //存储规则，防止同一个规则取多次 Map ruleRespVOHashMap = new HashMap<>();