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() + } \ 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() + } \ 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}