wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

工艺管理产品下拉框修改

Browse Source
This commit is contained in:
hy2250089 2020-01-13 11:12:13 +08:00
parent d7b946365b
commit 297cbaa591
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java
View File

@ -109,8 +109,8 @@ public class MachiningProductController {
params.setCompanyId(currentUser.getCompanyId()); params.setCompanyId(currentUser.getCompanyId());
PageHelper.startPage(params.getPageNum(), params.getPageSize()); PageHelper.startPage(params.getPageNum(), params.getPageSize());
//List<MachiningProduct> list = machiningProductService.findProductList(params); List<MachiningProduct> list = machiningProductService.findProductList(params);
List<MachiningProductVo> list = machiningProductService.findProductListBom(params); //List<MachiningProductVo> list = machiningProductService.findProductListBom(params);
PageInfo pageInfo = new PageInfo(list); PageInfo pageInfo = new PageInfo(list);
return ResultGenerator.genSuccessResult(pageInfo); return ResultGenerator.genSuccessResult(pageInfo);
@ -119,11 +119,11 @@ public class MachiningProductController {
//获取已生成对应bom的所有产品 //获取已生成对应bom的所有产品
@GetMapping("/productHaveBomList") @GetMapping("/productHaveBomList")
public Result productHaveBomList(MachiningProductParams params, @ApiIgnore @User CurrentUser currentUser) { public Result productHaveBomList(MachiningProductParams params, @ApiIgnore @User CurrentUser currentUser) {
//if(currentUser==null){ if(currentUser==null){
// return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
//} }
params.setCompanyId(1); params.setCompanyId(currentUser.getCompanyId());
PageHelper.startPage(params.getPageNum(), params.getPageSize()); PageHelper.startPage(params.getPageNum(), params.getPageSize());
List<MachiningProductHaveBom> list = machiningProductService.findProductHaveBomList(params); List<MachiningProductHaveBom> list = machiningProductService.findProductHaveBomList(params);
PageInfo pageInfo = new PageInfo(list); PageInfo pageInfo = new PageInfo(list);