bom新增分类查询

sd-business/src/main/java/com/sd/business/entity/bom/dto/BomSelectDto.java

@@ -59,4 +59,9 @@ public class BomSelectDto extends BaseSelectDto {
      */
     private Long priceSystemId;
 
+    /**
+     * bom分类id
+     */
+    private Long bomClassifyId;
+
 }

sd-business/src/main/java/com/sd/business/service/bom/BomClassifyService.java

@@ -45,4 +45,9 @@ public interface BomClassifyService extends BaseService<BomClassify> {
      */
     void delete(Long id);
 
+    /**
+     * 获取子集id
+     */
+    List<Long> getChildrenIdList(Long parentId);
+
 }

sd-business/src/main/java/com/sd/business/service/bom/impl/BomClassifyServiceImpl.java

@@ -15,7 +15,9 @@ import com.sd.business.mapper.bom.BomClassifyMapper;
 import com.sd.business.service.bom.BomClassifyService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -73,4 +75,24 @@ public class BomClassifyServiceImpl extends ServiceImpl<BomClassifyMapper, BomCl
         this.removeById(id);
     }
 
+    @Override
+    public List<Long> getChildrenIdList(Long parentId) {
+        List<BomClassify> list = list();
+        List<Long> childrenIdList = new ArrayList<>();
+        getChildrenIdList(parentId, childrenIdList, list);
+        return childrenIdList;
+    }
+
+    /**
+     * 递归添加子集节点id
+     */
+    private void getChildrenIdList(Long parentId, List<Long> childrenIdList, List<BomClassify> list) {
+        childrenIdList.add(parentId);
+        for (BomClassify bomClassify : list) {
+            if (Objects.equals(bomClassify.getParentId(), parentId)) {
+                getChildrenIdList(bomClassify.getId(), childrenIdList, list);
+            }
+        }
+    }
+
 }

sd-business/src/main/java/com/sd/business/service/bom/impl/BomServiceImpl.java

@@ -22,6 +22,7 @@ import com.sd.business.entity.bom.po.BomOperatingLog;
 import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.bom.vo.BomVo;
 import com.sd.business.mapper.bom.BomMapper;
+import com.sd.business.service.bom.BomClassifyService;
 import com.sd.business.service.bom.BomOperatingLogService;
 import com.sd.business.service.bom.BomService;
 import com.sd.business.service.bom.BomSpecService;
@@ -56,6 +57,9 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomSe
     @Autowired
     private BomOperatingLogService bomOperatingLogService;
 
+    @Autowired
+    private BomClassifyService bomClassifyService;
+
     @Override
     public Page<BomVo> getPage(BomSelectDto dto) {
         IWrapper<Bom> wrapper = getWrapper();
@@ -74,6 +78,10 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomSe
             }
             wrapper.eq("b", Bom::getId, bomIdList);
         }
+        if (ObjectUtil.isNotNull(dto.getBomClassifyId())) {
+            List<Long> childrenIdList = bomClassifyService.getChildrenIdList(dto.getBomClassifyId());
+            wrapper.in("b", Bom::getBomClassifyId, childrenIdList);
+        }
 
         Page<BomVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<BomVo> records = page.getRecords();

sd-wln/src/main/java/com/sd/wln/scheduled/WlnSyncTask.java

@@ -47,7 +47,6 @@ public class WlnSyncTask {
     @Scheduled(fixedDelay = 60 * 1000)
     private void syncOrder() {
         wlnOrderService.syncOrder();
-        System.out.println();
     }
 
 }