From 20b77db9bf034798f219b4af6d68a6a0a8546521 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 18 Sep 2024 13:41:10 +0800
Subject: [PATCH] 2024-09-18

---
 .../code/mapper/CodeConditionDetailMapper.java  |  2 ++
 .../service/CodeConditionDetailService.java     |  2 ++
 .../impl/CodeConditionDetailServiceImpl.java    |  5 +++++
 .../service/impl/CodeDrawingServiceImpl.java    | 10 +++++-----
 .../service/impl/CodeItemValueServiceImpl.java  |  8 ++++----
 .../modules/code/vo/CodeConditionDetailVo.java  |  2 ++
 .../mapper/code/CodeConditionDetailMapper.xml   | 17 +++++++++++++++++
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/spring/modules/code/mapper/CodeConditionDetailMapper.java b/src/main/java/com/spring/modules/code/mapper/CodeConditionDetailMapper.java
index 630a3595..a37af99f 100644
--- a/src/main/java/com/spring/modules/code/mapper/CodeConditionDetailMapper.java
+++ b/src/main/java/com/spring/modules/code/mapper/CodeConditionDetailMapper.java
@@ -26,4 +26,6 @@ public interface CodeConditionDetailMapper extends BaseMapper<CodeConditionDetai
 
     Integer getSeqNo(@Param("seqNoBits") Integer seqNoBits,
                      @Param("lastSql")String lastSql);
+
+    List<CodeConditionDetailVo> queryCodeConditionDetailByValue(Integer valueItemNo);
 }
diff --git a/src/main/java/com/spring/modules/code/service/CodeConditionDetailService.java b/src/main/java/com/spring/modules/code/service/CodeConditionDetailService.java
index 1488858d..53278550 100644
--- a/src/main/java/com/spring/modules/code/service/CodeConditionDetailService.java
+++ b/src/main/java/com/spring/modules/code/service/CodeConditionDetailService.java
@@ -14,4 +14,6 @@ public interface CodeConditionDetailService extends IService<CodeConditionDetail
     void removeConditionDetail(CodeConditionDetail conditionDetail);
 
     void editConditionDetail(CodeConditionDetail conditionDetail);
+
+    List<CodeConditionDetailVo> queryCodeConditionDetailByValue(Integer valueItemNo);
 }
diff --git a/src/main/java/com/spring/modules/code/service/impl/CodeConditionDetailServiceImpl.java b/src/main/java/com/spring/modules/code/service/impl/CodeConditionDetailServiceImpl.java
index 158e6407..0ad36ea3 100644
--- a/src/main/java/com/spring/modules/code/service/impl/CodeConditionDetailServiceImpl.java
+++ b/src/main/java/com/spring/modules/code/service/impl/CodeConditionDetailServiceImpl.java
@@ -70,4 +70,9 @@ public class CodeConditionDetailServiceImpl extends ServiceImpl<CodeConditionDet
                 .eq(CodeConditionDetail::getSeqNo,conditionDetail.getSeqNo())
                 .update(conditionDetail);
     }
+
+    @Override
+    public List<CodeConditionDetailVo> queryCodeConditionDetailByValue(Integer valueItemNo) {
+        return baseMapper.queryCodeConditionDetailByValue(valueItemNo);
+    }
 }
diff --git a/src/main/java/com/spring/modules/code/service/impl/CodeDrawingServiceImpl.java b/src/main/java/com/spring/modules/code/service/impl/CodeDrawingServiceImpl.java
index 909cb274..90d74f00 100644
--- a/src/main/java/com/spring/modules/code/service/impl/CodeDrawingServiceImpl.java
+++ b/src/main/java/com/spring/modules/code/service/impl/CodeDrawingServiceImpl.java
@@ -26,10 +26,7 @@ import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -75,10 +72,13 @@ public class CodeDrawingServiceImpl extends ServiceImpl<CodeDrawingMapper, CodeD
         if (Objects.isNull(part)) {
             throw new RuntimeException("IFS Part No不存在！");
         }
+        codeDrawing.setCreateDate(new Date());
         save(codeDrawing);
         // 获得 编码保存记录列表
         List<CodeDrawing> list = lambdaQuery()
-                .eq(CodeDrawing::getSite, codeDrawing.getSite()).list();
+                .eq(CodeDrawing::getSite, codeDrawing.getSite())
+                .eq(CodeDrawing::getCreator, codeDrawing.getCreator())
+                .list();
         if (!list.isEmpty()) {
             // 删除不存在记录的详情
             List<String> noList = list.stream().map(CodeDrawing::getDrawingNo).collect(Collectors.toList());
diff --git a/src/main/java/com/spring/modules/code/service/impl/CodeItemValueServiceImpl.java b/src/main/java/com/spring/modules/code/service/impl/CodeItemValueServiceImpl.java
index bb8f9762..90d25440 100644
--- a/src/main/java/com/spring/modules/code/service/impl/CodeItemValueServiceImpl.java
+++ b/src/main/java/com/spring/modules/code/service/impl/CodeItemValueServiceImpl.java
@@ -95,11 +95,11 @@ public class CodeItemValueServiceImpl extends ServiceImpl<CodeItemValueMapper, C
     @Transactional
     public void removeCodeItemValue(CodeItemValue codeItemValue) {
         // 删除校验
-        List<CodeConditionDetail> detailList = codeConditionDetailService.lambdaQuery().eq(CodeConditionDetail::getSQLStatementExecuteValueItemNo, codeItemValue.getValueItemNo()).list();
+        List<CodeConditionDetailVo> detailList = codeConditionDetailService.queryCodeConditionDetailByValue(codeItemValue.getValueItemNo());
         if (!detailList.isEmpty()){
-            StringBuilder str = new StringBuilder("元素已被条件序号为:(");
-            for (CodeConditionDetail detail : detailList) {
-                str.append(detail.getConditionId()).append(",");
+            StringBuilder str = new StringBuilder("元素已被条件:(");
+            for (CodeConditionDetailVo detail : detailList) {
+                str.append(detail.getConditionId()).append("-").append(detail.getConditionName()).append(",");
             }
             if (str.length() > 0) {
                 str.deleteCharAt(str.length() - 1);
diff --git a/src/main/java/com/spring/modules/code/vo/CodeConditionDetailVo.java b/src/main/java/com/spring/modules/code/vo/CodeConditionDetailVo.java
index a3a95b88..6fed082c 100644
--- a/src/main/java/com/spring/modules/code/vo/CodeConditionDetailVo.java
+++ b/src/main/java/com/spring/modules/code/vo/CodeConditionDetailVo.java
@@ -11,4 +11,6 @@ public class CodeConditionDetailVo extends CodeConditionDetail {
     private String itemDesc;
 
     private String itemValue;
+
+    private String conditionName;
 }
diff --git a/src/main/resources/mapper/code/CodeConditionDetailMapper.xml b/src/main/resources/mapper/code/CodeConditionDetailMapper.xml
index f3d45c47..c116baa3 100644
--- a/src/main/resources/mapper/code/CodeConditionDetailMapper.xml
+++ b/src/main/resources/mapper/code/CodeConditionDetailMapper.xml
@@ -132,4 +132,21 @@
             and drawing_no_new like #{lastSql}
         </if>
     </select>
+
+    <select id="queryCodeConditionDetailByValue" resultType="com.spring.modules.code.vo.CodeConditionDetailVo">
+        select d.site,
+               d.item_no,
+               d.condition_id,
+               d.seq_no,
+               d.SQL_statement_execute_item,
+               d.SQL_statement_execute_value,
+               d.SQL_statement_execute_calculate,
+               d.SQL_statement_execute_condition_id,
+               d.SQL_statement_execute_value_item_no,
+               d.SQL_statement_execute_flag,
+               h.condition_name
+        from DC_ItemValueCondition_D d
+        left join DC_ItemValueCondition_H h on d.site = h.site and d.item_no = h.item_no and d.condition_id = h.condition_id
+        where SQL_statement_execute_value_item_no = #{valueItemNo}
+    </select>
 </mapper>