From 2460734dfa820c33e067481faa80096aa779c2b3 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 3 Mar 2025 09:59:38 +0800
Subject: [PATCH] 20250303

---
 .../service/impl/QuoteGroupDetailServiceImpl.java    |  6 ++++--
 .../modules/quote/service/impl/QuoteServiceImpl.java | 12 ++++++++----
 .../service/impl/ModbusCommunicateServiceImpl.java   |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
index 1caa2e24..1f5ec6e3 100644
--- a/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/quote/service/impl/QuoteGroupDetailServiceImpl.java
@@ -37,9 +37,11 @@ public class QuoteGroupDetailServiceImpl extends ServiceImpl<QuoteGroupDetailMap
         // 校验是否存在相同物料
         Integer count = lambdaQuery()
                 .eq(QuoteGroupDetail::getQuoteId, quoteGroupDetail.getQuoteId())
-                .eq(QuoteGroupDetail::getPartNo, quoteGroupDetail.getPartNo()).count();
+                .eq(QuoteGroupDetail::getPartNo, quoteGroupDetail.getPartNo())
+                .eq(QuoteGroupDetail::getCostModel, quoteGroupDetail.getCostModel())
+                .count();
         if (count > 0){
-            throw new RuntimeException("报价明细已存在该物料!");
+            throw new RuntimeException("已存在报价明细为"+quoteGroupDetail.getCostModel()+"的物料!");
         }
         // 1、获取itemNo
         Integer itemNo = baseMapper.queryItemNo(quoteGroupDetail);
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 acae293c..1328616b 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
@@ -247,6 +247,7 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             quote.setMarkup(BigDecimal.ZERO);
             save(quote);
             //3、保存报价明细
+            // 多个明细,可以放到循环当中
             QuoteDetail detail = new QuoteDetail();
             detail.setQuoteId(quote.getId());
             detail.setSite(quote.getSite());
@@ -309,10 +310,13 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
             // 复制属性 到GroupDetail
             QuoteGroupDetail groupDetail = new QuoteGroupDetail();
             BeanUtils.copyProperties(detail,groupDetail);
-            QuoteDetail quoteDetail = quoteGroupDetailService.saveQuoteGroupDetail(groupDetail);
-            //quoteDetailService.saveQuoteDetail(detail);
-
-            ids.add(quoteDetail.getId());
+            QuoteDetail quoteDetail1 = quoteGroupDetailService.saveQuoteGroupDetail(groupDetail);
+            // 创建2020报价详细单
+            groupDetail.setId(null);
+            groupDetail.setCostModel("2020");
+            QuoteDetail quoteDetail2 = quoteGroupDetailService.saveQuoteGroupDetail(groupDetail);
+            // --- 明细创建结束
+            ids.add(quote.getId());
         }
         return ids;
     }
diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
index 16f497d5..8c4c4824 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
@@ -217,6 +217,7 @@ public class ModbusCommunicateServiceImpl implements ModbusCommunicateService {
         }
         float num = registersToFloat(values.get(0), values.get(1));
         if ((num == 0 || num == 0.0) && (Objects.isNull(sort.getValue()) || "0".equalsIgnoreCase(sort.getValue()) || "0.0".equalsIgnoreCase(sort.getValue()))){
+            log.info("{}:{}采集值:{}",IP,PORT,num);
             return;
         }
         Date createDate = new Date();