From 9ead1d50bebf02b238b337db3d9eb931434f413b Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Mon, 17 Mar 2025 23:03:46 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.17=20=E6=96=87=E6=A1=A3=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=20-=20=E4=BC=98=E5=8C=96=20=E8=AF=A2=E4=BB=B7?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/service/impl/AuthHistServiceImpl.java        |  1 +
 .../modules/inquiry/controller/InquiryController.java |  2 ++
 .../sys/modules/part/entity/BomAllFieldEntity.java    |  4 ++++
 .../pms/service/Impl/EamProjectServiceImpl.java       |  4 ++++
 .../mapper/inquiry/InquiryApplicationMapper.xml       | 11 +++++++----
 .../resources/mapper/part/BomManagementMapper.xml     |  1 +
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
index 56de079e..8bc46374 100644
--- a/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
@@ -168,6 +168,7 @@ public class AuthHistServiceImpl extends ServiceImpl<AuthHistMapper, AuthHistDat
             mailRecord.setDocumentNo(emailAddress.get(0).getOrderRef1());
             mailRecord.setSender(System.getProperty("user.name"));
             mailRecord.setRecipient(emailAddresss);
+            mailRecord.setType("询价提醒");
             qcMapper.saveSendMailRecord(mailRecord);
         }
     }
diff --git a/src/main/java/com/xujie/sys/modules/inquiry/controller/InquiryController.java b/src/main/java/com/xujie/sys/modules/inquiry/controller/InquiryController.java
index 8efe0c8f..c8a70fd2 100644
--- a/src/main/java/com/xujie/sys/modules/inquiry/controller/InquiryController.java
+++ b/src/main/java/com/xujie/sys/modules/inquiry/controller/InquiryController.java
@@ -169,6 +169,8 @@ public class InquiryController {
     @PostMapping("/inquiryDetail/updateInquiryDetailStatusAndPart")
     public R updateInquiryDetailStatusAndPart(@RequestBody InquiryDetailData data) {
         if (data.getPartBomStatus().equals("未创建")){
+            data.setTestPartId(data.getTestPartId());
+            data.setTestPartDesc(data.getTestPartDesc());
             data.setPartBomStatus("已创建");
             data.setUpdateDate(new Date());
             inquiryDetailService.updateById(data);
diff --git a/src/main/java/com/xujie/sys/modules/part/entity/BomAllFieldEntity.java b/src/main/java/com/xujie/sys/modules/part/entity/BomAllFieldEntity.java
index 25f38863..e3891553 100644
--- a/src/main/java/com/xujie/sys/modules/part/entity/BomAllFieldEntity.java
+++ b/src/main/java/com/xujie/sys/modules/part/entity/BomAllFieldEntity.java
@@ -1,5 +1,6 @@
 package com.xujie.sys.modules.part.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xujie.sys.common.utils.QueryPage;
 import lombok.Data;
@@ -201,4 +202,7 @@ public class BomAllFieldEntity extends QueryPage {
     private BigDecimal yieldRate;
     private String processUnit;
     private String processUnitName;
+
+    @TableField(exist = false)
+    private Integer id;
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
index 30c08e27..c0099a95 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
@@ -692,6 +692,7 @@ public class EamProjectServiceImpl implements EamProjectService {
         mailRecord.setDocumentNo(inData.getProjectNo());
         mailRecord.setSender(System.getProperty("user.name"));
         mailRecord.setRecipient(emails);
+        mailRecord.setType(type);
         qcMapper.saveSendMailRecord(mailRecord);
     }
 
@@ -813,6 +814,7 @@ public class EamProjectServiceImpl implements EamProjectService {
             mailRecord.setDocumentNo(inData.getProjectNo());
             mailRecord.setSender(System.getProperty("user.name"));
             mailRecord.setRecipient(emailAddress.getEmail());
+            mailRecord.setType(type);
             qcMapper.saveSendMailRecord(mailRecord);
         }
     }
@@ -884,6 +886,7 @@ public class EamProjectServiceImpl implements EamProjectService {
             mailRecord.setDocumentNo(inData.getProjectNo());
             mailRecord.setSender(inData.getUsername());
             mailRecord.setRecipient(emailAddress.getEmail());
+            mailRecord.setType("生产文档确认");
             qcMapper.saveSendMailRecord(mailRecord);
         }
     }
@@ -1299,6 +1302,7 @@ public class EamProjectServiceImpl implements EamProjectService {
         mailRecord.setDocumentNo(emailAddress.get(0).getProjectNo());
         mailRecord.setSender("systemAuto");
         mailRecord.setRecipient(emailAddress.get(0).getEmail());
+        mailRecord.setType("自动提醒");
         qcMapper.saveSendMailRecord(mailRecord);
     }
 }
diff --git a/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml b/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
index 0623cbf6..5e3ec219 100644
--- a/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
+++ b/src/main/resources/mapper/inquiry/InquiryApplicationMapper.xml
@@ -61,6 +61,7 @@
                 </if>
             </if>
         </where>
+        order by id desc
     </select>
     <select id="searchUserAuthInquiryApplicationInfo" resultType="com.xujie.sys.modules.inquiry.data.InquiryApplicationData">
         SELECT
@@ -88,10 +89,12 @@
         AND a.order_ref1 = b.rfq_no
         left join auth_group c on c.site = a.site and c.bu_no = a.order_ref2 and c.group_no = a.auth_group_id
         <where>
-            a.user_id = #{data.userId}
-          AND a.site = #{data.site}
-          AND a.order_ref1 LIKE #{data.orderRef1} + '%'
-        and a.can_auth_flag = 'Y'
+            a.site = #{data.site}
+            AND a.order_ref1 LIKE #{data.orderRef1} + '%'
+            and a.can_auth_flag = 'Y'
+            <if test="data.userId != 1">
+                AND a.user_id = #{data.userId}
+            </if>
         <if test="data.buNo != null and data.buNo != ''">
             AND a.order_ref2 = #{data.buNo}
         </if>
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index f1f4f1f3..34ca1e63 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -89,6 +89,7 @@
     <!-- 查出可创建BOM的物料 -->
     <select id="queryPartListBom" parameterType="ComponentPartData" resultType="BomAllFieldEntity">
         SELECT
+        a.id,
         a.site,
         a.sourceBu as buNo,
         a.part_no,