diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/QuicklyCreateBomServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/QuicklyCreateBomServiceImpl.java index a192139f..a608bb83 100644 --- a/src/main/java/com/xujie/sys/modules/part/service/impl/QuicklyCreateBomServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/part/service/impl/QuicklyCreateBomServiceImpl.java @@ -643,9 +643,9 @@ public class QuicklyCreateBomServiceImpl implements QuicklyCreateBomService { break; } } - if (b) { + /* if (b) { throw new RuntimeException("BOM日期冲突,不允许Build![ " + data.getPartNo() + "]"); - } + }*/ // 校验子物料和单位用量 data.setEngChgLevel(bomHeader.getEngChgLevel()); diff --git a/src/main/java/com/xujie/sys/modules/quote/controller/QuoteDetailBomTreeController.java b/src/main/java/com/xujie/sys/modules/quote/controller/QuoteDetailBomTreeController.java index 82f0bd80..1c6461ca 100644 --- a/src/main/java/com/xujie/sys/modules/quote/controller/QuoteDetailBomTreeController.java +++ b/src/main/java/com/xujie/sys/modules/quote/controller/QuoteDetailBomTreeController.java @@ -42,4 +42,15 @@ public class QuoteDetailBomTreeController { quoteDetailBomTreeService.changeQuoteDetailBomTree(tree); return R.ok("操作成功"); } + + @PostMapping("/refresh") + public R refreshQuoteDetailBomTree(@RequestBody QuoteDetail detail) { + try { + // 删除旧的BOM和BOM树数据 + quoteDetailBomTreeService.refreshQuoteDetailBomTree(detail); + return R.ok("刷新成功"); + } catch (Exception e) { + return R.error("刷新失败:" + e.getMessage()); + } + } } diff --git a/src/main/java/com/xujie/sys/modules/quote/service/QuoteDetailBomTreeService.java b/src/main/java/com/xujie/sys/modules/quote/service/QuoteDetailBomTreeService.java index 239c4d18..5cd0c1aa 100644 --- a/src/main/java/com/xujie/sys/modules/quote/service/QuoteDetailBomTreeService.java +++ b/src/main/java/com/xujie/sys/modules/quote/service/QuoteDetailBomTreeService.java @@ -29,4 +29,6 @@ public interface QuoteDetailBomTreeService extends IService BigDecimal queryYieldRate(QuoteDetailBomTree tree); void againQuoteDetailBomTree(QuoteDetail quoteDetail, Long detailId); + + void refreshQuoteDetailBomTree(QuoteDetail detail); } diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java index 70fcac8c..00c3b072 100644 --- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailBomTreeServiceImpl.java @@ -238,4 +238,23 @@ public class QuoteDetailBomTreeServiceImpl extends ServiceImpl