|
|
@@ -127,7 +127,7 @@ public class ProcessBomController { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* hy |
|
|
|
* hy弃用 |
|
|
|
* 根据选择的产品名称来展示产品其他数据和工序数据, |
|
|
|
* 用于新建生产加工产品bom下拉框选择 |
|
|
|
* @param params |
|
|
@@ -166,11 +166,11 @@ public class ProcessBomController { |
|
|
|
}) |
|
|
|
@GetMapping("/and/product/bom/by/prodbom") |
|
|
|
public Result ProductAndProcessBomByProdBom(ProcessBomParams params, @ApiIgnore @User CurrentUser currentUser){ |
|
|
|
if(currentUser==null){ |
|
|
|
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); |
|
|
|
} |
|
|
|
//if(currentUser==null){ |
|
|
|
// return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); |
|
|
|
//} |
|
|
|
|
|
|
|
params.setCompanyId(currentUser.getCompanyId()); |
|
|
|
params.setCompanyId(1); |
|
|
|
ProductProcessBomPo productProcessBomPo = processBomService.findProductAndProcessBomByProdBom(params); |
|
|
|
return ResultGenerator.genSuccessResult(productProcessBomPo); |
|
|
|
} |
|
|
|