设备精度检验单

qushaowei

2023-09-07 3284155a8b062f831040c7eac613492ce766d031

设备精度检验单

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

@@ -12,11 +12,11 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.entity.FinishTransferOrder;
import org.jeecg.modules.eam.entity.PrecisionInspection;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -43,6 +43,12 @@

    @Autowired
    private IDailyMaintenanceOrderService dailyMaintenanceOrderService;

    @Autowired
    private IPrecisionInspectionDetailService precisionInspectionDetailService;

    @Autowired
    private IPrecisionParametersService precisionParametersService;
    
    /**
     * 分页列表查询
@@ -168,13 +174,23 @@
        return super.importExcel(request, response, PrecisionInspection.class);
    }

    /**
     * 日常点检
     * qsw 2023-4-26
     */

    @GetMapping("getPrecisionInspectionList")
    public Result<?> getPrecisionInspectionList(@RequestParam(name = "maintenanceOrderId", required = true) String maintenanceOrderId) {
        List<Map<String, Object>> precisionInspectionList = precisionInspectionService.getPrecisionInspectionList(maintenanceOrderId);
        for (Map<String, Object> map : precisionInspectionList) {
            String id = (String) map.get("id");
            List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
                    .eq(PrecisionInspectionDetail::getPrecisionInspectionId, id)
                    .eq(PrecisionInspectionDetail::getDelFlag, "0").list();
            for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
                String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
                PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
                precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());
            }

            map.put("precisionInspectionDetails",precisionInspectionDetails);
        }
        return Result.ok(precisionInspectionList);
    }

@@ -191,45 +207,42 @@
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
        String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();

            if ("0".equals(precisionInspectionStatus)){
        if ("0".equals(precisionInspectionStatus)){
            List<PrecisionInspectionDetail> precisionInspectionDetailList = precisionInspection.getPrecisionInspectionDetailList();
            for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetailList) {
                precisionInspectionDetailService.updateById(precisionInspectionDetail);
            }
            preInspection.setPrecisionInspectionUser(userId);
            precisionInspectionService.updateById(preInspection);

            maintenanceOrder.setPrecisionInspectionStatus("1");
            dailyMaintenanceOrderService.updateById(maintenanceOrder);
        }else if("1".equals(precisionInspectionStatus)){
            preInspection.setRepairDirectorUser(userId);
            precisionInspectionService.updateById(preInspection);

            maintenanceOrder.setPrecisionInspectionStatus("2");
            dailyMaintenanceOrderService.updateById(maintenanceOrder);
        }else if("2".equals(precisionInspectionStatus)){
            preInspection.setEachTolerance(precisionInspection.getEachTolerance());
            preInspection.setPartTolerance(precisionInspection.getPartTolerance());
            preInspection.setEquipmentInspectorUser(userId);
            precisionInspectionService.updateById(preInspection);

            maintenanceOrder.setPrecisionInspectionStatus("3");
            dailyMaintenanceOrderService.updateById(maintenanceOrder);
        } else if("3".equals(precisionInspectionStatus)){
            preInspection.setSparePart(precisionInspection.getSparePart());
            preInspection.setProcessPass(precisionInspection.getProcessPass());
            preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
            preInspection.setUseUnitDirectorUser(userId);
            precisionInspectionService.updateById(preInspection);

            maintenanceOrder.setPrecisionInspectionStatus("4");
            dailyMaintenanceOrderService.updateById(maintenanceOrder);
        }else if("4".equals(precisionInspectionStatus)){
            preInspection.setEquipmentInspectorSignUser(userId);
            preInspection.setJudgmentResult(precisionInspection.getJudgmentResult());
            precisionInspectionService.updateById(preInspection);

            maintenanceOrder.setPrecisionInspectionStatus("5");
            maintenanceOrder.setStatus("8");
            dailyMaintenanceOrderService.updateById(maintenanceOrder);
        }

        preInspection.setRemark(precisionInspection.getRemark());
        dailyMaintenanceOrderService.updateById(maintenanceOrder);
        precisionInspectionService.updateById(preInspection);

        return Result.OK("审批成功!");
    }

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

@@ -10,8 +10,11 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EquipmentPrecisionParameters;
import org.jeecg.modules.eam.entity.PrecisionInspectionDetail;
import org.jeecg.modules.eam.entity.PrecisionParameters;
import org.jeecg.modules.eam.service.IPrecisionInspectionDetailService;
import org.jeecg.modules.eam.service.IPrecisionParametersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -33,6 +36,9 @@
public class PrecisionInspectionDetailController extends JeecgController<PrecisionInspectionDetail, IPrecisionInspectionDetailService> {
    @Autowired
    private IPrecisionInspectionDetailService precisionInspectionDetailService;

     @Autowired
    private IPrecisionParametersService precisionParametersService;
    
    /**
     * 分页列表查询
@@ -157,5 +163,4 @@
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, PrecisionInspectionDetail.class);
    }

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspectionDetail.java

@@ -4,10 +4,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
@@ -72,4 +70,7 @@
    @ApiModelProperty(value = "delFlag")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;

    @TableField(exist = false)
    private String precisionParametersName;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml

@@ -12,10 +12,10 @@
            t5.realname AS equipmentInspectorUserName,
            t6.realname AS useUnitDirectorUserName,
            t7.realname AS equipmentInspectorSignUserName,
            t1.each_tolerance AS eachTolerance,
            t1.part_tolerance AS partTolerance,
            t1.process_pass AS processPass,
            t1.meet_process_require AS meetProcessRequire,
            ISNULL(t1.each_tolerance,0) AS eachTolerance,
            ISNULL(t1.part_tolerance,0)  AS partTolerance,
            ISNULL(t1.process_pass,0) AS processPass,
            ISNULL(t1.meet_process_require,0) AS meetProcessRequire,
            t1.judgment_result AS judgmentResult,
            t1.remark,
            t8.name AS equipmentName,