Merge remote-tracking branch 'origin/master'

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);
     }

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<BalanceRespVO> getWarningBalanceList();
+    List<BalanceRespVO> getWarningBalanceList(String locationType);
 }

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<BalanceRespVO> getWarningBalanceList() {
+    public List<BalanceRespVO> getWarningBalanceList(String locationType) {
-        List<BalanceDO> balanceDOList = balanceMapper.selectList(new QueryWrapper<>());
+        QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.inSql("location_code", "SELECT `code` FROM basic_location WHERE `type`='" + locationType + "'");
+        List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper);
         List<BalanceRespVO> balanceRespVOList = new ArrayList<>();
         //存储规则，防止同一个规则取多次
         Map<String, RuleRespVO> ruleRespVOHashMap = new HashMap<>();