diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
index 2298952b..c62f7206 100644
--- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteDetailServiceImpl.java
@@ -80,7 +80,11 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
     @Override
     @Transactional
     public void removeQuoteDetail(Long id) {
-        quoteDetailToolService.removeQuoteDetailByQuoteDetailId(id);
+        // quoteDetailToolService.removeQuoteDetailByQuoteDetailId(id);
+        Integer toolCount = quoteDetailToolService.lambdaQuery().eq(QuoteDetailTool::getQuoteDetailId, id).count();
+        if (toolCount > 0) {
+            throw new RuntimeException("该报价包含工具，请先删除工具");
+        }
         quoteDetailAttributeService.lambdaUpdate().eq(QuoteDetailAttribute::getQuoteDetailId, id).remove();
         quoteDetailBomTreeService.lambdaUpdate().eq(QuoteDetailBomTree::getQuoteDetailId, id).remove();
         quoteDetailBomService.lambdaUpdate().eq(QuoteDetailBom::getQuoteDetailId, id).remove();
@@ -91,11 +95,20 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
     @Override
     @Transactional
     public void removeQuoteDetails(Quote quote) {
-        // todo 其他删除
-        quoteDetailToolService.lambdaUpdate().eq(QuoteDetailTool::getQuoteId, quote.getId()).remove();
+        // quoteDetailToolService.lambdaUpdate().eq(QuoteDetailTool::getQuoteId, quote.getId()).remove();
+        // 工具
+        Integer toolCount = quoteDetailToolService.lambdaQuery().eq(QuoteDetailTool::getQuoteId, quote.getId()).count();
+        if (toolCount > 0) {
+            throw new RuntimeException("该报价包含工具，请先删除工具");
+        }
+        // 属性 其他成本
         quoteDetailAttributeService.lambdaUpdate().eq(QuoteDetailAttribute::getQuoteId, quote.getId()).remove();
+
+        // BOM结构
         quoteDetailBomTreeService.lambdaUpdate().eq(QuoteDetailBomTree::getQuoteId, quote.getId()).remove();
+        // BOM信息
         quoteDetailBomService.lambdaUpdate().eq(QuoteDetailBom::getQuoteId, quote.getId()).remove();
+        // Routing信息
         quoteDetailRoutingService.lambdaUpdate().eq(QuoteDetailRouting::getQuoteId, quote.getId()).remove();
         lambdaUpdate().eq(QuoteDetail::getQuoteId, quote.getId()).remove();
     }
diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
index 4eed50ea..4f368941 100644
--- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteServiceImpl.java
@@ -176,8 +176,12 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             throw new RuntimeException("参数有误");
         }
         // 其他处理
-        Quote quote = getById(id);
-        quoteDetailService.removeQuoteDetails(quote);
+//        Quote quote = getById(id);
+        Integer count = quoteDetailService.lambdaQuery().eq(QuoteDetail::getQuoteId, id).count();
+        if (count > 0){
+            throw new RuntimeException("报价单已存在明细，请先删除报价明细");
+        }
+//        quoteDetailService.removeQuoteDetails(quote);
         // 删除报价单
         removeById(id);
     }
@@ -220,7 +224,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             detail.setQuoteId(quote.getId());
             detail.setSite(quote.getSite());
             detail.setBuNo(quote.getBuNo());
-            detail.setQuoteNo(quoteNo);
+            detail.setQuoteNo(quote.getQuoteNo());
             detail.setVersionNo(quote.getVersionNo());
             detail.setPartId(quotation.getProjectPartId());
             detail.setPartNo(quotation.getTestPartNo());