From 7124a15384a3296eaea69ca215507927f046faac Mon Sep 17 00:00:00 2001 From: lxw <810412026@qq.com> Date: 星期三, 10 八月 2022 15:21:53 +0800 Subject: [PATCH] 产品管理下载时加入替换的散装件一起下载 --- src/main/java/com/whyc/service/ProductBomService.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/whyc/service/ProductBomService.java b/src/main/java/com/whyc/service/ProductBomService.java index 5ba1338..7bc4d28 100644 --- a/src/main/java/com/whyc/service/ProductBomService.java +++ b/src/main/java/com/whyc/service/ProductBomService.java @@ -224,6 +224,16 @@ QueryWrapper wrapper=new QueryWrapper(); wrapper.eq("parent_model",parentModel); List<ProductBom> list=mapper.selectList(wrapper); + //鏌ヨ鍑哄瓨鍦ㄦ浛鎹㈠叧绯诲緱鏁h浠� + List<ProductBom> replaceBoms=cponentMapper.getReplaceComponent(parentModel); + //涓や釜闆嗗悎鍚堝苟鎵嶆槸鏈�缁堢殑BOM + if(list!=null&&list.size()>0){ + if(replaceBoms!=null&&replaceBoms.size()>0){ + replaceBoms.stream().forEach(replaceBom->{ + list.add(replaceBom); + }); + } + } //鐢熸垚excel骞跺皢dwg鏂囦欢鏀惧湪鍚屼竴鎶ヤ笅鍘嬬缉 creatBomExcel(req,resp,list,wb); //璁板綍鏃ュ織 -- Gitblit v1.9.1