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> orgIdList); } 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> orgIdList) { List<EquipmentSearchResult> resultList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(orgIdList)) { List<EamEquipment> eamEquipmentList = eamEquipmentMapper.selectList(new LambdaQueryWrapper<EamEquipment>().in(EamEquipment::getOrgId, orgIdList)); if (CollectionUtils.isNotEmpty(eamEquipmentList)) { for (EamEquipment eamEquipment : eamEquipmentList) { resultList.add(new EquipmentSearchResult(eamEquipment)); } } } return resultList; } } 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,22 @@ 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> partProduction = Lists.newArrayList(); if (StringUtils.isNotEmpty(productionId)) { //key不为空，查询所有下级产线id partProduction = mdcEquipmentService.findAllProductions(productionId); partProduction.add(productionId); } List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipmentByProduction(partProduction); return Result.ok(resultList); } } 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); } lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -253,4 +253,6 @@ * @return */ List<MdcEquipment> getEquipmentList(); List<String> findAllProductions(String key); } lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -703,7 +703,7 @@ /** * 根据父级id递归查询所有下级id集合 */ private List<String> findAllProductions(String key) { public List<String> findAllProductions(String key) { List<String> productions = new ArrayList<>(); List<MdcProduction> mdcProductions = mdcProductionService.queryProdByPid(key); if (mdcProductions != null && !mdcProductions.isEmpty()) { 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; }
