diff --git a/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java b/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java index 26345cbf..40d39aa8 100644 --- a/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java +++ b/src/main/java/com/spring/modules/quote/mapper/QuoteDetailBomTreeMapper.java @@ -47,4 +47,12 @@ public interface QuoteDetailBomTreeMapper extends BaseMapper * @return 预估材料成本(estimated_material_cost) */ BigDecimal queryEstimatedMaterialCost(@Param("site") String site, @Param("partNo") String partNo); + + /** + * 根据物料编码查询物料状态 + * @param site 站点 + * @param partNo 物料编码 + * @return 物料状态(Y=正式物料, N=非正式物料) + */ + String queryPartStatus(@Param("site") String site, @Param("partNo") String partNo); } diff --git a/src/main/java/com/spring/modules/quote/service/QuoteDetailBomTreeService.java b/src/main/java/com/spring/modules/quote/service/QuoteDetailBomTreeService.java index eb3656d0..76981fcf 100644 --- a/src/main/java/com/spring/modules/quote/service/QuoteDetailBomTreeService.java +++ b/src/main/java/com/spring/modules/quote/service/QuoteDetailBomTreeService.java @@ -33,8 +33,7 @@ public interface QuoteDetailBomTreeService extends IService * 根据物料编码查询预估材料成本 * @param site 站点 * @param partNo 物料编码 - * @param status 物料状态 (Y=正式物料调用IFS接口, N=非正式物料查询数据库) * @return 预估材料成本(estimated_material_cost) */ - BigDecimal queryEstimatedMaterialCost(String site, String partNo, String status); + BigDecimal queryEstimatedMaterialCost(String site, String partNo); } diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java index 593d1bc6..96ba7bca 100644 --- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java +++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java @@ -497,14 +497,18 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl + + +