From 7eccaeaebc8315674789fff2189f30ac77ea929f Mon Sep 17 00:00:00 2001 From: chenhao Date: Mon, 20 Oct 2025 10:33:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=8E=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8F=8A=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 ExternalController 中调用的服务类名称，统一使用 projectOrderInfoService 和 deliveryService- HomepageQueryDto 增加 authSql 字段用于权限过滤 - 库存页面(index.html)调整查询条件和按钮显示逻辑，更新状态描述和字段展示 - OmsStockInfo 实体增加 notifierPhone、notifierAddress 和 notifier 字段- 各 Mapper XML 文件添加相应字段映射 - OrderInfoServiceImpl、ProjectInfoServiceImpl 和 ProjectOrderInfoServiceImpl 增加基于部门的权限控制逻辑 - ProjectOrderInfoServiceImpl 中增加邮件通知处理逻辑及模板配置 - 邮件模板 rejectTemplate.html 添加董事长驳回订单审批的通知内容- 更新导出订单信息时的字段顺序和内容处理逻辑 --- .../mailTemplate/rejectTemplate.html | 30 +++++++ .../templates/inventory/stock/index.html | 80 +++++++++---------- .../common/utils/mail/TemplateMailUtil.java | 1 + .../sip/controller/ExternalController.java | 4 +- .../com/ruoyi/sip/domain/OmsStockInfo.java | 7 ++ .../com/ruoyi/sip/dto/HomepageQueryDto.java | 1 + .../service/impl/OrderInfoServiceImpl.java | 21 +++++ .../service/impl/ProjectInfoServiceImpl.java | 23 ++++++ .../impl/ProjectOrderInfoServiceImpl.java | 55 ++++++++++++- .../mapper/manage/OrderInfoMapper.xml | 9 ++- .../mapper/sip/OmsStockInfoMapper.xml | 3 + .../mapper/sip/ProjectInfoMapper.xml | 3 +- .../mapper/sip/ProjectOrderInfoMapper.xml | 3 +- 13 files changed, 188 insertions(+), 52 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/mailTemplate/rejectTemplate.html diff --git a/ruoyi-admin/src/main/resources/mailTemplate/rejectTemplate.html b/ruoyi-admin/src/main/resources/mailTemplate/rejectTemplate.html new file mode 100644 index 00000000..2e2a35ec --- /dev/null +++ b/ruoyi-admin/src/main/resources/mailTemplate/rejectTemplate.html @@ -0,0 +1,30 @@ + + + + + + + + + +
+

您好！

+

OMS系统中订单号[[[${projectOrder.orderCode}]]][[${projectOrder.projectName}]]的订单审批流程在[[${currentDate}]]已被董事长驳回,请及时处理

+
+ +

紫光汇智信息技术有限公司

+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/inventory/stock/index.html b/ruoyi-admin/src/main/resources/templates/inventory/stock/index.html index 8c2476d4..478e5292 100644 --- a/ruoyi-admin/src/main/resources/templates/inventory/stock/index.html +++ b/ruoyi-admin/src/main/resources/templates/inventory/stock/index.html @@ -61,33 +61,18 @@ -
  • - - -
    • +
  • - - - + +
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
  • @@ -123,19 +108,19 @@ - + + + + + + + +
    @@ -146,8 +131,6 @@