From 792ff6e14b5074d30f8a7bd804d3b8e6454c3969 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 11 一月 2024 17:41:45 +0800
Subject: [PATCH] 保养拆分
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 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..d36ced6 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 {
@@ -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
--
Gitblit v1.9.3