diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java
index 21f91cb5..cf546a75 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java
@@ -2,16 +2,13 @@ package com.ruoyi.sip.controller;
 
 import java.util.List;
 
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import com.ruoyi.sip.domain.OrderList;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.sip.domain.OrderInfo;
@@ -127,4 +124,12 @@ public class OrderInfoController extends BaseController
     {
         return toAjax(orderInfoService.deleteOrderInfoByIds(ids));
     }
+
+    @Log(title = "合同档案", businessType = BusinessType.DELETE)
+    @GetMapping( "/query")
+    @ResponseBody
+    public AjaxResult query(MaintenanceRecordsDto dto)
+    {
+      return AjaxResult.success(orderInfoService.selectOrderInfoByMaintenance(dto));
+    }
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProductInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProductInfoController.java
index b5e6d43e..ccef330d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProductInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProductInfoController.java
@@ -1,6 +1,8 @@
 package com.ruoyi.sip.controller;
 
 import java.util.List;
+
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -125,4 +127,17 @@ public class ProductInfoController extends BaseController
     {
         return toAjax(productInfoService.deleteProductInfoByIds(ids));
     }
+
+
+    /**
+     * 根据序列号查询产品信息
+     */
+
+
+    @GetMapping( "/query")
+    @ResponseBody
+    public AjaxResult query(MaintenanceRecordsDto dto)
+    {
+        return AjaxResult.success(productInfoService.query(dto));
+    }
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
index 67e00e5e..e626ad5a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
@@ -38,6 +38,7 @@ public class DeliveryList extends BaseEntity
     @Excel(name = "备注")
     private String remark;
 
+    private String model;
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 //    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -141,11 +142,20 @@ public class DeliveryList extends BaseEntity
         return deletedAt;
     }
 
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
     @Override
     public String toString() {
         return new StringJoiner(", ", DeliveryList.class.getSimpleName() + "[", "]")
                 .add("id=" + id)
                 .add("deliveryId=" + deliveryId)
+                .add("model=" + model)
                 .add("orderCode='" + orderCode + "'")
                 .add("productCode='" + productCode + "'")
                 .add("serialNumber='" + serialNumber + "'")
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecordsDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecordsDto.java
new file mode 100644
index 00000000..a5b5eb9e
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecordsDto.java
@@ -0,0 +1,25 @@
+package com.ruoyi.sip.domain;
+
+
+import lombok.Data;
+
+/**
+ * @author :   ch
+ * @version :   1.0
+ * @ClassName :   MaintenanceRecordsDto
+ * @Description :
+ * @DATE :   Created in 17:50 2025/4/22
+ * <pre>       Copyright: Copyright(c) 2025     </pre>
+ * <pre>       Company :   	紫光汇智信息技术有限公司		           </pre>
+ * Modification  History:
+ * Date         Author        Version        Discription
+ * --------------------------------------------------------------------------
+ * 2025/04/22      ch              1.0         Why & What is modified: <修改原因描述> *
+ */
+@Data
+public class MaintenanceRecordsDto {
+    //序列号
+    private String serialNumber;
+    private String productCode;
+
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java
index 7647004e..2405a86b 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java
@@ -1,6 +1,8 @@
 package com.ruoyi.sip.mapper;
 
 import java.util.List;
+
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import com.ruoyi.sip.domain.OrderInfo;
 import com.ruoyi.sip.domain.OrderList;
 
@@ -99,4 +101,6 @@ public interface OrderInfoMapper
     void updateListBatch(List<OrderList> orderListList);
 
     List<OrderList> listOrderListByDeliveryId(Long deliveryId);
+
+    List<OrderInfo> selectOrderInfoByMaintenance(MaintenanceRecordsDto dto);
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java
index 661908dc..63d085e7 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java
@@ -1,6 +1,8 @@
 package com.ruoyi.sip.mapper;
 
 import java.util.List;
+
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import com.ruoyi.sip.domain.ProductInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -63,4 +65,7 @@ public interface ProductInfoMapper
 
 
     List<ProductInfo> listByProductCodeList(@Param("list") List<String> productCodeList);
+
+    ProductInfo query(MaintenanceRecordsDto dto);
+
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java
index e2f71c43..1a22a75d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java
@@ -1,6 +1,8 @@
 package com.ruoyi.sip.service;
 
 import java.util.List;
+
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import com.ruoyi.sip.domain.OrderInfo;
 import com.ruoyi.sip.domain.OrderList;
 
@@ -59,4 +61,6 @@ public interface IOrderInfoService
      * @return 结果
      */
     public int deleteOrderInfoById(Long id);
+
+    List<OrderInfo> selectOrderInfoByMaintenance(MaintenanceRecordsDto dto);
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java
index 94647976..c117478a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java
@@ -1,6 +1,9 @@
 package com.ruoyi.sip.service;
 
 import java.util.List;
+
+import com.ruoyi.sip.controller.ProductInfoController;
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import com.ruoyi.sip.domain.ProductInfo;
 
 /**
@@ -58,4 +61,6 @@ public interface IProductInfoService
      * @return 结果
      */
     public int deleteProductInfoById(Long id);
+
+    ProductInfo query(MaintenanceRecordsDto dto);
 }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
index 1254649b..e2906ead 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
@@ -1,6 +1,9 @@
 package com.ruoyi.sip.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
@@ -129,6 +132,11 @@ public class OrderInfoServiceImpl implements IOrderInfoService
         return orderInfoMapper.deleteOrderInfoById(id);
     }
 
+    @Override
+    public List<OrderInfo> selectOrderInfoByMaintenance(MaintenanceRecordsDto dto) {
+        return orderInfoMapper.selectOrderInfoByMaintenance(dto);
+    }
+
     /**
      * 新增合同清单信息
      * 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java
index 1b666037..76b31c87 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.sip.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.sip.mapper.ProductInfoMapper;
@@ -91,4 +93,9 @@ public class ProductInfoServiceImpl implements IProductInfoService
     {
         return productInfoMapper.deleteProductInfoById(id);
     }
+
+    @Override
+    public ProductInfo query(MaintenanceRecordsDto dto) {
+        return productInfoMapper.query(dto);
+    }
 }
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
index 80859cfe..fbd0a049 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         select t1.id, t1.delivery_id,t1.product_code, t1.serial_number, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at,
                t2.delivery_code,
-               t3.product_code, t3.product_name,
+               t3.product_code, t3.product_name,t3.model,
                t4.order_code
         from delivery_list t1
         left join order_delivery t2 on t1.delivery_id = t2.id
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index 5bdf0416..bce1a3ce 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -134,6 +134,20 @@
         where order_id = (select order_id from order_delivery where id = #{deliveryId} and status=0)
           and status=0
     </select>
+    <select id="selectOrderInfoByMaintenance" resultType="com.ruoyi.sip.domain.OrderInfo">
+        <include refid="selectOrderInfoVo"/>
+        where status=0
+        <if test="serialNumber!=null and serialNumber!=''">
+            and id in (
+            select t2.order_id from delivery_list t1 left join order_delivery t2 on t1.delivery_id =t2.id where
+            t1.serial_number=#{serialNumber})
+        </if>
+        <if test="productCode!=null and productCode!=''">
+            and id in (
+            select t2.order_id from delivery_list t1 left join order_delivery t2 on t1.delivery_id =t2.id where
+            t1.product_code=#{productCode})
+        </if>
+    </select>
 
     <insert id="insertOrderInfo" parameterType="OrderInfo" useGeneratedKeys="true" keyProperty="id">
         insert into order_info
diff --git a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
index 30c85aab..9bb15e4c 100644
--- a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
@@ -42,6 +42,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item}
         </foreach>
     </select>
+    <select id="query" resultType="com.ruoyi.sip.domain.ProductInfo">
+        <include refid="selectProductInfoVo"/>
+        <where>
+            <if test="serialNumber!=null and serialNumber!=''">
+                and product_code in (select product_code from delivery_list where serial_number=#{serialNumber})
+            </if>
+            <if test="productCode!=null and productCode!=''">
+                and product_code=#{productCode}
+            </if>
+        </where>
+    </select>
 
 
     <insert id="insertProductInfo" parameterType="ProductInfo" useGeneratedKeys="true" keyProperty="id">