From 0450796bfd57539d178cda942a29bd2aef909fed Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 25 Aug 2025 16:40:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=A8=A1=E6=9D=BF=E9=82=AE=E4=BB=B6=20logo=20?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 InventoryOuterDetailMapper.xml 中的查询语句，使用参数化查询
- 在 outer.html 和 track.html 中添加 endCallBack 函数，用于刷新表格数据
- 更新 ry-ui.js 中的 Modal 对话框，增加结束回调函数
- 修复 TemplateMailUtil.java 中的邮件发送功能，使用 InputStreamResource 解决 logo 图片显示问题
---
 ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js     | 6 ++++++
 .../main/resources/templates/inventory/execution/track.html | 3 +++
 .../src/main/resources/templates/inventory/outer/outer.html | 3 +++
 .../src/main/java/com/ruoyi/sip/utils/TemplateMailUtil.java | 5 ++++-
 .../mapper/inventory/InventoryOuterDetailMapper.xml         | 2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index ae351482..c9065474 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -982,6 +982,12 @@ var table = {
                     },
                     success: function () {
                         $(':focus').blur();
+                    },
+                    end: function () {
+                        let hasOwnProperty = window.hasOwnProperty('endCallBack');
+                        if (hasOwnProperty) {
+                            endCallBack();
+                        }
                     }
                 });
                 top.layer.full(index);
diff --git a/ruoyi-admin/src/main/resources/templates/inventory/execution/track.html b/ruoyi-admin/src/main/resources/templates/inventory/execution/track.html
index 2d116823..e83f5d1c 100644
--- a/ruoyi-admin/src/main/resources/templates/inventory/execution/track.html
+++ b/ruoyi-admin/src/main/resources/templates/inventory/execution/track.html
@@ -368,6 +368,9 @@
         })
 
     });
+    function endCallBack(){
+        $.table.search()
+    }
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html b/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html
index 96d0a8e9..e0b0f59f 100644
--- a/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html
+++ b/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html
@@ -154,6 +154,9 @@
             });
         })
     }
+    function endCallBack(){
+        $.table.search()
+    }
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/TemplateMailUtil.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/TemplateMailUtil.java
index 58cc6d34..06f76c0a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/TemplateMailUtil.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/TemplateMailUtil.java
@@ -1,6 +1,7 @@
 package com.ruoyi.sip.utils;
 
 
+import cn.hutool.core.io.resource.InputStreamResource;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.extra.mail.Mail;
 import cn.hutool.extra.template.Template;
@@ -54,12 +55,14 @@ public class TemplateMailUtil {
 
         try{
             org.springframework.core.io.Resource resource = SpringUtils.getResource("classpath:static/img/companyLogo.png");
+            // 使用 InputStreamResource 包装输入流
+            InputStreamResource imageResource = new InputStreamResource(resource.getInputStream());
             Mail mail = Mail.create()
                     .setTos(toEmail.toArray(new String[0]))
                     .setTitle(title)
                     .setContent(result)
                     .setHtml(true);
-            mail.addImage("signature",resource.getFile());
+            mail.addImage("signature",imageResource.getStream());
             mail.send();
         } catch (Exception e) {
             log.error("发送邮件失败,错误原因:{},错误详情:{}",e.getMessage(),e.getStackTrace());
diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml
index 044fa28c..1efd2441 100644
--- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterDetailMapper.xml
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 left join oms_warehouse_info t3 on t2.warehouse_id=t3.id
                 left join product_info t4 on t1.product_code=t4.product_code
         WHERE
-            t1.id = 8
+            t1.id = #{id}
     </select>
 
     <insert id="insertInventoryOuterDetail" parameterType="InventoryOuterDetail" useGeneratedKeys="true" keyProperty="id">