From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat：反审核操作。可以对已审核的订单进行反审核，反审核的时候可以选择作废还是重新生成一条，并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核，并且需要将对应的入库、出库、发货进行作废。
---
src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
index 6f928bc..460c1d3 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.project.system.domain.SysNotice;
import com.ruoyi.project.system.mapper.SysNoticeMapper;
+import com.ruoyi.project.system.service.ISysDictDataService;
import com.ruoyi.project.system.service.ISysNoticeService;
import com.ruoyi.project.system.service.impl.SysNoticeServiceImpl;
import com.ruoyi.safe.dto.SafeHiddenDto;
@@ -38,6 +39,9 @@
@Autowired
private ISysNoticeService sysNoticeService;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+
@Override
public IPage<SafeHiddenDto> pageSafeHidden(Page page, SafeHiddenDto safeHiddenDto) {
@@ -51,12 +55,14 @@
String no = "YH" + String.format("%s%03d", datePrefix, safeHidden.getId());
safeHidden.setHiddenCode(no);
safeHiddenMapper.updateById(safeHidden);
+ //鑾峰彇闅愭偅绫诲瀷鐨勫瓧鍏�
+ String type = sysDictDataService.selectDictLabel("hidden_danger_type", safeHidden.getType());
//娑堟伅閫氱煡
sysNoticeService.simpleNoticeByUser("闅愭偅鎺掓煡涓婃姤鏁存敼",
- "闅愭偅绫诲瀷锛�"+safeHidden.getType()+"\n"+
- "闅愭偅椋庨櫓绛夌骇锛�"+safeHidden.getRiskLevel()+"\n"+
- "闅愭偅鍏蜂綋浣嶇疆锛�"+safeHidden.getLocation()+"\n"+
- "闅愭偅鎻忚堪锛�"+safeHidden.getHiddenDesc()+"\n"+
+ "闅愭偅绫诲瀷锛�"+type+"\t"+
+ "闅愭偅椋庨櫓绛夌骇锛�"+safeHidden.getRiskLevel()+"\t"+
+ "闅愭偅鍏蜂綋浣嶇疆锛�"+safeHidden.getLocation()+"\t"+
+ "闅愭偅鎻忚堪锛�"+safeHidden.getHiddenDesc()+"\t"+
"鏁存敼瀹屾垚鏈熼檺(鏃ユ湡)锛�"+safeHidden.getRectifyTime(),
Arrays.asList(Long.valueOf(safeHidden.getRectifyUserId())),
"/safeProduction/dangerInvestigation?id=" + safeHidden.getId());
--
Gitblit v1.9.3