BOM查看查询空指针处理
This commit is contained in:
parent
f96b5701f4
commit
c422139480
|
|
@ -35,6 +35,7 @@ import org.ttzero.excel.entity.ListSheet;
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
|
import javax.xml.transform.Result;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
@ -133,7 +134,10 @@ public class BomReportApi extends BaseApi {
|
||||||
}
|
}
|
||||||
//物料描述从 物料主数据获取 by 10002327 240926
|
//物料描述从 物料主数据获取 by 10002327 240926
|
||||||
ReportBomVO r = forwardReportService.factoryBomType(query);
|
ReportBomVO r = forwardReportService.factoryBomType(query);
|
||||||
if(!r.getChildNodes().isEmpty()){
|
if(r == null){
|
||||||
|
return ResultVO.error("查无数据~");
|
||||||
|
}
|
||||||
|
if(CollUtil.isNotEmpty(r.getChildNodes())){
|
||||||
Set<String> materialNoSet = r.getChildNodes().stream().map(BaseMaterialVO::getMaterialNo).collect(Collectors.toSet());
|
Set<String> materialNoSet = r.getChildNodes().stream().map(BaseMaterialVO::getMaterialNo).collect(Collectors.toSet());
|
||||||
List<MaterialMainEntity> materialMainList = materialMainService.list(Wrappers.<MaterialMainEntity>lambdaQuery().in(MaterialMainEntity::getMaterialNo,materialNoSet));
|
List<MaterialMainEntity> materialMainList = materialMainService.list(Wrappers.<MaterialMainEntity>lambdaQuery().in(MaterialMainEntity::getMaterialNo,materialNoSet));
|
||||||
Map<String,String> materialMainMap = materialMainList.stream().collect(Collectors.toMap(MaterialMainEntity::getMaterialNo,MaterialMainEntity::getMaterialDesc,(k1, k2)->k1));
|
Map<String,String> materialMainMap = materialMainList.stream().collect(Collectors.toMap(MaterialMainEntity::getMaterialNo,MaterialMainEntity::getMaterialDesc,(k1, k2)->k1));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue