From 5f0bc1e4ad0c51a8bf1382dc3f98e282c1393c3b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 17:48:55 +0800
Subject: [PATCH] 真空热处理炉批量打印接口 三保 加工设备保养计划变更申请单批量打印接口 设备精度检查单批量打印接口开发
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
index 010c09e..6ded61d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
@@ -15,12 +15,17 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
+import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationCheckCategoryEnum;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
+import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderResult;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗�
@@ -74,6 +79,7 @@
if (CollectionUtil.isEmpty(request.getTableDetailList())) {
return Result.error("妫�鏌ラ」涓嶈兘涓虹┖锛�");
}
+ request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
boolean b = eamTechnicalStatusEvaluationOrderService.addTechnicalStatusEvaluationOrder(request);
if (!b) {
return Result.error("娣诲姞澶辫触锛�");
@@ -110,9 +116,6 @@
if (request == null) {
return Result.error("瀹℃壒鐨勫璞′笉鑳戒负绌猴紒");
}
- if(CollectionUtil.isEmpty(request.getTableDetailList())) {
- return Result.error("妫�鏌ユ槑缁嗕俊鎭负绌猴紒");
- }
// 妫�鏌ヨ姹傚弬鏁�
if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) {
return Result.error("瀹℃壒浠诲姟閿欒鎴栦笉瀛樺湪锛�");
@@ -147,4 +150,41 @@
return Result.error("鏁版嵁杞瘧澶辫触锛�");
}
}
+
+ /**
+ * 璁惧绮惧害妫�鏌ユ妧鏈壌瀹氳〃鎵归噺鎵撳嵃鎺ュ彛
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value = "鎶�鏈壌瀹氳〃璁惧绮惧害妫�鏌ユ壒閲忔墦鍗版帴鍙�", notes = "鎶�鏈壌瀹氳〃璁惧绮惧害妫�鏌ユ壒閲忔墦鍗版帴鍙�")
+ @GetMapping(value = "/accuracyPrint")
+ public Result<?> batchPrint(@RequestParam(name = "ids", required = true) String ids) {
+ List<EamTechnicalStatusEvaluationOrderResult> list = eamTechnicalStatusEvaluationOrderService.batchPrint(ids, TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name());
+ return Result.OK(list);
+ }
+
+ /**
+ * 瀹夊叏瑁呯疆鎶�鏈壌瀹氳〃鎵归噺鎵撳嵃鎺ュ彛
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value = "鎶�鏈壌瀹氳〃瀹夊叏瑁呯疆鎵归噺鎵撳嵃鎺ュ彛", notes = "鎶�鏈壌瀹氳〃瀹夊叏瑁呯疆鎵归噺鎵撳嵃鎺ュ彛")
+ @GetMapping(value = "/safePrint")
+ public Result<?> safePrint(@RequestParam(name = "ids", required = true) String ids) {
+ List<EamTechnicalStatusEvaluationOrderResult> list = eamTechnicalStatusEvaluationOrderService.batchPrint(ids, TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name());
+ return Result.OK(list);
+ }
+
+ /**
+ * 鍏朵粬妫�鏌ユ妧鏈壌瀹氳〃鎵归噺鎵撳嵃鎺ュ彛
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value = "鎶�鏈壌瀹氳〃鍏朵粬妫�鏌ユ壒閲忔墦鍗版帴鍙�", notes = "鎶�鏈壌瀹氳〃鍏朵粬妫�鏌ユ壒閲忔墦鍗版帴鍙�")
+ @GetMapping(value = "/otherPrint")
+ public Result<?> otherPrint(@RequestParam(name = "ids", required = true) String ids) {
+ List<EamTechnicalStatusEvaluationOrderResult> list = eamTechnicalStatusEvaluationOrderService.batchPrint(ids, TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name());
+ return Result.OK(list);
+ }
+
}
--
Gitblit v1.9.3