From ba138098223d841748287f32e80db3bb5b05e270 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 14 五月 2025 11:39:38 +0800
Subject: [PATCH] art: 设备管理-维修状态变更
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java | 26 +++++++-------------------
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ReportRepairEnum.java | 7 +++++--
2 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ReportRepairEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ReportRepairEnum.java
index 91ff967..85fef79 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ReportRepairEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ReportRepairEnum.java
@@ -2,8 +2,11 @@
public enum ReportRepairEnum {
WAIT_REPAIR, // 寰呯淮淇�
- UNDER_REPAIR, // 缁翠慨涓�
- WAIT_SPARES, // 绛夊浠�
+ UNDER_INTERNAL_REPAIR, // 鍐呴儴缁翠慨涓�
+ EXTERNAL_REPAIR_CONFIRM, // 澶栭儴缁翠慨纭涓� 璁惧绠＄悊鍛橈紵
+ WAIT_EXTERNAL_RECEIVE, // 寰呮満鍔ㄥ姙鎺ュ崟
+ UNDER_EXTERNAL_REPAIR, // 鏈哄姩鍔炵淮淇腑
+ UNDER_OUTSIDE_REPAIR, // 濮斿缁翠慨涓� 璐ｄ换浜烘槸璋侊紵
WAIT_CONFIRM, // 寰呯‘璁�
COMPLETE, // 宸插畬鎴�
ABOLISH, // 宸蹭綔搴�
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index b86ab14..a5e9b1f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -112,7 +112,7 @@
EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
- eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
+ eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
eamRepairOrder.setActualStartTime(DateUtils.getNow());
eamRepairOrder.setIsUseSpare(0);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -137,7 +137,7 @@
if (!result.isSuccess()) {
super.removeById(eamRepairOrder);
} else {
- eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_REPAIR.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
eamReportRepairService.updateById(eamReportRepair);
//鏇存柊璁惧缁翠慨鐘舵��
eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
@@ -157,7 +157,7 @@
EamReportRepair eamReportRepair = eamReportRepairService.getById(eamReportRepairQuery.getId());
eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
- eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
+ eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
eamRepairOrder.setActualStartTime(DateUtils.getNow());
eamRepairOrder.setIsUseSpare(0);
eamRepairOrder.setRepairer(eamReportRepairQuery.getRepairer());
@@ -181,7 +181,7 @@
if (!result.isSuccess()) {
super.removeById(eamRepairOrder);
} else {
- eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_REPAIR.name());
+ eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_INTERNAL_REPAIR.name());
eamReportRepairService.updateById(eamReportRepair);
//鏇存柊璁惧缁翠慨鐘舵��
eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
@@ -234,7 +234,7 @@
//娴佺▼鍙橀噺
Map<String, Object> values = new HashMap<>();
switch (status) {
- case UNDER_REPAIR:
+ case UNDER_INTERNAL_REPAIR:
//缁翠慨涓細涓嬩竴姝� 鍒ゆ柇鏄惁闇�瑕佸浠�, 闇�瑕佸浠惰浆璁惧绠＄悊鍛橀鐢ㄥ浠�, 涓嶉渶瑕佸垯杞埌璁惧鎶ヤ慨鍛樼‘璁ょ淮淇畬鎴�
if (request.getIsUseSpare() == 1) {
// 闇�瑕�
@@ -248,8 +248,8 @@
values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(",")));
values.put("status", 1);
request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
- eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
- eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_SPARES.name());
+// eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
+// eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_SPARES.name());
eamRepairOrder.setIsUseSpare(1);
} else {
values.put("dataId", eamRepairOrder.getId());
@@ -302,18 +302,6 @@
//鏇存柊璁惧缁翠慨鐘舵��
eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.WAIT_CONFIRM.name());
}
- break;
- case WAIT_SPARES:
- // 绛夊浠�, 绠＄悊鍛樼‘璁ゅ浠跺埌浣嶏紝娴佺▼杞埌缁翠慨鍛樼户缁淮淇�,鐘舵�佽浆涓虹淮淇腑
- values.put("dataId", eamRepairOrder.getId());
- values.put("organization", "缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
- values.put("comment", "缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
- values.put("NextAssignee", Arrays.asList(eamRepairOrder.getRepairer().split(",")));
- values.put("status", 0);
- request.setComment("缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
- eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
- eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_REPAIR.name());
- eamRepairOrder.setSparePartDescription(request.getSparePartDescription());
break;
case WAIT_CONFIRM:
// 寰呯‘璁�, 缁翠慨鍛樼淮淇畬鎴愶紝鎶ヤ慨浜虹‘璁ょ粨鏉熸祦绋�
--
Gitblit v1.9.3