Commit c22f4db53fef7c9284a4f39a78c5820f5a124e1b
1 parent
c5154a02
合并代码--测试修复BUG
Showing
3 changed files
with
9 additions
and
9 deletions
src/main/java/com/huaheng/pc/config/address/domain/Address.java
src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java
... | ... | @@ -56,12 +56,12 @@ public class WareHouseController extends BaseController { |
56 | 56 | * 查询仓库列表 |
57 | 57 | */ |
58 | 58 | @RequiresPermissions("config:warehouse:list") |
59 | - @Log(title = "通用-仓库管理", operating = "查看仓库列表", action = BusinessType.GRANT) | |
59 | + @Log(title = "配置-库存资料-仓库管理", operating = "查看仓库列表", action = BusinessType.GRANT) | |
60 | 60 | @PostMapping("/list") |
61 | 61 | @ResponseBody |
62 | 62 | public TableDataInfo list(Warehouse warehouse, String createdBegin, String createdEnd) { |
63 | 63 | LambdaQueryWrapper<Warehouse> lambdaQueryWrapper = Wrappers.lambdaQuery(); |
64 | - PageDomain pageDomain = TableSupport.buildPageRequest(); | |
64 | + PageDomain pageDomain = TableSupport.buildPageRequest();// 分页 | |
65 | 65 | Integer pageNum = pageDomain.getPageNum(); |
66 | 66 | Integer pageSize = pageDomain.getPageSize(); |
67 | 67 | lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Warehouse::getCreated, createdBegin) |
... | ... | @@ -96,7 +96,7 @@ public class WareHouseController extends BaseController { |
96 | 96 | * 新增保存仓库 |
97 | 97 | */ |
98 | 98 | @RequiresPermissions("config:warehouse:add") |
99 | - @Log(title = "通用-仓库管理", operating = "新增仓库", action = BusinessType.INSERT) | |
99 | + @Log(title = "配置-库存资料-仓库管理", operating = "新增仓库", action = BusinessType.INSERT) | |
100 | 100 | @PostMapping("/add") |
101 | 101 | @ResponseBody |
102 | 102 | public AjaxResult addSave(Warehouse warehouse) { |
... | ... | @@ -120,7 +120,7 @@ public class WareHouseController extends BaseController { |
120 | 120 | * 修改保存仓库 |
121 | 121 | */ |
122 | 122 | @RequiresPermissions("config:warehouse:edit") |
123 | - @Log(title = "通用-仓库管理", operating = "修改仓库", action = BusinessType.UPDATE) | |
123 | + @Log(title = "配置-库存资料-仓库管理", operating = "修改仓库", action = BusinessType.UPDATE) | |
124 | 124 | @PostMapping("/edit") |
125 | 125 | @ResponseBody |
126 | 126 | public AjaxResult editSave(Warehouse warehouse) { |
... | ... | @@ -132,7 +132,7 @@ public class WareHouseController extends BaseController { |
132 | 132 | * 删除仓库 |
133 | 133 | */ |
134 | 134 | @RequiresPermissions("config:warehouse:remove") |
135 | - @Log(title = "通用-仓库管理", operating = "删除仓库", action = BusinessType.DELETE) | |
135 | + @Log(title = "配置-库存资料-仓库管理", operating = "删除仓库", action = BusinessType.DELETE) | |
136 | 136 | @PostMapping( "/remove") |
137 | 137 | @ResponseBody |
138 | 138 | public AjaxResult remove(String codes) { |
... | ... | @@ -163,7 +163,7 @@ public class WareHouseController extends BaseController { |
163 | 163 | * 修改保存仓库 |
164 | 164 | */ |
165 | 165 | @RequiresPermissions("config:warehouse:copy") |
166 | - @Log(title = "通用-仓库管理", operating = "复制仓库", action = BusinessType.INSERT) | |
166 | + @Log(title = "配置-库存资料-仓库管理", operating = "复制仓库", action = BusinessType.INSERT) | |
167 | 167 | @GetMapping("/copy") |
168 | 168 | public String copy(String newWarehouseCode) { |
169 | 169 | return prefix+"/copy"; |
... | ... | @@ -172,7 +172,7 @@ public class WareHouseController extends BaseController { |
172 | 172 | * 复制仓库 |
173 | 173 | */ |
174 | 174 | @RequiresPermissions("config:warehouse:copy") |
175 | - @Log(title = "通用-仓库管理", operating = "复制仓库", action = BusinessType.INSERT) | |
175 | + @Log(title = "配置-库存资料-仓库管理", operating = "复制仓库", action = BusinessType.INSERT) | |
176 | 176 | @PostMapping("/copySave") |
177 | 177 | @ResponseBody |
178 | 178 | public AjaxResult copySave(String newWarehouseCode) { |
... | ... |
src/main/resources/mybatis/config/WarehouseMapper.xml