From 34eb84feb716412afd4229a83d4afbb204d5d6bc Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 12 九月 2025 17:13:34 +0800
Subject: [PATCH] 大修项修现场问题处理
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 25 +++++++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairController.java | 55 +++++++++++++--------------
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java | 2 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 18 +++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java | 2
5 files changed, 66 insertions(+), 36 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
index f1c1eda..b9f2893 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
@@ -59,4 +59,6 @@
List<EquipmentCategoryStatistics> queryLedgerStatistics();
ModelAndView exportLedgerStatisticsXls(HttpServletRequest request, Class<EquipmentCategoryStatistics> equipmentCategoryStatisticsClass, String 鍙拌处缁熻);
+
+ List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> equipmentIds);
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 6a48d5d..b2ae505 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -161,13 +161,13 @@
if (StringUtils.isNotBlank(eamEquipment.getPerformanceIndicators())) {
queryWrapper.like("e.performance_indicators", eamEquipment.getPerformanceIndicators());
}
- if(oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryEndTime())){
- queryWrapper.ge("e.leave_factory_date",eamEquipment.getLeaveFactoryStartTime());
- queryWrapper.le("e.leave_factory_date",eamEquipment.getLeaveFactoryEndTime());
+ if (oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getLeaveFactoryEndTime())) {
+ queryWrapper.ge("e.leave_factory_date", eamEquipment.getLeaveFactoryStartTime());
+ queryWrapper.le("e.leave_factory_date", eamEquipment.getLeaveFactoryEndTime());
}
- if(oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckEndTime())){
- queryWrapper.ge("e.acceptance_check_date",eamEquipment.getAcceptanceCheckStartTime());
- queryWrapper.le("e.acceptance_check_date",eamEquipment.getAcceptanceCheckEndTime());
+ if (oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckStartTime()) && oConvertUtils.isNotEmpty(eamEquipment.getAcceptanceCheckEndTime())) {
+ queryWrapper.ge("e.acceptance_check_date", eamEquipment.getAcceptanceCheckStartTime());
+ queryWrapper.le("e.acceptance_check_date", eamEquipment.getAcceptanceCheckEndTime());
}
if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
//杞﹂棿缂栫爜涓嶄负绌�
@@ -385,4 +385,17 @@
}
}
+ @Override
+ public List<EquipmentSearchResult> asyncLoadEquipmentByProduction(List<String> equipmentIds) {
+ List<EquipmentSearchResult> resultList = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(equipmentIds)) {
+ List<EamEquipment> eamEquipmentList = eamEquipmentMapper.selectList(new LambdaQueryWrapper<EamEquipment>().in(EamEquipment::getEquipmentCode, equipmentIds));
+ if (CollectionUtils.isNotEmpty(eamEquipmentList)) {
+ for (EamEquipment eamEquipment : eamEquipmentList) {
+ resultList.add(new EquipmentSearchResult(eamEquipment));
+ }
+ }
+ }
+ return resultList;
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index d8b6287..07915dc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -10,6 +10,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
@@ -362,4 +363,21 @@
return Result.ok(resultList);
}
+ /**
+ * 鏍规嵁鐢宠杞﹂棿鏌ヨ
+ * @param productionId 杞﹂棿id
+ * @return
+ */
+ @ApiOperation(value = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃", notes = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃")
+ @GetMapping(value = "/asyncLoadEquipmentByProduction")
+ public Result<?> asyncLoadEquipmentByProduction(@RequestParam(name="productionId",required = false) String productionId) {
+ List<String> equipmentIds = Lists.newArrayList();
+ if (StringUtils.isNotBlank(productionId)) {
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(productionId);
+ }
+
+ List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipmentByProduction(equipmentIds);
+ return Result.ok(resultList);
+ }
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairController.java
index f1cfdbe..5282343 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMajorPartialRepairController.java
@@ -1,44 +1,31 @@
package org.jeecg.modules.eam.controller;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import cn.hutool.core.collection.CollectionUtil;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.constant.MajorPartialRepairStatusEnum;
import org.jeecg.modules.eam.entity.EamMajorPartialRepair;
import org.jeecg.modules.eam.entity.EamMajorPartialRepairDetail;
import org.jeecg.modules.eam.request.EamMajorPartialRepairQuery;
import org.jeecg.modules.eam.service.IEamMajorPartialRepairService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
/**
* @Description: eam_major_partial_repair
@@ -145,6 +132,10 @@
//@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair:confirm")
@GetMapping(value = "/confirm")
public Result<String> confirm(@RequestParam("id") String id) {
+
+ //鑾峰彇褰撳墠鐧诲綍浜�
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
EamMajorPartialRepair majorPartialRepair = eamMajorPartialRepairService.getById(id);
if (Objects.isNull(majorPartialRepair)) {
return Result.error("瑕佺‘璁ょ殑缁翠慨鍗曚笉瀛樺湪锛岃鍒锋柊閲嶈瘯锛�");
@@ -153,6 +144,7 @@
return Result.error("璇ョ姸鎬佺殑缁翠慨鍗曚笉鑳界‘璁わ紒");
}
majorPartialRepair.setRepairStatus(MajorPartialRepairStatusEnum.CONFIRMED.name());
+ majorPartialRepair.setResponsiblePerson(user.getUsername());
majorPartialRepair.setActualStartTime(new Date());
eamMajorPartialRepairService.updateById(majorPartialRepair);
return Result.OK("纭鎴愬姛!");
@@ -163,12 +155,17 @@
//@RequiresPermissions("org.jeecg.modules:eam_major_partial_repair:confirm")
@GetMapping(value = "/confirmBatch")
public Result<String> confirmBatch(@RequestParam(name="ids") String ids) {
+
+ //鑾峰彇褰撳墠鐧诲綍浜�
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
List<String> idList = Arrays.asList(ids.split(","));
List<EamMajorPartialRepair> confirmList = CollectionUtil.newArrayList();
idList.forEach(id -> {
EamMajorPartialRepair majorPartialRepair = eamMajorPartialRepairService.getById(id);
if (Objects.nonNull(majorPartialRepair) && MajorPartialRepairStatusEnum.PENDING_CONFIRMATION.name().equals(majorPartialRepair.getRepairStatus())) {
majorPartialRepair.setRepairStatus(MajorPartialRepairStatusEnum.CONFIRMED.name());
+ majorPartialRepair.setResponsiblePerson(user.getUsername());
majorPartialRepair.setActualStartTime(new Date());
confirmList.add(majorPartialRepair);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
index 4c2b54e..a13e040 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
@@ -500,7 +500,7 @@
@Override
public List<MdcProduction> getAllWorkShop() {
- List<MdcProduction> list = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getOrgType, "2"));
+ List<MdcProduction> list = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getOrgType, "2").eq(MdcProduction::getMdcFlag, "1"));
if (CollectionUtils.isEmpty(list)) {
return null;
}
--
Gitblit v1.9.3