From a70c4bfde4a52a598a270901e41b8c253dd0bb89 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 04 七月 2025 21:02:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenanceOrderGenerateJob.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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..b57a350 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
@@ -81,19 +81,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 +105,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());
@@ -138,7 +138,7 @@
}
eamThirdMaintenanceOrderService.addMaintenance(request);
- standard.setLastGenerateTime(new Date());
+// standard.setLastGenerateTime(new Date());
eamMaintenanceStandardService.updateById(standard);
}
quartzLog.setIsSuccess(0);
--
Gitblit v1.9.3