From 6e006cb835fce4720139de0cc2ec3be734295ed9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 12 七月 2025 14:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderGenerateJob.java | 47 +++++++++++++++--------------------------------
1 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderGenerateJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderGenerateJob.java
index 389b45f..2241c37 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderGenerateJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderGenerateJob.java
@@ -9,7 +9,6 @@
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
-import org.jeecg.modules.eam.service.IEamEquipmentPrecisionParametersService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
@@ -34,8 +33,6 @@
@Slf4j
public class ThirdMaintenanceOrderGenerateJob implements Job {
- @Autowired
- private IEamEquipmentPrecisionParametersService eamEquipmentPrecisionParametersService;
@Autowired
private IEamThirdMaintenanceOrderService eamThirdMaintenanceOrderService;
@Autowired
@@ -81,19 +78,19 @@
//璁剧疆鍒濆鏃ユ湡涓哄墠涓�澶�
standard.setInitialDate(DateUtils.localDateToDate(now.minusDays(1)));
}
- LocalDate generateDate = DateUtils.dateToLocalDate(standard.getInitialDate());
- if (standard.getLastGenerateTime() != null) {
- generateDate = DateUtils.dateToLocalDate(standard.getLastGenerateTime());
- }
+// LocalDate generateDate = DateUtils.dateToLocalDate(standard.getInitialDate());
+// if (standard.getLastGenerateTime() != null) {
+// generateDate = DateUtils.dateToLocalDate(standard.getLastGenerateTime());
+// }
//鍔犲懆鏈�
- do {
- //鍒濆鏃ユ湡璁剧疆鐨勬瘮杈冩棭锛屾垨浠诲姟闀挎椂闂存病鎵ц锛屽繀椤诲懆鏈熷埌浠婂ぉ鎵嶄細鐢熸垚宸ュ崟
- generateDate = generateDate.plusDays(standard.getMaintenancePeriod());
- } while (now.isAfter(generateDate));
- if(!now.isEqual(generateDate)) {
- //杩樻湭鍒扮敓鎴愭棩鏈燂紝璺宠繃鎵ц
- continue;
- }
+// do {
+// //鍒濆鏃ユ湡璁剧疆鐨勬瘮杈冩棭锛屾垨浠诲姟闀挎椂闂存病鎵ц锛屽繀椤诲懆鏈熷埌浠婂ぉ鎵嶄細鐢熸垚宸ュ崟
+// generateDate = generateDate.plusDays(standard.getMaintenancePeriod());
+// } while (now.isAfter(generateDate));
+// if(!now.isEqual(generateDate)) {
+// //杩樻湭鍒扮敓鎴愭棩鏈燂紝璺宠繃鎵ц
+// continue;
+// }
//鑾峰彇淇濆吇椤规槑缁�
List<EamMaintenanceStandardDetail> standardDetailList = eamMaintenanceStandardDetailService.selectByStandardId(standard.getId());
if(CollectionUtil.isEmpty(standardDetailList)) {
@@ -105,7 +102,7 @@
EamThirdMaintenanceRequest request = new EamThirdMaintenanceRequest();
request.setEquipmentId(standard.getEquipmentId());
request.setStandardId(standard.getId());
- request.setMaintenanceDate(DateUtils.localDateToDate(generateDate));
+// request.setMaintenanceDate(DateUtils.localDateToDate(generateDate));
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.THIRD_MAINTENANCE_CODE_RULE);
request.setOrderNum(codeSeq);
request.setCreationMethod(OrderCreationMethodEnum.AUTO.name());
@@ -121,24 +118,10 @@
}
// List<EamThirdMaintenanceOrderDetail> collect = standardDetailList.stream().map(EamThirdMaintenanceOrderDetail::new).collect(Collectors.toList());
request.setTableDetailList(tableDetailList);
-
- //閫氳繃璁惧 鑾峰彇璁惧绮惧害鍙傛暟
- List<EamEquipmentPrecisionParameters> precisionParametersList = eamEquipmentPrecisionParametersService
- .lambdaQuery().eq(EamEquipmentPrecisionParameters::getEquipmentId, standard.getEquipmentId()).list();
- if(precisionParametersList.size()>0){
- List<EamPrecisionCheckDetail> precisionDetailList = new ArrayList<>();
- for (EamEquipmentPrecisionParameters epp : precisionParametersList) {
- EamPrecisionCheckDetail pcd = new EamPrecisionCheckDetail();
- pcd.setParameterId(epp.getParameterId());
- pcd.setEquipmentId(standard.getEquipmentId());
- pcd.setParameterValue(epp.getParameterValue());
- precisionDetailList.add(pcd);
- }
- request.setPrecisionDetailList(precisionDetailList);
- }
+
eamThirdMaintenanceOrderService.addMaintenance(request);
- standard.setLastGenerateTime(new Date());
+// standard.setLastGenerateTime(new Date());
eamMaintenanceStandardService.updateById(standard);
}
quartzLog.setIsSuccess(0);
--
Gitblit v1.9.3