四期

zhangc

2025-03-19 f02c773b5871178bba5370454408882416ae2b14

 src/main/java/com/zy/asrs/controller/ReportQueryController.java

@@ -39,11 +39,29 @@
   public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
                                @RequestParam(defaultValue = "10")Integer limit,
                                @RequestParam Map<String, Object> param){

      ViewStockUseBean bean = new ViewStockUseBean();
      bean.setPageSize(limit);
      bean.setPageNumber(curr);
      List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
      int count = reportQueryMapper.getViewStockUseCount(bean);

      List<ViewStockUseBean> list = new ArrayList<>();
      int count = 0;

      if(Cools.isEmpty(param.get("locType"))){
         param.put("locType","asr_loc");
      }

      if("agv_loc_1".equals(param.get("locType").toString())){
         list = reportQueryMapper.queryViewStockUse1List(bean);
         count = reportQueryMapper.getViewStockUse1Count(bean);
      }else if("agv_loc_3".equals(param.get("locType").toString())){
         list = reportQueryMapper.queryViewStockUse3List(bean);
         count = reportQueryMapper.getViewStockUse3Count(bean);
      }else {
         list = reportQueryMapper.queryViewStockUseList(bean);
         count = reportQueryMapper.getViewStockUseCount(bean);
      }

      Page<ViewStockUseBean> page = new Page<>();
      page.setRecords(list);
      page.setTotal(count);
@@ -71,8 +89,30 @@
      if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
         bean.setLoc_no(locNo);
      }
      List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
      int count = reportQueryMapper.getViewStayTimeCount(bean);
      String lev1 = String.valueOf(param.get("lev1"));
      if (!Cools.isEmpty(lev1) && !lev1.equals("null")) {
         bean.setLev1(Integer.parseInt(lev1));
      }
      String floor = String.valueOf(param.get("floor"));
      if (!Cools.isEmpty(floor) && !floor.equals("null")) {
         bean.setFloor(Integer.parseInt(floor));
      }
      String matnr = String.valueOf(param.get("matnr"));
      if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
         bean.setMatnr(matnr);
      }
      String maktx = String.valueOf(param.get("maktx"));
      if (!Cools.isEmpty(maktx) && !maktx.equals("null")) {
         bean.setMaktx(maktx);
      }
      String locType1 = String.valueOf(param.get("loc_type1"));
      if (!Cools.isEmpty(locType1) && !locType1.equals("null")) {
         bean.setLocType1(Integer.parseInt(locType1));
      }
//      List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
//      int count = reportQueryMapper.getViewStayTimeCount(bean);
      List<ViewStayTimeBean> list = reportQueryMapper.queryAllViewStayTimeList(bean);
      int count = reportQueryMapper.getAllViewStayTimeCount(bean);
      Page<ViewStayTimeBean> page = new Page<>();
      page.setRecords(list);
      page.setTotal(count);
@@ -149,6 +189,9 @@
   @RequestMapping("/viewWorkInList.action")
   public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
      List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
      for (ViewWorkInBean viewWorkInBean : list) {
         viewWorkInBean.sype();
      }
      int count = reportQueryMapper.getViewWorkInCount(bean);
      Page<ViewWorkInBean> page = new Page<>();
      page.setRecords(list);
@@ -227,6 +270,9 @@
   @RequestMapping("/viewWorkOutList.action")
   public R viewWorkOutList(ViewWorkInBean bean){
      List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
      for (ViewWorkInBean viewWorkInBean : list) {
         viewWorkInBean.sype();
      }
      int count = reportQueryMapper.getViewWorkOutCount(bean);
      Page<ViewWorkInBean> page = new Page<>();
      page.setRecords(list);