lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -83,6 +83,14 @@ @Lazy private IdentityService sysIdentityService; @Autowired @Lazy private IEamEquipmentService equipmentService; @Autowired @Lazy private IDailyInspectionStandardService dailyInspectionStandardService; // @Autowired // private IUploadRelaService uploadRelaService; // @@ -180,6 +188,11 @@ inspectionOrder.setInspectionDeadline(date); inspectionOrder.setInspectionStandardType("1"); inspectionOrderService.save(inspectionOrder); String equipmentId = inspectionOrder.getEquipmentId(); Equipment equipment = equipmentService.getById(equipmentId); String isLineEquip = equipment.getIsLineEquip(); if("no".equals(isLineEquip)){ List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList(); for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) { String id = inspectionOrder.getId(); @@ -202,7 +215,36 @@ inspectionOrderDetailService.save(inspectionOrderDetail); } }else{ String lineId = equipment.getLineId(); List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery() .eq(DailyInspectionStandard::getEquipmentId, lineId) .eq(DailyInspectionStandard::getVersionStatus, "2") .eq(DailyInspectionStandard::getDelFlag, "0").list(); if(dailyInspectionStandards.size()>0) { DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0); //保存点检工单子表数据 List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery() .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,dailyInspectionStandard.getId()) .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId()) .eq(DailyInspectionStandardDetail::getDelFlag,"0").list(); for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId(); InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail(); inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId()); inspectionOrderDetail.setInspectionProjectId(inspectionProjectId); inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId()); inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation()); inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto()); InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId); if(inspectionProject != null){ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard()); } inspectionOrderDetailService.save(inspectionOrderDetail); } } } return Result.OK("添加成功！"); } @@ -242,6 +284,10 @@ inspectionOrderDetailService.updateById(inspectionOrderDetail); } String equipmentId = inspectionOrder.getEquipmentId(); Equipment equipment = equipmentService.getById(equipmentId); String isLineEquip = equipment.getIsLineEquip(); if("no".equals(isLineEquip)){ List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList(); for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetailList) { String inspectionStandardDetailId = inspectionOrderDetail.getInspectionStandardDetailId(); @@ -262,6 +308,36 @@ inspectionOrderDetailService.save(inspectionOrderDetail); } }else{ String lineId = equipment.getLineId(); List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery() .eq(DailyInspectionStandard::getEquipmentId, lineId) .eq(DailyInspectionStandard::getVersionStatus, "2") .eq(DailyInspectionStandard::getDelFlag, "0").list(); if(dailyInspectionStandards.size()>0) { DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0); //保存点检工单子表数据 List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery() .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,dailyInspectionStandard.getId()) .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId()) .eq(DailyInspectionStandardDetail::getDelFlag,"0").list(); for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId(); InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail(); inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId()); inspectionOrderDetail.setInspectionProjectId(inspectionProjectId); inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId()); inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation()); inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto()); InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId); if(inspectionProject != null){ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard()); } inspectionOrderDetailService.save(inspectionOrderDetail); } } } } String inspectionUserId = inspectionOrder.getInspectionUserId(); if(StringUtils.isBlank(inspectionUserId)){ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java
@@ -35,6 +35,14 @@ private IInspectionOrderDetailService inspectionOrderDetailService; @Autowired private IDailyInspectionStandardDetailService dailyInspectionStandardDetailService; @Autowired private IEamEquipmentService equipmentService; @Autowired private IDailyInspectionStandardService dailyInspectionStandardService; @Autowired private IInspectionProjectService inspectionProjectService; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { @@ -125,19 +133,61 @@ inspectionOrder.setEquipmentId(inspectionCycle.getEquipmentId()); inspectionOrder.setTeamId(inspectionCycle.getTeamId()); inspectionOrderService.save(inspectionOrder); Equipment equipment = equipmentService.getById(inspectionCycle.getEquipmentId()); String isLineEquip = equipment.getIsLineEquip(); if("no".equals(isLineEquip)){ //保存点检工单子表数据 List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery() .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,inspectionOrder.getInspectionStandardId()) .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId()).list(); for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId(); InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail(); inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId()); inspectionOrderDetail.setInspectionProjectId(dailyInspectionStandardDetail.getInspectionProjectId()); inspectionOrderDetail.setInspectionProjectId(inspectionProjectId); inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId()); inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation()); inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto()); InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId); if(inspectionProject != null){ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard()); } inspectionOrderDetailService.save(inspectionOrderDetail); } }else{ String lineId = equipment.getLineId(); List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery() .eq(DailyInspectionStandard::getEquipmentId, lineId) .eq(DailyInspectionStandard::getVersionStatus, "2") .eq(DailyInspectionStandard::getDelFlag, "0").list(); if(dailyInspectionStandards.size()>0){ DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0); //保存点检工单子表数据 List<DailyInspectionStandardDetail> dailyInspectionStandardDetailList = dailyInspectionStandardDetailService.lambdaQuery() .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,dailyInspectionStandard.getId()) .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId()) .eq(DailyInspectionStandardDetail::getDelFlag,"0").list(); for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId(); InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail(); inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId()); inspectionOrderDetail.setInspectionProjectId(inspectionProjectId); inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId()); inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation()); inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto()); InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId); if(inspectionProject != null){ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard()); } inspectionOrderDetailService.save(inspectionOrderDetail); } } } }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.FRIDAY){ //保存点检工单主表数据 InspectionOrder inspectionOrder = new InspectionOrder(); @@ -154,12 +204,19 @@ .eq(DailyInspectionStandardDetail::getDailyInspectionStandardId,inspectionOrder.getInspectionStandardId()) .eq(DailyInspectionStandardDetail::getInspectionCycleId,inspectionOrder.getInspectionCycleId()).list(); for(DailyInspectionStandardDetail dailyInspectionStandardDetail : dailyInspectionStandardDetailList){ String inspectionProjectId = dailyInspectionStandardDetail.getInspectionProjectId(); InspectionOrderDetail inspectionOrderDetail = new InspectionOrderDetail(); inspectionOrderDetail.setInspectionOrderId(inspectionOrder.getId()); inspectionOrderDetail.setInspectionProjectId(dailyInspectionStandardDetail.getInspectionProjectId()); inspectionOrderDetail.setInspectionProjectId(inspectionProjectId); inspectionOrderDetail.setInspectionStandardDetailId(dailyInspectionStandardDetail.getId()); inspectionOrderDetail.setLocation(dailyInspectionStandardDetail.getLocation()); inspectionOrderDetail.setPhoto(dailyInspectionStandardDetail.getPhoto()); InspectionProject inspectionProject = inspectionProjectService.getById(inspectionProjectId); if(inspectionProject != null){ inspectionOrderDetail.setDetectionStandard(inspectionProject.getDetectionStandard()); } inspectionOrderDetailService.save(inspectionOrderDetail); } }
