#ZH

野心家

2025-05-26 3d40ce7e16a9e53bad6637bbed824507f06148b4

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

@@ -61,6 +61,7 @@

        try{
            String locNo = null;
            String locSts = null;
            long whsType = 0L;
            Integer crnNo = 0;
            Integer row1 = 0;
@@ -73,21 +74,23 @@
                }
                if (entry.getKey().equals("whsType")) {
                    whsType = Long.getLong(val);
                }else if (entry.getKey().equals("locNo")) {
                }else if (entry.getKey().equals("loc_no")) {
                    locNo = val;
                }else if (entry.getKey().equals("crnNo")) {
                    crnNo = Integer.getInteger(val);
                }else if (entry.getKey().equals("crn_no")) {
                    crnNo = Integer.parseInt(val);
                }else if (entry.getKey().equals("row1")) {
                    row1 = Integer.getInteger(val);
                    row1 = Integer.parseInt(val);
                }else if (entry.getKey().equals("bay1")) {
                    bay1 = Integer.getInteger(val);
                    bay1 = Integer.parseInt(val);
                }else if (entry.getKey().equals("lev1")) {
                    lev1 = Integer.getInteger(val);
                    lev1 = Integer.parseInt(val);
                }else if (entry.getKey().equals("loc_sts")) {
                    locSts = val;
                }
            }
            List<LocMast> locMastList = locMastService.selectLocMastListSix(locNo,whsType,crnNo,row1,bay1,lev1,0,10);
            Page<LocMast> page = new Page<LocMast>(0,10).setRecords(locMastList);
            page.setTotal(locMastService.selectLocMastListTotalSix(locNo,whsType,crnNo,row1,bay1,lev1));
            List<LocMast> locMastList = locMastService.selectLocMastListSix(locSts,locNo,whsType,crnNo,row1,bay1,lev1,curr,limit);
            Page<LocMast> page = new Page<LocMast>(curr,limit).setRecords(locMastList);
            page.setTotal(locMastService.selectLocMastListTotalSix(locSts,locNo,whsType,crnNo,row1,bay1,lev1));
            return R.ok(page);
        }catch (Exception e){
            return R.error("异常" + e);