diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java
index 5fbcca17..5d10a0e1 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceCalibrationController.java
@@ -1,7 +1,9 @@
 package com.zt.plat.module.qms.resource.device.controller.admin;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.module.qms.resource.device.controller.vo.*;
 import com.zt.plat.module.qms.resource.device.service.DeviceCalibrationPlanService;
 import com.zt.plat.module.qms.resource.device.service.DeviceProductService;
@@ -65,7 +67,7 @@ public class DeviceCalibrationController extends AbstractFileUploadController im
     }
 
     @PostMapping("/createByDeviceId")
-    @Operation(summary = "创建设备-检定校准")
+    @Operation(summary = "创建检定校准")
     public CommonResult<DeviceCalibrationRespVO> createByDeviceId(@RequestBody DeviceCalibrationSaveReqVO createReqVO) {
         return success(deviceCalibrationService.createByDeviceId(createReqVO));
     }
@@ -111,6 +113,20 @@ public class DeviceCalibrationController extends AbstractFileUploadController im
         return success(vo);
     }
 
+    @GetMapping("/getLastData")
+    @Operation(summary = "获得设备-检定校准")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<DeviceCalibrationVO> getLastData(@Valid DeviceCalibrationPageReqVO vo) {
+        Long deviceId = vo.getDeviceId();
+        if(ObjectUtils.isEmpty(deviceId)){
+            return CommonResult.error(0, "缺少参数");
+        }
+        JSONObject param = new JSONObject();
+        param.put("deviceId", deviceId);
+        param.put("flowStatus", QmsCommonConstant.COMPLETED);
+        return CommonResult.success(deviceCalibrationService.getLastData( param));
+    }
+
     @RequestMapping("/submitApply")
     @Operation(summary = "提交申请")
     public CommonResult<DeviceCalibrationRespVO> submitApply(@RequestBody DeviceCalibrationSaveReqVO param) {
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java
index cfe6bd08..f315d264 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DevicePeriodCheckController.java
@@ -1,7 +1,9 @@
 package com.zt.plat.module.qms.resource.device.controller.admin;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.module.qms.resource.device.common.DeviceConstant;
 import com.zt.plat.module.qms.resource.device.controller.vo.*;
 import com.zt.plat.module.qms.resource.device.service.DeviceProductService;
@@ -66,6 +68,18 @@ public class DevicePeriodCheckController extends AbstractFileUploadController im
         return success(devicePeriodCheckService.createDevicePeriodCheck(createReqVO));
     }
 
+    @PostMapping("/createByDeviceId")
+    @Operation(summary = "创建期间核查-设备")
+    public CommonResult<DevicePeriodCheckRespVO> createByDeviceId(@RequestBody DevicePeriodCheckSaveReqVO createReqVO) {
+        return success(devicePeriodCheckService.createByDeviceId(createReqVO));
+    }
+
+    @PostMapping("/createByMaterialId")
+    @Operation(summary = "创建期间核查-物料试剂")
+    public CommonResult<DevicePeriodCheckRespVO> createByMaterialId(@RequestBody DevicePeriodCheckSaveReqVO createReqVO) {
+        return success(devicePeriodCheckService.createByMaterialId(createReqVO));
+    }
+
     @PutMapping("/update")
     @Operation(summary = "更新设备-期间核查")
     public CommonResult<DevicePeriodCheckRespVO> updateDevicePeriodCheck(@Valid @RequestBody DevicePeriodCheckSaveReqVO updateReqVO) {
@@ -148,7 +162,7 @@ public class DevicePeriodCheckController extends AbstractFileUploadController im
         Page<DevicePeriodCheckPageReqVO> page = new Page<>(param.getPageNo(), param.getPageSize());
         Long productId = param.getProductId();
         if(!ObjectUtils.isEmpty(productId)){
-            List<Long> productIdList = deviceProductService.getIdListByIdPath(productId);
+            List<Long> productIdList = materialProductService.getIdListByIdPath(productId);
             param.setProductIdList(productIdList);
             param.setProductId(null);
         }
@@ -163,6 +177,34 @@ public class DevicePeriodCheckController extends AbstractFileUploadController im
         return CommonResult.success(pageResult);
     }
 
+    @GetMapping("/getLastDataDevice")
+    @Operation(summary = "获取指定设备最新期间核查数据")
+    public CommonResult<DevicePeriodCheckVO> getLastDataDevice(@Valid DevicePeriodCheckPageReqVO vo) {
+        Long deviceId = vo.getDeviceId();
+        if(ObjectUtils.isEmpty(deviceId)){
+            return CommonResult.error(0, "缺少参数");
+        }
+        JSONObject param = new JSONObject();
+        param.put("deviceId", deviceId);
+        param.put("flowStatus", QmsCommonConstant.COMPLETED);
+        param.put("checkTarget", DeviceConstant.PERIOD_CHECK_TAGET_DEVICE);
+        return CommonResult.success(devicePeriodCheckService.getLastDataDevice( param));
+    }
+
+    @GetMapping("/getLastDataMaterial")
+    @Operation(summary = "获取指定物料最新期间核查数据")
+    public CommonResult<DevicePeriodCheckVO> getLastDataMaterial(@Valid DevicePeriodCheckPageReqVO vo) {
+        Long deviceId = vo.getDeviceId();
+        if(ObjectUtils.isEmpty(deviceId)){
+            return CommonResult.error(0, "缺少参数");
+        }
+        JSONObject param = new JSONObject();
+        param.put("deviceId", deviceId);
+        param.put("flowStatus", QmsCommonConstant.COMPLETED);
+        param.put("checkTarget", DeviceConstant.PERIOD_CHECK_TAGET_MATERIAL);
+        return CommonResult.success(devicePeriodCheckService.getLastDataMaterial( param));
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出设备-期间核查 Excel")
     @PreAuthorize("@ss.hasPermission('qms:device-period-check:export')")
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.java
index 6a06c080..de8523bb 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.java
@@ -49,7 +49,7 @@ public interface DeviceCalibrationMapper extends BaseMapperX<DeviceCalibrationDO
                 .eqIfPresent(DeviceCalibrationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .eqIfPresent(DeviceCalibrationDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(DeviceCalibrationDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DeviceCalibrationDO::getId));
+                .orderByDesc(DeviceCalibrationDO::getCreateTime));
     }
 
     /*
@@ -57,6 +57,9 @@ public interface DeviceCalibrationMapper extends BaseMapperX<DeviceCalibrationDO
      * */
     List<DeviceCalibrationVO> getLastDataCheckList(@Param("param") JSONObject param);
 
+    DeviceCalibrationVO getLastData(@Param("param") JSONObject param);
+
+
     IPage<DeviceCalibrationVO> queryPageList(Page<DeviceCalibrationPageReqVO> page, @Param("param") DeviceCalibrationPageReqVO param);
 
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationPlanMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationPlanMapper.java
index bc1460e8..de79f62d 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationPlanMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationPlanMapper.java
@@ -30,7 +30,7 @@ public interface DeviceCalibrationPlanMapper extends BaseMapperX<DeviceCalibrati
                 .eqIfPresent(DeviceCalibrationPlanDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .eqIfPresent(DeviceCalibrationPlanDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(DeviceCalibrationPlanDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DeviceCalibrationPlanDO::getId));
+                .orderByDesc(DeviceCalibrationPlanDO::getCreateTime));
     }
 
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.java
index 8922a30e..7a47c531 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.java
@@ -47,7 +47,7 @@ public interface DevicePeriodCheckMapper extends BaseMapperX<DevicePeriodCheckDO
                 .eqIfPresent(DevicePeriodCheckDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .eqIfPresent(DevicePeriodCheckDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(DevicePeriodCheckDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DevicePeriodCheckDO::getId));
+                .orderByDesc(DevicePeriodCheckDO::getCreateTime));
     }
 
     /*
@@ -58,4 +58,7 @@ public interface DevicePeriodCheckMapper extends BaseMapperX<DevicePeriodCheckDO
     IPage<DevicePeriodCheckVO> queryPageListDevice(Page<DevicePeriodCheckPageReqVO> page, @Param("param") DevicePeriodCheckPageReqVO param);
 
     IPage<DevicePeriodCheckVO> queryPageListMaterial(Page<DevicePeriodCheckPageReqVO> page, @Param("param") DevicePeriodCheckPageReqVO param);
+
+    DevicePeriodCheckVO getLastDataDevice(@Param("param") JSONObject param);
+    DevicePeriodCheckVO getLastDataMaterial(@Param("param") JSONObject param);
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckPlanMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckPlanMapper.java
index 22ba79d3..f1a4c0ee 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckPlanMapper.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckPlanMapper.java
@@ -31,7 +31,7 @@ public interface DevicePeriodCheckPlanMapper extends BaseMapperX<DevicePeriodChe
                 .eqIfPresent(DevicePeriodCheckPlanDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .eqIfPresent(DevicePeriodCheckPlanDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(DevicePeriodCheckPlanDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DevicePeriodCheckPlanDO::getId));
+                .orderByDesc(DevicePeriodCheckPlanDO::getCreateTime));
     }
 
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java
index affbc41b..584579bd 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationService.java
@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.resource.device.service;
 
 import java.util.*;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zt.plat.framework.common.pojo.CommonResult;
@@ -70,6 +71,7 @@ public interface DeviceCalibrationService {
      */
     DeviceCalibrationDO getDeviceCalibration(Long id);
     DeviceCalibrationVO getDeviceCalibrationVO(Long id);
+    DeviceCalibrationVO getLastData(JSONObject param);
 
     /**
      * 获得设备-检定校准分页
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java
index 417cd29c..031ab11a 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java
@@ -388,4 +388,9 @@ public class DeviceCalibrationServiceImpl implements DeviceCalibrationService, B
         JSONObject ret = new JSONObject();
         return CommonResult.success(ret);
     }
+
+    @Override
+    public DeviceCalibrationVO getLastData(JSONObject param) {
+        return deviceCalibrationMapper.getLastData(param);
+    }
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckService.java
index 7951c8ec..bc7028d0 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckService.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckService.java
@@ -2,6 +2,7 @@ package com.zt.plat.module.qms.resource.device.service;
 
 import java.util.*;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zt.plat.framework.common.pojo.CommonResult;
@@ -44,6 +45,8 @@ public interface DevicePeriodCheckService {
 
     DevicePeriodCheckRespVO createByDeviceId(DevicePeriodCheckSaveReqVO createReqVO);
 
+    DevicePeriodCheckRespVO createByMaterialId(DevicePeriodCheckSaveReqVO createReqVO);
+
     /**
      * 更新设备-期间核查
      *
@@ -75,6 +78,8 @@ public interface DevicePeriodCheckService {
 
     DevicePeriodCheckVO getVoDevice(Long id);
     DevicePeriodCheckVO getVoMaterial(Long id);
+    DevicePeriodCheckVO getLastDataMaterial(JSONObject param);
+    DevicePeriodCheckVO getLastDataDevice(JSONObject param);
     /**
      * 获得设备-期间核查分页
      *
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java
index 6fe395c9..7bde5327 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java
@@ -281,6 +281,7 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B
         entity.setEffectiveFlag("1");
         entity.setFormId(formTemplateId);
         entity.setFlowStatus(QmsCommonConstant.NOT_START);
+        entity.setCheckTarget(DeviceConstant.PERIOD_CHECK_TAGET_DEVICE);
         if(deviceList.isEmpty()){
             devicePeriodCheckMapper.insert(entity);
             return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class);
@@ -292,6 +293,47 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B
             return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class);
         }
         entity.setFrequencyRemark(rule.getFrequencyRemark());
+        entity.setCheckPersonRemark(rule.getTreatmentUser());
+        entity.setCheckAccording(rule.getTreatmentMethod());
+        entity.setFrequencyRemark(rule.getFrequencyRemark());
+        devicePeriodCheckMapper.insert(entity);
+        return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class);
+    }
+
+    @Override
+    public DevicePeriodCheckRespVO createByMaterialId(DevicePeriodCheckSaveReqVO createReqVO) {
+        Long deviceId = createReqVO.getDeviceId();
+        if(deviceId == null)
+            throw exception0(DEVICE_PERIOD_CHECK_NOT_EXISTS.getCode(), "请选择设备或标准物质");
+        JSONObject ruleParam = new JSONObject();
+        ruleParam.put("businessType", DeviceConstant.PERIOD_TYPE);
+        ruleParam.put("deviceId", deviceId);
+        List<MaterialInfoWithBizConfigVO> materialList = materialInfomationService.getListNeedByRule(ruleParam);
+
+        String formKey = dictionaryBusinessService.getValueByDataKey(formDicKey);
+        DataTemplateDO formTemplate = dataTemplateService.getLatestDataByKey(formKey);
+        Long formTemplateId = formTemplate.getId();
+        DevicePeriodCheckDO entity = new DevicePeriodCheckDO();
+        entity.setDeviceId(deviceId);
+        entity.setPlanId(0L);
+        entity.setEffectiveFlag("1");
+        entity.setFormId(formTemplateId);
+        entity.setFlowStatus(QmsCommonConstant.NOT_START);
+        entity.setCheckTarget(DeviceConstant.PERIOD_CHECK_TAGET_MATERIAL);
+        if(materialList.isEmpty()){
+            devicePeriodCheckMapper.insert(entity);
+            return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class);
+        }
+        MaterialInfoWithBizConfigVO configVO = materialList.get(0);
+        DeviceConfigBusinessRuleDO rule = configVO.getRule();
+        if(rule == null){
+            devicePeriodCheckMapper.insert(entity);
+            return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class);
+        }
+        entity.setFrequencyRemark(rule.getFrequencyRemark());
+        entity.setCheckPersonRemark(rule.getTreatmentUser());
+        entity.setCheckAccording(rule.getTreatmentMethod());
+        entity.setFrequencyRemark(rule.getFrequencyRemark());
         devicePeriodCheckMapper.insert(entity);
         return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class);
     }
@@ -428,4 +470,14 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B
         JSONObject ret = new JSONObject();
         return CommonResult.success(ret);
     }
+
+    @Override
+    public DevicePeriodCheckVO getLastDataMaterial(JSONObject param) {
+        return devicePeriodCheckMapper.getLastDataMaterial(param);
+    }
+
+    @Override
+    public DevicePeriodCheckVO getLastDataDevice(JSONObject param) {
+        return devicePeriodCheckMapper.getLastDataDevice(param);
+    }
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductService.java
index aedabd20..1b4bc4d9 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductService.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductService.java
@@ -1,6 +1,7 @@
 package com.zt.plat.module.qms.resource.material.service;
 
 import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceProductDO;
 import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductPageReqVO;
 import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductRespVO;
 import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductSaveReqVO;
@@ -186,4 +187,8 @@ public interface MaterialProductService {
 
 
     List<MaterialProductDO> selectListWithCustomSql(MaterialProductPageReqVO reqVO);
+
+    List<Long> getIdListByIdPath(Long id);
+
+    List<MaterialProductDO> listByIdPath(Long id, String nodeType);
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductServiceImpl.java
index 009ffec9..124d2533 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductServiceImpl.java
@@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
@@ -523,4 +524,21 @@ public class MaterialProductServiceImpl implements MaterialProductService {
     public List<MaterialProductDO> selectListWithCustomSql(MaterialProductPageReqVO reqVO) {
         return materialProductMapper.selectListWithCustomSql(reqVO);
     }
+
+    @Override
+    public List<Long> getIdListByIdPath(Long id) {
+        List<MaterialProductDO> productDOList = this.listByIdPath(id, DataTypeConstant.DATA_TYPE_DATA);
+        List<Long> productIds = productDOList.stream().map(MaterialProductDO::getId).toList();
+        return productIds;
+    }
+
+    @Override
+    public List<MaterialProductDO> listByIdPath(Long id, String nodeType) {
+        LambdaQueryWrapper<MaterialProductDO> query = new LambdaQueryWrapper<>();
+        query.like(MaterialProductDO::getIdPath, id);
+        if(!ObjectUtils.isEmpty(nodeType))
+            query.eq(MaterialProductDO::getNodeType, nodeType);
+        query.orderByAsc(MaterialProductDO::getSortNo);
+        return materialProductMapper.selectList(query);
+    }
 }
\ No newline at end of file
diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml
index 155ff22b..796b12e6 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceCalibrationMapper.xml
@@ -72,6 +72,29 @@
 
     </select>
 
+    <select id="getLastData" resultMap="calibrationMap">
+        SELECT
+            c.*,
+            d.DEV_NAME,
+            d.ALS,
+            d.DEV_CD,
+            d.FACT_CD,
+            p.MFR,
+            p.SPEC as device_specification,
+            p.MDL_NO
+        FROM
+        T_DEV_CLB c
+        left join T_DEV_INF d on c.DEV_ID = d.ID
+        left join T_DEV_PDT p on d.PDT_ID = p.ID
+        <where>
+            and c.DEV_ID = #{param.deviceId}
+            and c.FLW_STS = #{param.flowStatus}
+            and c.deleted = 0
+        </where>
+        order by c.CHK_DT desc
+        limit 1
+    </select>
+
     <select id="queryPageList" resultMap="calibrationMap">
         SELECT
             c.*,
@@ -124,6 +147,7 @@
                 and d.DEV_NAME like concat(concat('%', #{param.deviceName}), '%')
             </if>
         </where>
+        order by c.CREATE_TIME desc
     </select>
 
 
diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml
index a0fedaca..9a46dd55 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml
+++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DevicePeriodCheckMapper.xml
@@ -137,6 +137,7 @@
                 and d.DEV_NAME like concat(concat('%', #{param.deviceName}), '%')
             </if>
         </where>
+        order by c.CREATE_TIME desc
     </select>
 
     <select id="queryPageListMaterial" resultMap="periodCheckMap">
@@ -190,6 +191,53 @@
                 and d.NAME like concat(concat('%', #{param.deviceName}), '%')
             </if>
         </where>
+        order by c.CREATE_TIME desc
     </select>
 
+    <select id="getLastDataDevice" resultMap="periodCheckMap">
+        SELECT
+            c.*,
+            d.DEV_NAME,
+            d.ALS,
+            d.DEV_CD,
+            d.FACT_CD,
+            p.MFR,
+            p.SPEC as device_specification,
+            p.MDL_NO
+        FROM
+        T_DEV_PRD_CHK c
+        left join T_DEV_INF d on c.DEV_ID = d.ID
+        left join T_DEV_PDT p on d.PDT_ID = p.ID
+        <where>
+            and c.DEV_ID = #{param.deviceId}
+            and c.FLW_STS = #{param.flowStatus}
+            and c.CHK_TGT = #{param.checkTarget}
+            and c.deleted = 0
+        </where>
+        order by c.CHK_DT desc
+        limit 1
+    </select>
+
+    <select id="getLastDataMaterial" resultMap="periodCheckMap">
+        SELECT
+            c.*,
+            d.NAME as DEV_NAME,
+            d.CD AS DEV_CD,
+            d.MDL_NO,
+            d.SPEC AS device_specification
+        FROM
+        T_DEV_PRD_CHK c
+        left join T_MTRL_INF d on c.DEV_ID = d.ID
+        <where>
+            and c.DEV_ID = #{param.deviceId}
+            and c.FLW_STS = #{param.flowStatus}
+            and c.CHK_TGT = #{param.checkTarget}
+            and c.deleted = 0
+        </where>
+        order by c.CHK_DT desc
+        limit 1
+    </select>
+
+
+
 </mapper>
\ No newline at end of file