设备台账

“linengliang”

2023-12-13 ae33e68baf21878ce145d75ac377d14c1e2b2a82

 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;
@@ -13,10 +14,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IPrecisionInspectionDetailService;
import org.jeecg.modules.eam.service.IPrecisionInspectionService;
import org.jeecg.modules.eam.service.IPrecisionParametersService;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -49,6 +47,9 @@

   @Autowired
   private IPrecisionParametersService precisionParametersService;

   @Autowired
   private IEamEquipmentService equipmentService;
   
   /**
    * 分页列表查询
@@ -203,8 +204,11 @@
      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();

      if ("0".equals(precisionInspectionStatus)){
@@ -219,7 +223,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);
@@ -229,6 +235,7 @@
         preInspection.setSparePart(precisionInspection.getSparePart());
         preInspection.setProcessPass(precisionInspection.getProcessPass());
         preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
         preInspection.setSparePart(precisionInspection.getSparePart());
         preInspection.setUseUnitDirectorUser(userId);

         maintenanceOrder.setPrecisionInspectionStatus("4");
@@ -238,12 +245,17 @@

         maintenanceOrder.setPrecisionInspectionStatus("5");
//         maintenanceOrder.setStatus("8");
         //更新设备技术状态
         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("审批成功!");
   }