问题项修改

qushaowei

2024-01-12 286375a43369462cd75147271949cf819916912f

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -49,6 +50,9 @@

   @Autowired
   private IEamEquipmentService equipmentService;

   @Autowired
   private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
   
   /**
    * 分页列表查询
@@ -187,6 +191,14 @@
            String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
            PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
            precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());

            List<PrecisionParametersTemplateDetail> list = precisionParametersTemplateDetailService.lambdaQuery()
                  .eq(PrecisionParametersTemplateDetail::getPrecisionParametersId, precisionParametersId)
                  .eq(PrecisionParametersTemplateDetail::getDelFlag, "0").list();
            if(list.size()>0){
               precisionInspectionDetail.setTolerance(list.get(0).getTolerance());
            }

         }

         map.put("precisionInspectionDetails",precisionInspectionDetails);
@@ -203,8 +215,10 @@
      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
      String userId = sysUser.getId();

      String receipts = precisionInspection.getReceipts();//精度检验单单据id
      PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
      DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
      String maintenanceOrderUda4 = maintenanceOrder.getMaintenanceOrderUda4();
      Equipment equipment = equipmentService.getById(maintenanceOrder.getEquipmentId());
      String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();

@@ -220,7 +234,9 @@
         preInspection.setRepairDirectorUser(userId);

         maintenanceOrder.setPrecisionInspectionStatus("2");
      }else if("2".equals(precisionInspectionStatus)){
      }

      if("2".equals(precisionInspectionStatus)){
         preInspection.setEachTolerance(precisionInspection.getEachTolerance());
         preInspection.setPartTolerance(precisionInspection.getPartTolerance());
         preInspection.setEquipmentInspectorUser(userId);
@@ -230,6 +246,7 @@
         preInspection.setSparePart(precisionInspection.getSparePart());
         preInspection.setProcessPass(precisionInspection.getProcessPass());
         preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
         preInspection.setSparePart(precisionInspection.getSparePart());
         preInspection.setUseUnitDirectorUser(userId);

         maintenanceOrder.setPrecisionInspectionStatus("4");
@@ -243,8 +260,11 @@
         equipment.setTechnologyStatus(precisionInspection.getJudgmentResult());
      }

      preInspection.setRemark(precisionInspection.getRemark());
      if(StringUtils.isBlank(maintenanceOrderUda4)){
         maintenanceOrder.setMaintenanceOrderUda4(receipts);
      }
      dailyMaintenanceOrderService.updateById(maintenanceOrder);
      preInspection.setRemark(precisionInspection.getRemark());
      precisionInspectionService.updateById(preInspection);
      equipmentService.updateById(equipment);
      return Result.OK("审批成功!");