Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/ReverseReportService.java

@@ -5,6 +5,7 @@ import com.google.common.base.Joiner;
 import com.nflg.product.bomnew.pojo.query.ReverseReportQuery;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
 import com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO;
+import com.nflg.product.bomnew.pojo.vo.BomOriginalListVO;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,6 +17,8 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ReverseReportService {
+    //原始BOM
+    private static String oBomIndexPrefix="oBom";
 
     private static String eBomIndexPrefix="EBom";
 
@@ -118,4 +121,22 @@ public class ReverseReportService {
             }
         }
     }
+
+    /**
+     * 创建原始BOM-反查索引
+     * @param parent
+     * @param bomDetail
+     */
+    private void  createOBomIndex(BomOriginalListVO parent  , List<BomOriginalListVO> bomDetail){
+        List<BomOriginalListVO> bomParents = bomDetail.stream().filter(u -> u.getBomRowId()>0).collect(Collectors.toList());
+        bomParents.add(parent);
+        for (BomOriginalListVO parentEnt :bomParents) {
+            List<BomOriginalListVO> parentEntChild = bomDetail.stream().filter(u -> u.getParentRowId().equals(parentEnt.getBomRowId())).collect(Collectors.toList());
+            for (BomOriginalListVO child :parentEntChild) {
+                String key= joiner.join(oBomIndexPrefix, child.getDrawingNo());
+                String value=joiner.join(oBomIndexPrefix , parentEnt.getDrawingNo() );
+                redisService.addSet(key,value);
+            }
+        }
+    }
 }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/EBomQuery.java

@@ -0,0 +1,17 @@
+package com.nflg.product.bomnew.service.domain.ReverseReport;
+
+import com.nflg.product.bomnew.pojo.query.ReverseReportQuery;
+
+/**
+ * EBom-反查
+ */
+public class EBomQuery {
+    /**
+     * 查询参数
+     */
+    private ReverseReportQuery queryParam;
+
+    public  EBomQuery(ReverseReportQuery inQueryParam){
+        this.queryParam=inQueryParam;
+    }
+}

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/MBomQuery.java

@@ -0,0 +1,17 @@
+package com.nflg.product.bomnew.service.domain.ReverseReport;
+
+import com.nflg.product.bomnew.pojo.query.ReverseReportQuery;
+
+/**
+ * MBom-反查
+ */
+public class MBomQuery {
+    /**
+     * 查询参数
+     */
+    private ReverseReportQuery queryParam;
+
+    public  MBomQuery(ReverseReportQuery inQueryParam){
+        this.queryParam=inQueryParam;
+    }
+}

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/OriginalBomQuery.java

@@ -0,0 +1,17 @@
+package com.nflg.product.bomnew.service.domain.ReverseReport;
+
+import com.nflg.product.bomnew.pojo.query.ReverseReportQuery;
+
+/**
+ * 原始BOM-反查
+ */
+public class OriginalBomQuery {
+    /**
+     * 查询参数
+     */
+    private ReverseReportQuery queryParam;
+
+    public  OriginalBomQuery(ReverseReportQuery inQueryParam){
+        this.queryParam=inQueryParam;
+    }
+}

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/ReverseReport/PBomQuery.java

@@ -0,0 +1,17 @@
+package com.nflg.product.bomnew.service.domain.ReverseReport;
+
+import com.nflg.product.bomnew.pojo.query.ReverseReportQuery;
+
+/**
+ * PBom-反查
+ */
+public class PBomQuery {
+    /**
+     * 查询参数
+     */
+    private ReverseReportQuery queryParam;
+
+    public  PBomQuery(ReverseReportQuery inQueryParam){
+        this.queryParam=inQueryParam;
+    }
+}