From d40c3ccad0e5264fefd33264254564dead8c80df Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 06 十一月 2023 11:44:36 +0800 Subject: [PATCH] 单据名称增加单据来源 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java index 3f80c10..073cfe2 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java @@ -92,6 +92,12 @@ @Autowired @Lazy private IProjectMaintenanceOrderService projectMaintenanceOrderService; + @Autowired + @Lazy + private IdentityService sysIdentityService; + + + @@ -350,6 +356,14 @@ IPage<RepairOrderDetail> pageList = repairOrderDetailService.page(page, queryWrapper); return Result.OK(pageList); } + + @GetMapping(value = "/pageRepairOrderDetailByMainId") + public Result<IPage<RepairOrderDetail>> pageRepairOrderDetailByMainId(@RequestParam("pageNo") Integer pageNo, + @RequestParam("pageSize") Integer pageSize, + @RequestParam Map<String, Object> params) { + IPage<RepairOrderDetail> pageList = repairOrderDetailService.pageRepairOrderDetailByMainId(pageNo, pageSize, params); + return Result.OK(pageList); + } /** * 娣诲姞 @@ -1483,7 +1497,18 @@ * @return */ @PutMapping(value = "/start") + @Transactional(rollbackFor = Exception.class) public Result<?> orderStart(@RequestBody RepairOrder repairOrder){ + if(StringUtils.isNotBlank(repairOrder.getReportRepairId())){ + EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder.getReportRepairId()); + equipmentReportRepair.setStatus("3"); + equipmentReportRepairService.updateById(equipmentReportRepair); + if(StringUtils.isNotBlank(equipmentReportRepair.getEquipmentId())){ + Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId()); + equipment.setEquipmentStatus("7"); + equipmentService.updateById(equipment); + } + } if(StringUtils.isNotBlank(repairOrder.getProjectMaintenanceOrderId())){ //鍒ゆ柇椤圭洰鎬х淮淇瓙琛ㄧ姸鎬� ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder.getProjectMaintenanceOrderId()); @@ -1570,5 +1595,28 @@ } return Result.OK(repairOrderService.update(new UpdateWrapper<RepairOrder>().set("status",7).eq("id",repairOrder.getId()))); } - + @PostMapping("addBySelectReport") + public Result<?> addBySelectReport(@RequestBody List<EquipmentReportRepair> equipmentReportRepairs){ + LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal(); + for(EquipmentReportRepair equipmentReportRepair:equipmentReportRepairs){ + String num = sysIdentityService.getNumByTypeAndLength("RepairOrder",4); + Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId()); + equipmentReportRepair.setStatus("2"); + RepairOrder repairOrder = new RepairOrder(); + repairOrder.setNum(num); + repairOrder.setReportRepairId(equipmentReportRepair.getId()); + repairOrder.setStatus("2"); + repairOrder.setEquipmentId(equipment.getId()); + repairOrder.setTeamId(equipment.getTeamId()); + repairOrder.setDepartId(equipment.getUseId()); + repairOrder.setFaultDescription(equipmentReportRepair.getFaultDescription()); + repairOrder.setFaultTime(equipmentReportRepair.getFaultTime()); + repairOrder.setResponsibilityId(user.getId()); + repairOrder.setRepairOrderType(0); + repairOrder.setDelFlag(0); + repairOrderService.save(repairOrder); + } + equipmentReportRepairService.updateBatchById(equipmentReportRepairs); + return Result.OK("棰嗗彇鎴愬姛"); + } } -- Gitblit v1.9.3