递归查询bom树信息

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesDaoImpl.java

@@ -39,8 +39,8 @@ public class MesDaoImpl implements IMesBomDao {
 
     @Override
     public List<String> findBomCodeByPartNoAndBomVersion(String partNo, String bomVersion, String organizeCode) {
-        StringBuilder sql = new StringBuilder(" select distinct bomCode from MesBom where partNo = :partNo  and bomVersion = :bomVersion" +
+        StringBuilder sql = new StringBuilder(" select distinct bomCode from MesBom where partNo = :partNo  and bomVersion = :bomVersion " +
-                "and isDeleted=:isDeleted and isValid = :isValid and organizeCode = :organizeCode order by createDatetime desc");
+                " and isDeleted=:isDeleted and isValid = :isValid and organizeCode = :organizeCode order by createDatetime desc");
         Query query = entityManager.createQuery(sql.toString(), String.class);
         query.setParameter("partNo", partNo);
         query.setParameter("bomVersion", bomVersion);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java

@@ -207,7 +207,7 @@ public class MesBomService extends BaseMesService<MesBom> implements IMesBomServ
         if (!CollectionUtils.isEmpty(bomList)) {
             for (MesBom bom : bomList) {
                 if (Objects.equals("X", bom.getPartType())) {
-                    List<MesBom> resultList = findMesBomByPartNoAndBomVersion(bom.getPartNo(), bom.getOrganizeCode(), bom.getBomVersion(), bom.getBomCode(), effStartTime);
+                    List<MesBom> resultList = findMesBomByPartNoAndBomVersion(bom.getItemPartNo(), bom.getOrganizeCode(), bom.getBomVersion(), bom.getBomCode(), effStartTime);
                     bom.setChildTreeList(resultList);
                     recursionBomList(resultList,effStartTime);
                 }