From 0581d9986b4d14cdf8a6f66a929674224dd45b2f Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 11 一月 2024 09:34:15 +0800 Subject: [PATCH] 问题项修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 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..44d0d99 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 @@ -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 { @@ -676,6 +690,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 +740,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