rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

手动处理冲突

This commit is contained in:
10001392 2024-10-14 17:52:20 +08:00
parent 9bf3f65c5f
commit ed1364018e
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
View File

@ -167,7 +167,6 @@ public class BomReportApi extends BaseApi {
return resultVO; return resultVO;
} }
handlerDrawingNoQuery(query); handlerDrawingNoQuery(query);
return ResultVO.success(forwardReportService.factoryBomType(query));
//物料描述从 物料主数据获取 by 10002327 240926 //物料描述从 物料主数据获取 by 10002327 240926
ReportBomVO r = forwardReportService.factoryBomType(query); ReportBomVO r = forwardReportService.factoryBomType(query);
if(r == null){ if(r == null){