From 707b5af9ed7c12d18cba597e3f2f76671891034b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期二, 12 十二月 2023 17:27:21 +0800 Subject: [PATCH] 技术状态鉴定 批量点检驳回 审批 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java index 682a7ce..ba3283b 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java +++ b/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 @@ -602,6 +605,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 { @@ -676,6 +689,13 @@ 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); this.createMaintenanceStoveExempt(maintenanceOrder); @@ -719,6 +739,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 -- Gitblit v1.9.3