2023-12-24 | qushaowei | ![]() |
2023-12-24 | qushaowei | ![]() |
2023-12-21 | “linengliang” | ![]() |
2023-12-18 | “linengliang” | ![]() |
2023-12-14 | “linengliang” | ![]() |
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java
@@ -293,18 +293,23 @@ Sheet sheet = workbook.getSheetAt(i); for (Row row : sheet) { // 遍历每一个单元格 for (Cell cell : row) { // for (Cell cell : row) { for(int j = 0;j < 5;j++){ // 处理单元格数据,例如输出单元格的值 Cell cell = row.getCell(j); // if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){ if("STRING".equals(cell.getCellType().toString())|| "BLANK".equals(cell.getCellType().toString())){ //点检周期存在,判断设备统一编码是否存在 if(cell.getStringCellValue().contains("设备名称:")){ String[] tybh1 = cell.getStringCellValue().split("统一编号:"); String strCell = cell.getStringCellValue(); if(strCell.contains("设备名称:")){ String[] tybh1 = strCell.split("统一编号:"); String[] tybh2 = tybh1[1].split("年"); equipmentNum = tybh2[0].trim().substring(0,tybh2[0].trim().length()-4).trim(); // equipmentNum = tybh2[0].trim().substring(0,tybh2[0].trim().length()-4).trim(); equipmentNum = tybh2[0].trim(); /*String year = tybh2[0].trim().substring(tybh2[0].trim().length()-4,tybh2[0].trim().length()).trim(); String[] month1 = tybh2[1].split("月"); String month = month1[0].trim(); String[] unit1 = cell.getStringCellValue().split("单位:"); String[] unit1 = strCell.split("单位:"); String unit = unit1[1].trim();*/ Equipment equipment = equipmentService.lambdaQuery().eq(Equipment::getNum,equipmentNum).eq(Equipment::getDelFlag, CommonConstant.DEL_FLAG_0).one(); if(equipment == null){ @@ -325,7 +330,7 @@ dailyInspectionStandard.setVersion("1.0"); dailyInspectionStandard.setAssignMode("1"); dailyInspectionStandard.setEquipmentId(equipment.getId()); dailyInspectionStandard.setApprovalStatus("1"); dailyInspectionStandard.setApprovalStatus("5"); //dailyInspectionStandardService.save(dailyInspectionStandard); //dailyInspectionStandardId = dailyInspectionStandard.getId(); } @@ -334,20 +339,20 @@ } //设备统一编码存在,判断点检项目是否存在 if(c == 0){ System.out.print(cell.getStringCellValue() + "\t"); if(cell.getStringCellValue().contains("点检项目")){ System.out.print(strCell + "\t"); if(strCell.contains("点检项目")){ a = 1; projectColumnIndex = cell.getColumnIndex(); break; } if(cell.getStringCellValue().contains("维护责任人签字")){ if(strCell.contains("维护责任人签字")){ a = 0; } if(projectColumnIndex == cell.getColumnIndex() && a == 1){ DailyInspectionStandardDetail dailyInspectionStandardDetail = new DailyInspectionStandardDetail(); dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId); String dayInspectionProjectName = row.getCell(projectColumnIndex).toString(); String standard = row.getCell(projectColumnIndex+1).toString(); String standard = row.getCell(projectColumnIndex+3).toString(); //查询点击项目,如果没有新增点检项目 if(StringUtils.isNotBlank(dayInspectionProjectName)){ List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,dayInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list(); @@ -372,12 +377,13 @@ } break; } if(cell.getStringCellValue().contains("周保养项目")){ if(strCell.contains("周保养项目")){ b = 1; maintenanceColumnIndex = cell.getColumnIndex(); break; } if(cell.getStringCellValue().contains("周保养操作者执行")){ if(strCell.contains("周保养操作者执行")){ b = 0; dailyInspectionStandardService.save(dailyInspectionStandard); for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){ @@ -392,7 +398,7 @@ DailyInspectionStandardDetail dailyInspectionStandardDetail = new DailyInspectionStandardDetail(); dailyInspectionStandardDetail.setDailyInspectionStandardId(dailyInspectionStandardId); String weekInspectionProjectName = row.getCell(maintenanceColumnIndex).toString(); String inspectionStandardName = row.getCell(maintenanceColumnIndex+1).toString(); String inspectionStandardName = row.getCell(maintenanceColumnIndex+3).toString(); if(StringUtils.isNotBlank(weekInspectionProjectName)){ List<InspectionProject> inspectionProjectList = inspectionProjectService.lambdaQuery().eq(InspectionProject::getName,weekInspectionProjectName).eq(InspectionProject::getDelFlag,CommonConstant.DEL_FLAG_0).list(); if(CollectionUtils.isEmpty(inspectionProjectList)){ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -33,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -408,9 +409,14 @@ } return Result.error("文件导入失败!"); } @GetMapping("/getStandards") public Result<?> getStandards(@RequestParam(name="ids",required=true) String ids, @RequestParam(name="maintenanceType",required=true) String maintenanceType ){ List<String> equipmentIds = Arrays.asList(ids.split(",")); return Result.OK(equipmentMaintenancePlanService.getStandards(equipmentIds,maintenanceType)); } /*--------------------------------子表处理-保养计划明细-end----------------------------------------------*/ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -264,14 +264,14 @@ FaultInfo faultInfo = faultInfoService.getOne(new QueryWrapper<FaultInfo>().eq("quanlity_id",quanlityConfirm.getId()),false); if(ObjectUtils.isNotNull(faultInfo)){ String isConfirm2 = faultInfo.getIsConfirm(); if(!isConfirm1.equals("yes")||isConfirm2.equals("yes")){ return Result.error("验收失败,产品质量隐患确认和事故登记尚未完场,请完成确认后再进行验收"); if(!isConfirm1.equals("yes")||!isConfirm2.equals("yes")){ return Result.error("验收失败,产品质量隐患确认和事故登记尚未完成,请完成确认后再进行验收"); } }else { return Result.error("验收失败,未生成事故登记单"); } }else { return Result.error("验收失败,未生成产平质量确认"); return Result.error("验收失败,未生成产品质量确认"); } } LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal(); lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -336,7 +336,7 @@ equipmentNum =cellEquipmentNum.getText(); equipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentNum).eq("del_flag",0),false); if(ObjectUtils.isNotNull(equipment)){ maintenanceStandard = maintenanceStandardService.getOne(new QueryWrapper<MaintenanceStandard>().eq("version_status","2").eq("del_flag",0).eq("equipment_id",equipment.getId()),false); maintenanceStandard = maintenanceStandardService.getOne(new QueryWrapper<MaintenanceStandard>().eq("maintenance_type","2").eq("version_status","2").eq("del_flag",0).eq("equipment_id",equipment.getId()),false); if(ObjectUtils.isNull(maintenanceStandard)){ maintenanceStandard = new MaintenanceStandard(); maintenanceStandard.setNum(sysIdentityService.getNumByTypeAndLength("DailyMaintenanceStandard",4)); @@ -344,6 +344,7 @@ maintenanceStandard.setAssignMode("1"); maintenanceStandard.setVersion("1.0"); maintenanceStandard.setType("daily"); maintenanceStandard.setMaintenanceType("2"); maintenanceStandard.setVersionStatus("2"); maintenanceStandard.setDelFlag(0); maintenanceStandard.setApprovalStatus("5"); @@ -409,6 +410,99 @@ } } } if(mainTitle.equals("生产设备三级保养规范")){ for (XWPFTable table : document.getTables()) { // 遍历表格中的所有行 int rowNumber = 0; String equipmentNum = ""; Equipment equipment = null; MaintenanceStandard maintenanceStandard = null; MaintenanceCycle maintenanceCycle = null; XWPFTableRow row0= table.getRow(0); if(ObjectUtils.isNotNull(row0)){ XWPFTableCell cellEquipmentNum = row0.getCell(3); if(ObjectUtils.isNotNull(cellEquipmentNum)){ equipmentNum =cellEquipmentNum.getText(); equipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentNum).eq("del_flag",0),false); if(ObjectUtils.isNotNull(equipment)){ maintenanceStandard = maintenanceStandardService.getOne(new QueryWrapper<MaintenanceStandard>().eq("maintenance_type","3").eq("version_status",2).eq("del_flag",0).eq("equipment_id",equipment.getId()),false); String abc = equipment.getEquipmentImportanceId(); if(StringUtils.isNotBlank(abc)){ if(abc.equals("A")){ maintenanceCycle = maintenanceCycleService.getOne(new QueryWrapper<MaintenanceCycle>().eq("name","3年").eq("version_status",2).eq("del_flag",0),false); }else { maintenanceCycle = maintenanceCycleService.getOne(new QueryWrapper<MaintenanceCycle>().eq("name","4年").eq("version_status",2).eq("del_flag",0),false); } } else{ return Result.error("导入失败,该设备没有维护ABC标识"); } if(ObjectUtils.isNull(maintenanceStandard)){ maintenanceStandard = new MaintenanceStandard(); maintenanceStandard.setNum(sysIdentityService.getNumByTypeAndLength("DailyMaintenanceStandard",4)); maintenanceStandard.setEquipmentId(equipment.getId()); maintenanceStandard.setAssignMode("1"); maintenanceStandard.setVersion("1.0"); maintenanceStandard.setVersionStatus("2"); maintenanceStandard.setType("daily"); maintenanceStandard.setMaintenanceType("3"); maintenanceStandard.setApprovalStatus("5"); maintenanceStandardService.save(maintenanceStandard); } else { continue; } } else { continue; } } else { continue; } } else { continue; } String location0 = ""; for (XWPFTableRow row : table.getRows()) { XWPFTableCell cell0 = row.getCell(0); XWPFTableCell cell1 = row.getCell(1); XWPFTableCell cell2 = row.getCell(2); if(rowNumber>2){ String location = cell0.getText(); if(StringUtils.isNotBlank(location)){ location0=location; } String projectName = cell1.getText(); String projectStandard = cell2.getText(); MaintenanceStandardDetail maintenanceStandardDetail = new MaintenanceStandardDetail(); MaintenanceProjectCategory maintenanceProjectCategory = maintenanceProjectCategoryService.getOne(new QueryWrapper<MaintenanceProjectCategory>().eq("name","三级保养").eq("del_flag",0),false); if(ObjectUtils.isNotNull(maintenanceProjectCategory)){ MaintenanceProject maintenanceProject = maintenanceProjectService.getOne(new QueryWrapper<MaintenanceProject>().eq("name",projectName).eq("standard",projectStandard).eq("del_flag",0).eq("maintenance_project_category_id",maintenanceProjectCategory.getId()),false); if (!ObjectUtils.isNotNull(maintenanceProject)) { maintenanceProject = new MaintenanceProject(); maintenanceProject.setNum(sysIdentityService.getNumByTypeAndLength("MainOfTwo", 4)); maintenanceProject.setName(projectName); maintenanceProject.setStandard(projectStandard); maintenanceProject.setLocation(location0); maintenanceProject.setMaintenanceProjectCategoryId(maintenanceProjectCategory.getId()); maintenanceProject.setDelFlag(0); maintenanceProjectService.save(maintenanceProject); } maintenanceStandardDetail.setMaintenanceProjectId(maintenanceProject.getId()); maintenanceStandardDetail.setLocation(location0); maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.getId()); maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId()); maintenanceStandardDetailService.save(maintenanceStandardDetail); } } rowNumber++; } } } return Result.OK("导入成功"); } else { System.out.println("无法解析该文件"); @@ -445,86 +539,7 @@ if (mainTitleParagraph != null) { // 获取主标题文本内容 String mainTitle = mainTitleParagraph.getText(); if(mainTitle.equals("生产设备三级保养规范")){ for (XWPFTable table : document.getTables()) { // 遍历表格中的所有行 int rowNumber = 0; String equipmentNum = ""; Equipment equipment = null; MaintenanceStandard maintenanceStandard = null; XWPFTableRow row0= table.getRow(0); if(ObjectUtils.isNotNull(row0)){ XWPFTableCell cellEquipmentNum = row0.getCell(3); if(ObjectUtils.isNotNull(cellEquipmentNum)){ equipmentNum =cellEquipmentNum.getText(); equipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentNum).eq("del_flag",0),false); if(ObjectUtils.isNotNull(equipment)){ maintenanceStandard = maintenanceStandardService.getOne(new QueryWrapper<MaintenanceStandard>().eq("version_status",2).eq("del_flag",0).eq("equipment_id",equipment.getId()),false); if(ObjectUtils.isNull(maintenanceStandard)){ maintenanceStandard = new MaintenanceStandard(); maintenanceStandard.setNum(sysIdentityService.getNumByTypeAndLength("DailyMaintenanceStandard",4)); maintenanceStandard.setEquipmentId(equipment.getId()); maintenanceStandard.setAssignMode("1"); maintenanceStandard.setVersion("1.0"); maintenanceStandard.setVersionStatus("2"); maintenanceStandard.setType("daily"); maintenanceStandard.setApprovalStatus("5"); maintenanceStandardService.save(maintenanceStandard); } else { continue; } } else { continue; } } else { continue; } } else { continue; } for (XWPFTableRow row : table.getRows()) { XWPFTableCell cell0 = row.getCell(0); XWPFTableCell cell1 = row.getCell(1); XWPFTableCell cell2 = row.getCell(2); if(rowNumber>2){ String location = getMergedCellValue(cell0); String projectName = cell1.getText(); String projectStandard = cell2.getText(); MaintenanceStandardDetail maintenanceStandardDetail = new MaintenanceStandardDetail(); MaintenanceProjectCategory maintenanceProjectCategory = maintenanceProjectCategoryService.getOne(new QueryWrapper<MaintenanceProjectCategory>().eq("name","三级保养").eq("del_flag",0),false); if(ObjectUtils.isNotNull(maintenanceProjectCategory)){ MaintenanceProject maintenanceProject = maintenanceProjectService.getOne(new QueryWrapper<MaintenanceProject>().eq("name",projectName).eq("standard",projectStandard).eq("del_flag",0).eq("maintenance_project_category_id",maintenanceProjectCategory.getId()),false); MaintenanceCycle maintenanceCycle = null; if(equipment.getEquipmentImportanceId().equals("A")){ maintenanceCycle = maintenanceCycleService.getOne(new QueryWrapper<MaintenanceCycle>().eq("name","3年").eq("version_status",2).eq("del_flag",0),false); }else { maintenanceCycle = maintenanceCycleService.getOne(new QueryWrapper<MaintenanceCycle>().eq("name","4年").eq("version_status",2).eq("del_flag",0),false); } if (!ObjectUtils.isNotNull(maintenanceProject)) { maintenanceProject = new MaintenanceProject(); maintenanceProject.setNum(sysIdentityService.getNumByTypeAndLength("MainOfTwo", 4)); maintenanceProject.setName(projectName); maintenanceProject.setLocation(location); maintenanceProject.setMaintenanceProjectCategoryId(maintenanceProjectCategory.getId()); maintenanceProject.setDelFlag(0); maintenanceProjectService.save(maintenanceProject); } maintenanceStandardDetail.setMaintenanceProjectId(maintenanceProject.getId()); maintenanceStandardDetail.setLocation(location); maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.getId()); maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId()); maintenanceStandardDetailService.save(maintenanceStandardDetail); } } rowNumber++; } } } } else { System.out.println("无法解析该文件"); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -397,6 +397,7 @@ @Dict(dicCode = "is_product") private String isLine; @Dict(dicCode = "is_product") @TableField(exist = false) private String nums; lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java
@@ -147,5 +147,12 @@ @TableField(exist = false) private List<MaintenanceStandardDetail> maintenanceStandardDetaillist; @TableField(exist = false) private String equipmentNum; @TableField(exist = false) private String equipmentName; @TableField(exist = false) private String equipmentModel; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanMapper.java
@@ -3,6 +3,7 @@ import org.apache.ibatis.annotations.Param; import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.eam.entity.MaintenanceStandard; import org.jeecg.modules.eam.entity.MaintenanceStandardDetail; import java.util.List; @@ -14,5 +15,8 @@ * @Version: V1.0 */ public interface EquipmentMaintenancePlanMapper extends BaseMapper<EquipmentMaintenancePlan> { List<MaintenanceStandardDetail> getCycle(@Param("mainId") String mainId,@Param("type") String type); List<MaintenanceStandard> getStandards(@Param("equipmentId") String equipmentId,@Param("maintenanceType") String maintenanceType); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml
@@ -12,5 +12,18 @@ and t2.maintenance_type = #{type} and t1.del_flag = 0 </select> <select id="getStandards" resultType="org.jeecg.modules.eam.entity.MaintenanceStandard"> select t1.*, t2.id euipmentId, t2.name equipmentName, t2.num equipmentNum, t2.model equipmentModel from mom_eam_maintenance_standard t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id where t1.del_flag = 0 and t1.version_status = '2' and t1.maintenance_type = #{maintenanceType} and t1.equipment_id = #{equipmentId} </select> </mapper> lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanService.java
@@ -3,11 +3,13 @@ import org.apache.ibatis.annotations.Param; import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.eam.entity.MaintenanceStandard; import org.jeecg.modules.eam.entity.MaintenanceStandardDetail; import java.io.Serializable; import java.util.Collection; import java.util.List; import java.util.Map; /** * @Description: 保养计划 @@ -32,6 +34,7 @@ public void delBatchMain (Collection<? extends Serializable> idList); List<MaintenanceStandardDetail> getCycle(String mainId,String type); Map<String,Object> getStandards(List<String> equipmentIds, String maintenanceType); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java
@@ -1,7 +1,11 @@ package org.jeecg.modules.eam.service.impl; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.jeecg.modules.eam.entity.Equipment; import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan; import org.jeecg.modules.eam.entity.MaintenanceStandard; import org.jeecg.modules.eam.entity.MaintenanceStandardDetail; import org.jeecg.modules.eam.mapper.EamEquipmentMapper; import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanDetailMapper; import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanMapper; import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanService; @@ -10,8 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.Collection; import java.util.List; import java.util.*; /** * @Description: 保养计划 @@ -26,6 +29,8 @@ private EquipmentMaintenancePlanMapper equipmentMaintenancePlanMapper; @Autowired private EquipmentMaintenancePlanDetailMapper equipmentMaintenancePlanDetailMapper; @Autowired private EamEquipmentMapper equipmentMapper; @Override @Transactional(rollbackFor = Exception.class) @@ -48,4 +53,43 @@ return baseMapper.getCycle(mainId,type); } @Override public Map<String,Object> getStandards(List<String> equipmentIds, String maintenanceType) { String msg = ""; Map<String,Object> map = new HashMap<>(2); List<MaintenanceStandard> maintenanceStandards = new ArrayList<>(); for(String equipmentId:equipmentIds){ Equipment equipment = equipmentMapper.selectById(equipmentId); List<MaintenanceStandard> list = baseMapper.getStandards(equipmentId,maintenanceType); if(list.size()==0){ msg = msg+"统一编码为"+equipment.getNum()+"的设备不存在生效保养标注;"; }else if(list.size()>1){ msg = msg+"统一编码为"+equipment.getNum()+"的设备存在多条生效保养标注;"; }else { if(equipment.getIsLineEquip().equals("yes")&&maintenanceType.equals("3")){ String lineId = equipment.getLineId(); if(StringUtils.isNotBlank(lineId)){ List<MaintenanceStandard> lineStandard = baseMapper.getStandards(lineId,maintenanceType); if(lineStandard.size()==0){ msg = msg+"统一编码为"+equipment.getNum()+"的设备不存在生效保养标注;"; }else if(list.size()>1){ msg = msg+"统一编码为"+equipment.getNum()+"的设备存在多条生效保养标注;"; }else{ maintenanceStandards.add(lineStandard.get(0)); } }else { msg = msg+"统一编码为"+equipment.getNum()+"的设备不存在生效保养标注;"; } }else{ maintenanceStandards.add(list.get(0)); } } } map.put("records",maintenanceStandards); map.put("message",msg); return map ; } }