手动处理冲突

2024-10-14 17:52:20 +08:00 · 2024-10-14 17:52:20 +08:00 · ed1364018e
parent 9bf3f65c5f
commit ed1364018e
1 changed files with 0 additions and 1 deletions
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java
@ -167,7 +167,6 @@ public class BomReportApi extends BaseApi {
            return resultVO;
        }
        handlerDrawingNoQuery(query);
-        return ResultVO.success(forwardReportService.factoryBomType(query));
        //物料描述从 物料主数据获取 by 10002327 240926
        ReportBomVO r = forwardReportService.factoryBomType(query);
        if(r == null){