wms / sanyizhongka · Commits

Commit db1bb8e439f8c2822bdcbcb2b940bb23bec57e4a

Authored by pengcheng
1 parent 3c855a6c

容器容量

Inline Side-by-side
Showing 3 changed files with 13 additions and 11 deletions
src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java
  View file @db1bb8e
1 1 package com.huaheng.pc.config.locationType.controller;
2 2  
  3 +
3 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 5 import com.baomidou.mybatisplus.core.metadata.IPage;
5 6 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
... ... @@ -14,16 +15,16 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 15 import com.huaheng.framework.web.page.PageDomain;
15 16 import com.huaheng.framework.web.page.TableDataInfo;
16 17 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.location.domain.Location;
18 18 import com.huaheng.pc.config.locationType.domain.LocationType;
19   -import com.huaheng.pc.general.location.service.LocationService;
20 19 import com.huaheng.pc.config.locationType.service.LocationTypeService;
  20 +import com.huaheng.pc.general.location.domain.Location;
  21 +import com.huaheng.pc.general.location.service.LocationService;
21 22 import org.apache.shiro.authz.annotation.RequiresPermissions;
  23 +import org.springframework.beans.factory.annotation.Autowired;
22 24 import org.springframework.stereotype.Controller;
23 25 import org.springframework.ui.ModelMap;
24 26 import org.springframework.web.bind.annotation.*;
25 27  
26   -import javax.annotation.Resource;
27 28 import java.util.Arrays;
28 29 import java.util.List;
29 30  
... ... @@ -33,15 +34,16 @@ public class LocationTypeController extends BaseController {
33 34  
34 35 private String prefix = "config/locationType";
35 36  
36   - @Resource
  37 + @Autowired
37 38 private LocationTypeService locationTypeService;
38   - @Resource
  39 + @Autowired
39 40 private LocationService locationService;
40 41  
41 42 @RequestMapping("config:locationType:view")
42   - @GetMapping
43   - public String locationType() {
44   - return prefix + "/location";
  43 + @GetMapping()
  44 + public String locationType()
  45 + {
  46 + return prefix + "/locationType";
45 47 }
46 48  
47 49 /**
... ... @@ -57,7 +59,7 @@ public class LocationTypeController extends BaseController {
57 59 Integer pageNum = pageDomain.getPageNum();
58 60 Integer pageSize = pageDomain.getPageSize();
59 61  
60   - lambdaQueryWrapper.eq(LocationType::getWarehouseCode,ShiroUtils.getWarehouseCode());
  62 + lambdaQueryWrapper.eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode());
61 63  
62 64 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
63 65 /**
... ...
src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java
  View file @db1bb8e
... ... @@ -66,7 +66,7 @@ public class ZoneController extends BaseController {
66 66 */
67 67 Page<Zone> page = new Page<>(pageNum, pageSize);
68 68 IPage<Zone> iPage = zoneService.page(page, lambdaQueryWrapper);
69   - return getDataTable(iPage.getRecords());
  69 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
70 70 } else {
71 71 List<Zone> list = zoneService.list(lambdaQueryWrapper);
72 72 return getDataTable(list);
... ...
src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java
  View file @db1bb8e
... ... @@ -73,7 +73,7 @@ public class ZoneCapacityController extends BaseController
73 73 */
74 74 Page<ZoneCapacity> page = new Page<>(pageNum, pageSize);
75 75 IPage<ZoneCapacity> iPage = zoneCapacityService.page(page, lambdaQueryWrapper);
76   - return getDataTable(iPage.getRecords());
  76 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
77 77 } else {
78 78 List<ZoneCapacity> list = zoneCapacityService.list(lambdaQueryWrapper);
79 79 return getDataTable(list);
... ...