保养拆分

qushaowei

2024-01-11 792ff6e14b5074d30f8a7bd804d3b8e6454c3969

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

@@ -111,6 +111,9 @@
    private IMaintenanceStoveExemptService maintenanceStoveExemptService;

    @Autowired
    private ITechnologyStatusService technologyStatusService;

    @Autowired
    private ISysFileNameService sysFileNameService;

    @Resource
@@ -305,6 +308,7 @@
        dailyMaintenanceOrder.setConfirmStatus("0");//移交确认状态（0未确认，1主任确认，2检验员确认）
        dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//精度检验单流程状态（0未确认，1精度检验者，2维修室主任，3设备检验员，4使用单位技术主管，5设备检验员（盖章））
        dailyMaintenanceOrder.setStoveExemptStatus("0");//炉类设备豁免20项状态（0未确认，1维修室主任，2保养人员，3仪表工）
        dailyMaintenanceOrder.setStatus("3");//3:未开始
        dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
@@ -602,6 +606,16 @@
                maintenanceStoveExemptService.removeById(maintenanceStoveExempt);
            }

            /**
             * 删除精度检验单
             */
            List<TechnologyStatus> technologyStatusList = technologyStatusService.lambdaQuery()
                    .eq(TechnologyStatus::getOrderId, id)
                    .eq(TechnologyStatus::getDelFlag, 0).list();
            for (TechnologyStatus technologyStatus : technologyStatusList) {
                technologyStatusService.removeById(technologyStatus);
            }

            if (b) {
                return Result.OK("撤销成功!");
            } else {
@@ -629,24 +643,23 @@
    public Result<String> report(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
        dailyMaintenanceOrder.setMaintenanceUserId(userId);
//        dailyMaintenanceOrder.setMaintenanceUserId(userId);
        dailyMaintenanceOrder.setActualEndTime(new Date());
        boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
            dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
        }

        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
        FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
        finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId());
        finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId());
//        finishTransferOrder.setOperateUser(userId);
//        finishTransferOrder.setRepairUser(userId);
        finishTransferOrder.setStatus("1");
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

//        this.createPrecisionInspection(maintenanceOrder);
//
//        this.createMaintenanceStoveExempt(maintenanceOrder);

        if (!b) {
            return Result.error("报工失败!");
@@ -661,9 +674,14 @@
    public Result<String> report3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
        dailyMaintenanceOrder.setMaintenanceUserId(userId);
//        dailyMaintenanceOrder.setMaintenanceUserId(userId);
        dailyMaintenanceOrder.setActualEndTime(new Date());
        boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);

        List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
        for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
            dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
        }

        String id = dailyMaintenanceOrder.getId();
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
@@ -675,6 +693,13 @@
        finishTransferOrder.setStatus("1");
        finishTransferOrder.setDelFlag(0);
        finishTransferOrderService.save(finishTransferOrder);

        String equipmentId = maintenanceOrder.getEquipmentId();
        Equipment equipment = equipmentService.getById(equipmentId);
        String precisionParameters = equipment.getPrecisionParameters();
        if(!"1".equals(precisionParameters)){
            this.createTechnologyStatus(maintenanceOrder);
        }

        this.createPrecisionInspection(maintenanceOrder);

@@ -719,6 +744,14 @@
        maintenanceStoveExemptService.save(maintenanceStoveExempt);
    }

    void createTechnologyStatus(DailyMaintenanceOrder dailyMaintenanceOrder){
        List<SysFileNameVo> sysFileName = sysFileNameService.getSysFileName("9");
        TechnologyStatus technologyStatus = new TechnologyStatus();
        technologyStatus.setOrderId(dailyMaintenanceOrder.getId());
        technologyStatus.setReceipts(sysFileName.get(0).getReceipts());
        technologyStatusService.save(technologyStatus);
    }

    /**
     * 日常保养工单 获取设备台站已绑定的对象部门
     * qsw 2023-7-11