root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:保养计划

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-06 17:04:24 +08:00
parent 09ab937611
commit 077393cd37
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mes/hd/nladmin-system/pom.xml
View File

@@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>org.redisson</groupId> <groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId> <artifactId>redisson-spring-boot-starter</artifactId>
<version>3.19.1</version> <version>3.16.4</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
@@ -271,6 +271,9 @@
<includes> <includes>
<include>**/*.*</include> <include>**/*.*</include>
</includes> </includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource> </resource>
<resource> <resource>
<directory>${basedir}/src/main/resources</directory> <directory>${basedir}/src/main/resources</directory>

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java
View File

@@ -63,20 +63,20 @@ public class AutoCreateUpkeep {
// 计算 维修计划日期 - 当前日期 后的天数 // 计算 维修计划日期 - 当前日期 后的天数
Date today2 = DateUtil.parse(today); Date today2 = DateUtil.parse(today);
Date plan_start_date2 = DateUtil.parse(plan_start_date); Date plan_start_date2 = DateUtil.parse(plan_start_date);
long num = (int) DateUtil.between(plan_start_date2,today2, DateUnit.DAY); long num = (int) DateUtil.between(today2,plan_start_date2, DateUnit.DAY);
// 周期为年 ：当前日期-保养计划日期 <= 15 天时，新增保养单 // 周期为年 ：当前日期-保养计划日期 <= 15 天时，新增保养单
if (StrUtil.equals(maintenancecycle,"01")) { if (StrUtil.equals(maintenancecycle,"01")) {
if (num >= 15) { if (num <= 15) {
this.createMain(param); this.createMain(param);
} }
// 周期为月 ：当前日期-保养计划日期 <= 7 天时，新增保养单 // 周期为月 ：当前日期-保养计划日期 <= 7 天时，新增保养单
} else if (StrUtil.equals(maintenancecycle,"02")) { } else if (StrUtil.equals(maintenancecycle,"02")) {
if (num >= 7) { if (num <= 7) {
this.createMain(param); this.createMain(param);
} }
// 周期为周 ：当前日期-保养计划日期 <= 3 天时，新增保养单 // 周期为周 ：当前日期-保养计划日期 <= 3 天时，新增保养单
} else if (StrUtil.equals(maintenancecycle,"03")) { } else if (StrUtil.equals(maintenancecycle,"03")) {
if (num >= 3) { if (num <= 3) {
this.createMain(param); this.createMain(param);
} }
} }

3
mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -84,8 +84,7 @@ spring:
singleServerConfig: singleServerConfig:
connectionMinimumIdleSize: 8 connectionMinimumIdleSize: 8
connectionPoolSize: 8 connectionPoolSize: 8
address: redis://47.96.133.178:6479 address: redis://127.0.0.1:6379
password: 942464Yy
idleConnectionTimeout: 10000 idleConnectionTimeout: 10000
timeout: 3000 timeout: 3000
# 登录相关配置 # 登录相关配置