From bb696e8e702854b62b144b22e20e36981301e6cf Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 17 四月 2025 09:46:24 +0800
Subject: [PATCH] 新增筛选电子样板接口、新增强制终止流程方法，
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index d97a6e7..3642513 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -79,7 +79,7 @@
}else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.INIT.getCode());
}
-
+ save(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
@@ -99,7 +99,6 @@
log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
}
}
- save(eamInspectionOrder);
if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
triggerProcess(eamInspectionOrder);
}
@@ -151,6 +150,7 @@
if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
tableDetail.setOrderId(eamInspectionOrder.getId());
+ tableDetail.setCreateTime(new Date());
});
//鍒犻櫎鏄庣粏
eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
@@ -378,6 +378,7 @@
eamReportRepair.setFaultType(eamEquipmentFaultReason.getFaultCategory());
eamReportRepair.setFaultDescription(eamEquipmentFaultReason.getFaultDescription());
eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
+ eamReportRepair.setBreakdownFlag("1");
eamReportRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
eamReportRepair.setFaultStartTime(new Date());
eamReportRepair.setRemark(item.getExceptionDescription());
@@ -412,6 +413,7 @@
eamInspectionOrder.setInspectionStatus(type);
if (type.equals("2")){
eamInspectionOrder.setOperator(loginUser.getUsername());
+ this.triggerProcess(eamInspectionOrder);
}else {
eamInspectionOrder.setOperator(null);
}
--
Gitblit v1.9.3