diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeDetailVo.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeDetailVo.java
index 4dcc63e..1d8237a 100644
--- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeDetailVo.java
+++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsLubeDetailVo.java
@@ -137,4 +137,10 @@ public class DmsBillsLubeDetailVo implements Serializable {
*/
@ExcelProperty(value = "润滑部位名称")
private String lubeStationName;
+
+ /**
+ * 润滑标准编码 (关联查询字段)
+ */
+ @ExcelProperty(value = "润滑标准编码")
+ private String lubeStandardCode;
}
diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsLubeDetailMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsLubeDetailMapper.xml
index cc51b04..9db3edf 100644
--- a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsLubeDetailMapper.xml
+++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsBillsLubeDetailMapper.xml
@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -49,11 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select dbld.bills_lube_detail_id, dbld.lube_instance_id, dbld.machine_id, dbld.lube_station_id, dbld.lube_standard_id,
- dbld.operation_description, dbld.maint_status,
+ dbld.operation_description, dbld.maint_status, dbld.begin_time, dbld.end_time,
dbdl.machine_code,dbdl.machine_name,
dbdt.device_type_name,
dbls.lube_station_code, dbls.lube_station_name,
- dblsd.lube_protocol,
+ dblsd.lube_standard_code, dblsd.lube_protocol,
dblsd.operation_description as lube_operation_description
from dms_bills_lube_detail dbld
left join prod_base_machine_info dbdl on dbld.machine_id = dbdl.machine_id
diff --git a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
index efb7fe9..6f22c0c 100644
--- a/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
+++ b/ruoyi-modules/hwmom-dms/src/main/resources/mapper/dms/DmsPlanInspectMapper.xml
@@ -42,10 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.inspect_route_id, a.device_amount, a.plan_time, a.cycle_period,a.time_limit,a.job_id,
a.performer, a.remark, a.create_by, a.create_time, a.update_by,
a.update_time
-/* ,
- b.cron_expression*/
- from dms_plan_inspect a
--- left join sys_job b on a.job_id = b.job_id left join sys_job b on a.job_id = b.job_id
+ from dms_plan_inspect a left join sys_job b on a.job_id = b.job_id
where a.plan_inspect_code = #{planInspectCode}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsLubeStanceExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsLubeStanceExecutor.java
index a2dee6d..22bf947 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsLubeStanceExecutor.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/DmsLubeStanceExecutor.java
@@ -19,7 +19,7 @@ public class DmsLubeStanceExecutor {
private static final ObjectMapper objectMapper = new ObjectMapper();
- @DubboReference
+ @DubboReference(timeout = 15000)
private final RemoteLubeInstanceService dmsBillsLubeInstanceService;
public DmsLubeStanceExecutor(RemoteLubeInstanceService dmsBillsLubeInstanceService) {