From 6074864314f5452fd023c34ab11118c393969bcc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 08 九月 2025 11:36:21 +0800
Subject: [PATCH] 排产工单模块工艺点检涉及接口
---
src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java b/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java
index a2688aa..87fc960 100644
--- a/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java
+++ b/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentProcessParametersController.java
@@ -1,22 +1,32 @@
package org.jeecg.modules.eam.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.entity.EamEquipmentProcessParameters;
+import org.jeecg.modules.eam.entity.EamProcessParameters;
import org.jeecg.modules.eam.service.IEamEquipmentProcessParametersService;
+import org.jeecg.modules.eam.service.IEamProcessParametersService;
+import org.jeecg.modules.eam.vo.ProcessParametersVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
- /**
+/**
* @Description: 璁惧宸ヨ壓鍙傛暟
* @Author: jeecg-boot
* @Date: 2025-04-27
@@ -29,6 +39,10 @@
public class EamEquipmentProcessParametersController extends JeecgController<EamEquipmentProcessParameters, IEamEquipmentProcessParametersService> {
@Autowired
private IEamEquipmentProcessParametersService eamEquipmentProcessParametersService;
+ @Autowired
+ private IEamProcessParametersService eamProcessParametersService;
+ @Autowired
+ private ObjectMapper objectMapper;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -115,4 +129,26 @@
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
+ @AutoLog(value = "璁惧宸ヨ壓鍙傛暟-閫氳繃璁惧id鏌ヨ宸ヨ壓鍙傛暟")
+ @ApiOperation(value="璁惧宸ヨ壓鍙傛暟-閫氳繃璁惧id鏌ヨ宸ヨ壓鍙傛暟", notes="璁惧宸ヨ壓鍙傛暟-閫氳繃璁惧id鏌ヨ宸ヨ壓鍙傛暟")
+ @GetMapping(value = "/queryByEquipmentId")
+ public Result<?> queryByEquipmentId(@RequestParam("equipmentId") String equipmentId) {
+ List<EamEquipmentProcessParameters> eamEquipmentProcessParameters = eamEquipmentProcessParametersService.list(new LambdaQueryWrapper<EamEquipmentProcessParameters>()
+ .eq(EamEquipmentProcessParameters::getEquipmentId, equipmentId));
+ if (eamEquipmentProcessParameters.isEmpty()) {
+ return Result.error("鏈煡璇㈠埌璇ヨ澶囩殑宸ヨ壓鍙傛暟锛�");
+ }
+ Map<String, String> processIdPeriodMap = eamEquipmentProcessParameters.stream()
+ .collect(Collectors.toMap(EamEquipmentProcessParameters::getParameterId, EamEquipmentProcessParameters::getParameterPeriod));
+ List<EamProcessParameters> processParameters = eamProcessParametersService.list(new LambdaQueryWrapper<EamProcessParameters>()
+ .in(EamProcessParameters::getId, processIdPeriodMap.keySet())
+ .eq(EamProcessParameters::getDelFlag, CommonConstant.DEL_FLAG_0));
+ List<ProcessParametersVo> processParametersVoList = CollectionUtil.newArrayList();
+ processParameters.forEach(processParameter -> {
+ ProcessParametersVo processParametersVo = new ProcessParametersVo(processParameter);
+ processParametersVo.setParameterPeriod(processIdPeriodMap.get(processParameter.getId()));
+ processParametersVoList.add(processParametersVo);
+ });
+ return Result.OK(processParametersVoList);
+ }
}
--
Gitblit v1.9.3