From b16d7f9fd029bf9d37bcc3c6f3cf8472a0081888 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 26 七月 2025 16:34:46 +0800
Subject: [PATCH] 设备故障登记修改与产品安全确认
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java
index a874675..2c25443 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportProductHazardsController.java
@@ -10,6 +10,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.util.StrUtil;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
@@ -19,6 +20,7 @@
import org.jeecg.modules.eam.dto.EamReportProductHazardsDto;
import org.jeecg.modules.eam.dto.EamReportRepairDto;
import org.jeecg.modules.eam.entity.EamReportProductHazards;
+import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamReportProductHazardsQuery;
import org.jeecg.modules.eam.service.IEamReportProductHazardsService;
@@ -27,6 +29,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.eam.service.IEamReportRepairService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -50,7 +53,8 @@
public class EamReportProductHazardsController extends JeecgController<EamReportProductHazards, IEamReportProductHazardsService> {
@Autowired
private IEamReportProductHazardsService eamReportProductHazardsService;
-
+ @Autowired
+ private IEamReportRepairService eamReportRepairService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -86,6 +90,43 @@
eamReportProductHazardsService.save(eamReportProductHazards);
return Result.OK("娣诲姞鎴愬姛锛�");
}
+
+ /**
+ * 鎿嶄綔宸ユ彁浜�-鍙戣捣娴佺▼
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "璁惧浜嬫晠鐧昏琛�-鎻愪氦", notes = "璁惧浜嬫晠鐧昏琛�-鎻愪氦")
+ @GetMapping(value = "/submit")
+ public Result<?> submit(String id){
+ // 鏍￠獙棰嗗彇鏉冮檺
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (!BusinessCodeConst.PCR0001.equals(user.getPost())) {
+ return Result.error("鎻愪氦澶辫触,娌℃湁鎻愪氦鏉冮檺锛�,闇�鎿嶄綔宸ユ彁浜�");
+ }
+ eamReportProductHazardsService.submit(id);
+ return Result.OK("鎻愪氦鎴愬姛锛�");
+ }
+
+ /**
+ * 鎴戠殑寰呭姙 鎵ц/瀹℃壒
+ *
+ * @param eamReportProductHazardsDto
+ * @return
+ */
+ @AutoLog(value = "璁惧浜嬫晠鐧昏琛�-鎵ц/瀹℃壒")
+ @ApiOperation(value = "璁惧浜嬫晠鐧昏琛�-鎵ц/瀹℃壒", notes = "璁惧浜嬫晠鐧昏琛�-鎵ц/瀹℃壒")
+ @PostMapping(value = "/perform")
+ public Result<?> audit(@RequestBody EamReportProductHazardsDto eamReportProductHazardsDto){
+ if (eamReportProductHazardsDto == null) {
+ return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ // 妫�鏌ヨ姹傚弬鏁�
+ if (StrUtil.isBlank(eamReportProductHazardsDto.getTaskId()) || StrUtil.isBlank(eamReportProductHazardsDto.getDataId()) || StrUtil.isBlank(eamReportProductHazardsDto.getInstanceId())) {
+ return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
+ }
+ return eamReportProductHazardsService.audit(eamReportProductHazardsDto);
+ }
/**
* 缂栬緫
@@ -148,6 +189,10 @@
if(eamReportProductHazards==null) {
return Result.error("鏈壘鍒板搴旀暟鎹�");
}
+ EamReportRepair eamReportRepair=eamReportRepairService.getById(eamReportProductHazards.getReportId());
+ eamReportProductHazards.setBatchNumber(eamReportRepair.getBatchNumber());
+ eamReportProductHazards.setProcessingPart(eamReportRepair.getProcessingPart());
+ eamReportProductHazards.setQuantity(eamReportRepair.getQuantity());
return Result.OK(eamReportProductHazards);
}
--
Gitblit v1.9.3