diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
new file mode 100644
index 0000000..ecb13ff
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -0,0 +1,209 @@
+package com.casic.missiles.dto.business.interchange;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务管理-设备交接单
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_interchange")
+public class BusinessInterchangeDetailResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 交接单编号
+     */
+    @ApiModelProperty(value = "交接单编号", dataType = "String")
+    @TableField("interchange_code")
+    private String interchangeCode;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书id", dataType = "String")
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderNo;
+
+    /**
+     * 证书单位名称
+     */
+    @ApiModelProperty(value = "证书单位名称", dataType = "String")
+    @TableField("certification_company")
+    private String certificationCompany;
+
+    /**
+     * 证书单位传真
+     */
+    @ApiModelProperty(value = "证书单位传真", dataType = "String")
+    @TableField("certification_company_fex")
+    private String certificationCompanyFex;
+
+    /**
+     * 证书单位邮编
+     */
+    @ApiModelProperty(value = "证书单位邮编", dataType = "String")
+    @TableField("certification_company_email")
+    private String certificationCompanyEmail;
+
+    /**
+     * 接收人
+     */
+    @ApiModelProperty(value = "接收人", dataType = "String")
+    @TableField("reciever")
+    private String reciever;
+
+    /**
+     * 接收人电话/手机
+     */
+    @ApiModelProperty(value = "接收人电话/手机", dataType = "String")
+    @TableField("reciever_phone")
+    private String recieverPhone;
+
+    /**
+     * 证书单位地址
+     */
+    @ApiModelProperty(value = "证书单位地址", dataType = "String")
+    @TableField("certification_company_address")
+    private String certificationCompanyAddress;
+
+    /**
+     * 委托方id（客户id）
+     */
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    @TableField("customer_id")
+    private Long customerId;
+
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    private String customerName;
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @ApiModelProperty(value = "委托日期", dataType = "String")
+    private String orderTime;
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty(value = "完成时间", dataType = "String")
+    @TableField("require_over_time")
+    private String requireOverTime;
+
+    /**
+     * 交接时间
+     */
+    @ApiModelProperty(value = "交接时间", dataType = "String")
+    @TableField("deliver_time")
+    private String deliverTime;
+
+    /**
+     * 检校类别（字典code）
+     */
+    @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
+    @TableField("measure_category")
+    private String measureCategory;
+
+    /**
+     * 保密要求（字典code）
+     */
+    @ApiModelProperty(value = "保密要求（字典code）", dataType = "String")
+    @TableField("secrecy")
+    private String secrecy;
+
+    /**
+     * 样品外观说明（手填）
+     */
+    @ApiModelProperty(value = "样品外观说明（手填）", dataType = "String")
+    @TableField("appearance")
+    private String appearance;
+
+    /**
+     * 依据文件说明（手填）
+     */
+    @ApiModelProperty(value = "依据文件说明（手填）", dataType = "String")
+    @TableField("rely_file")
+    private String relyFile;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer")
+    private String deliverer;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer_tel")
+    private String delivererTel;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人签名文件，minio存储文件名（为空时打印签字）", dataType = "String")
+    @TableField("deliverer_sign_file")
+    private String delivererSignFile;
+
+    /**
+     * 送检人签字时间
+     */
+    @ApiModelProperty(value = "送检人签字时间", dataType = "String")
+    @TableField("deliverer_sign_time")
+    private String delivererSignTime;
+
+    /**
+     * 接收人签名文件，minio存储文件名（系统签名模块获取）
+     */
+    @ApiModelProperty(value = "接收人签名文件，minio存储文件名（系统签名模块获取）", dataType = "String")
+    @TableField("reciever_sign_file")
+    private String recieverSignFile;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    @TableField("is_del")
+    private Integer isDel;
+
+    @TableField("create_user")
+    private Long createUser;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField(exist = false)
+    private List<CustomerSampleListVO>  customerSampleList;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
new file mode 100644
index 0000000..ecb13ff
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -0,0 +1,209 @@
+package com.casic.missiles.dto.business.interchange;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务管理-设备交接单
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_interchange")
+public class BusinessInterchangeDetailResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 交接单编号
+     */
+    @ApiModelProperty(value = "交接单编号", dataType = "String")
+    @TableField("interchange_code")
+    private String interchangeCode;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书id", dataType = "String")
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderNo;
+
+    /**
+     * 证书单位名称
+     */
+    @ApiModelProperty(value = "证书单位名称", dataType = "String")
+    @TableField("certification_company")
+    private String certificationCompany;
+
+    /**
+     * 证书单位传真
+     */
+    @ApiModelProperty(value = "证书单位传真", dataType = "String")
+    @TableField("certification_company_fex")
+    private String certificationCompanyFex;
+
+    /**
+     * 证书单位邮编
+     */
+    @ApiModelProperty(value = "证书单位邮编", dataType = "String")
+    @TableField("certification_company_email")
+    private String certificationCompanyEmail;
+
+    /**
+     * 接收人
+     */
+    @ApiModelProperty(value = "接收人", dataType = "String")
+    @TableField("reciever")
+    private String reciever;
+
+    /**
+     * 接收人电话/手机
+     */
+    @ApiModelProperty(value = "接收人电话/手机", dataType = "String")
+    @TableField("reciever_phone")
+    private String recieverPhone;
+
+    /**
+     * 证书单位地址
+     */
+    @ApiModelProperty(value = "证书单位地址", dataType = "String")
+    @TableField("certification_company_address")
+    private String certificationCompanyAddress;
+
+    /**
+     * 委托方id（客户id）
+     */
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    @TableField("customer_id")
+    private Long customerId;
+
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    private String customerName;
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @ApiModelProperty(value = "委托日期", dataType = "String")
+    private String orderTime;
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty(value = "完成时间", dataType = "String")
+    @TableField("require_over_time")
+    private String requireOverTime;
+
+    /**
+     * 交接时间
+     */
+    @ApiModelProperty(value = "交接时间", dataType = "String")
+    @TableField("deliver_time")
+    private String deliverTime;
+
+    /**
+     * 检校类别（字典code）
+     */
+    @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
+    @TableField("measure_category")
+    private String measureCategory;
+
+    /**
+     * 保密要求（字典code）
+     */
+    @ApiModelProperty(value = "保密要求（字典code）", dataType = "String")
+    @TableField("secrecy")
+    private String secrecy;
+
+    /**
+     * 样品外观说明（手填）
+     */
+    @ApiModelProperty(value = "样品外观说明（手填）", dataType = "String")
+    @TableField("appearance")
+    private String appearance;
+
+    /**
+     * 依据文件说明（手填）
+     */
+    @ApiModelProperty(value = "依据文件说明（手填）", dataType = "String")
+    @TableField("rely_file")
+    private String relyFile;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer")
+    private String deliverer;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer_tel")
+    private String delivererTel;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人签名文件，minio存储文件名（为空时打印签字）", dataType = "String")
+    @TableField("deliverer_sign_file")
+    private String delivererSignFile;
+
+    /**
+     * 送检人签字时间
+     */
+    @ApiModelProperty(value = "送检人签字时间", dataType = "String")
+    @TableField("deliverer_sign_time")
+    private String delivererSignTime;
+
+    /**
+     * 接收人签名文件，minio存储文件名（系统签名模块获取）
+     */
+    @ApiModelProperty(value = "接收人签名文件，minio存储文件名（系统签名模块获取）", dataType = "String")
+    @TableField("reciever_sign_file")
+    private String recieverSignFile;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    @TableField("is_del")
+    private Integer isDel;
+
+    @TableField("create_user")
+    private Long createUser;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField(exist = false)
+    private List<CustomerSampleListVO>  customerSampleList;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index 95bd754..a80b3eb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -38,6 +38,10 @@
     @ExcelProperty(value = "委托方名称",order = 2)
     private String customerName;
 
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
     @ApiModelProperty(value = "委托日期", dataType = "String")
     private String orderTime;
 
@@ -48,17 +52,21 @@
     @ExcelProperty(value = "送样人",order = 3)
     private String deliverer;
 
+    @ApiModelProperty(value = "送样人联系方式", dataType = "String")
+    @ExcelProperty(value = "送样人联系方式",order = 4)
+    private String delivererTel;
+
     @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String")
-    @ExcelProperty(value = "联系方式",order = 4)
+    @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
-    @ExcelProperty(value = "样品数量",order = 5)
+    @ExcelProperty(value = "样品数量",order = 6)
     private Integer sampleCount;
 
     @ApiModelProperty(value = "是否加急", dataType = "String")
-    @ExcelProperty(value = "是否加急",order = 6)
+    @ExcelProperty(value = "是否加急",order = 7)
     private String isUrgent;
 
     @ApiModelProperty(value = "接收状态", dataType = "String")
@@ -67,15 +75,15 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
-    @ExcelProperty(value = "接收状态名称",order = 7)
+    @ExcelProperty(value = "接收状态名称",order = 8)
     private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 8)
+    @ExcelProperty(value = "创建时间",order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 9)
+    @ExcelProperty(value = "备注",order = 10)
     private String remark;
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
new file mode 100644
index 0000000..ecb13ff
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -0,0 +1,209 @@
+package com.casic.missiles.dto.business.interchange;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务管理-设备交接单
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_interchange")
+public class BusinessInterchangeDetailResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 交接单编号
+     */
+    @ApiModelProperty(value = "交接单编号", dataType = "String")
+    @TableField("interchange_code")
+    private String interchangeCode;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书id", dataType = "String")
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderNo;
+
+    /**
+     * 证书单位名称
+     */
+    @ApiModelProperty(value = "证书单位名称", dataType = "String")
+    @TableField("certification_company")
+    private String certificationCompany;
+
+    /**
+     * 证书单位传真
+     */
+    @ApiModelProperty(value = "证书单位传真", dataType = "String")
+    @TableField("certification_company_fex")
+    private String certificationCompanyFex;
+
+    /**
+     * 证书单位邮编
+     */
+    @ApiModelProperty(value = "证书单位邮编", dataType = "String")
+    @TableField("certification_company_email")
+    private String certificationCompanyEmail;
+
+    /**
+     * 接收人
+     */
+    @ApiModelProperty(value = "接收人", dataType = "String")
+    @TableField("reciever")
+    private String reciever;
+
+    /**
+     * 接收人电话/手机
+     */
+    @ApiModelProperty(value = "接收人电话/手机", dataType = "String")
+    @TableField("reciever_phone")
+    private String recieverPhone;
+
+    /**
+     * 证书单位地址
+     */
+    @ApiModelProperty(value = "证书单位地址", dataType = "String")
+    @TableField("certification_company_address")
+    private String certificationCompanyAddress;
+
+    /**
+     * 委托方id（客户id）
+     */
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    @TableField("customer_id")
+    private Long customerId;
+
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    private String customerName;
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @ApiModelProperty(value = "委托日期", dataType = "String")
+    private String orderTime;
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty(value = "完成时间", dataType = "String")
+    @TableField("require_over_time")
+    private String requireOverTime;
+
+    /**
+     * 交接时间
+     */
+    @ApiModelProperty(value = "交接时间", dataType = "String")
+    @TableField("deliver_time")
+    private String deliverTime;
+
+    /**
+     * 检校类别（字典code）
+     */
+    @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
+    @TableField("measure_category")
+    private String measureCategory;
+
+    /**
+     * 保密要求（字典code）
+     */
+    @ApiModelProperty(value = "保密要求（字典code）", dataType = "String")
+    @TableField("secrecy")
+    private String secrecy;
+
+    /**
+     * 样品外观说明（手填）
+     */
+    @ApiModelProperty(value = "样品外观说明（手填）", dataType = "String")
+    @TableField("appearance")
+    private String appearance;
+
+    /**
+     * 依据文件说明（手填）
+     */
+    @ApiModelProperty(value = "依据文件说明（手填）", dataType = "String")
+    @TableField("rely_file")
+    private String relyFile;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer")
+    private String deliverer;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer_tel")
+    private String delivererTel;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人签名文件，minio存储文件名（为空时打印签字）", dataType = "String")
+    @TableField("deliverer_sign_file")
+    private String delivererSignFile;
+
+    /**
+     * 送检人签字时间
+     */
+    @ApiModelProperty(value = "送检人签字时间", dataType = "String")
+    @TableField("deliverer_sign_time")
+    private String delivererSignTime;
+
+    /**
+     * 接收人签名文件，minio存储文件名（系统签名模块获取）
+     */
+    @ApiModelProperty(value = "接收人签名文件，minio存储文件名（系统签名模块获取）", dataType = "String")
+    @TableField("reciever_sign_file")
+    private String recieverSignFile;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    @TableField("is_del")
+    private Integer isDel;
+
+    @TableField("create_user")
+    private Long createUser;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField(exist = false)
+    private List<CustomerSampleListVO>  customerSampleList;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index 95bd754..a80b3eb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -38,6 +38,10 @@
     @ExcelProperty(value = "委托方名称",order = 2)
     private String customerName;
 
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
     @ApiModelProperty(value = "委托日期", dataType = "String")
     private String orderTime;
 
@@ -48,17 +52,21 @@
     @ExcelProperty(value = "送样人",order = 3)
     private String deliverer;
 
+    @ApiModelProperty(value = "送样人联系方式", dataType = "String")
+    @ExcelProperty(value = "送样人联系方式",order = 4)
+    private String delivererTel;
+
     @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String")
-    @ExcelProperty(value = "联系方式",order = 4)
+    @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
-    @ExcelProperty(value = "样品数量",order = 5)
+    @ExcelProperty(value = "样品数量",order = 6)
     private Integer sampleCount;
 
     @ApiModelProperty(value = "是否加急", dataType = "String")
-    @ExcelProperty(value = "是否加急",order = 6)
+    @ExcelProperty(value = "是否加急",order = 7)
     private String isUrgent;
 
     @ApiModelProperty(value = "接收状态", dataType = "String")
@@ -67,15 +75,15 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
-    @ExcelProperty(value = "接收状态名称",order = 7)
+    @ExcelProperty(value = "接收状态名称",order = 8)
     private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 8)
+    @ExcelProperty(value = "创建时间",order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 9)
+    @ExcelProperty(value = "备注",order = 10)
     private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
index 66625f4..099ad47 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
@@ -10,10 +10,13 @@
 @Data
 @ApiModel("设备交接单样品接收列表")
 public class CustomerSampleListVO {
+    private  Long id;
     @ApiModelProperty(value = "委托书id", dataType = "String")
     private Long orderId;
     @ApiModelProperty(value = "样品id", dataType = "String")
-    private Long smapleId;
+    private Long sampleId;
+    @ApiModelProperty(value = "样品编号", dataType = "String")
+    private String sampleNo;
     @ApiModelProperty(value = "样品名称", dataType = "String")
     private String sampleName;
     @ApiModelProperty(value = "样品型号", dataType = "String")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
new file mode 100644
index 0000000..ecb13ff
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -0,0 +1,209 @@
+package com.casic.missiles.dto.business.interchange;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务管理-设备交接单
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_interchange")
+public class BusinessInterchangeDetailResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 交接单编号
+     */
+    @ApiModelProperty(value = "交接单编号", dataType = "String")
+    @TableField("interchange_code")
+    private String interchangeCode;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书id", dataType = "String")
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderNo;
+
+    /**
+     * 证书单位名称
+     */
+    @ApiModelProperty(value = "证书单位名称", dataType = "String")
+    @TableField("certification_company")
+    private String certificationCompany;
+
+    /**
+     * 证书单位传真
+     */
+    @ApiModelProperty(value = "证书单位传真", dataType = "String")
+    @TableField("certification_company_fex")
+    private String certificationCompanyFex;
+
+    /**
+     * 证书单位邮编
+     */
+    @ApiModelProperty(value = "证书单位邮编", dataType = "String")
+    @TableField("certification_company_email")
+    private String certificationCompanyEmail;
+
+    /**
+     * 接收人
+     */
+    @ApiModelProperty(value = "接收人", dataType = "String")
+    @TableField("reciever")
+    private String reciever;
+
+    /**
+     * 接收人电话/手机
+     */
+    @ApiModelProperty(value = "接收人电话/手机", dataType = "String")
+    @TableField("reciever_phone")
+    private String recieverPhone;
+
+    /**
+     * 证书单位地址
+     */
+    @ApiModelProperty(value = "证书单位地址", dataType = "String")
+    @TableField("certification_company_address")
+    private String certificationCompanyAddress;
+
+    /**
+     * 委托方id（客户id）
+     */
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    @TableField("customer_id")
+    private Long customerId;
+
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    private String customerName;
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @ApiModelProperty(value = "委托日期", dataType = "String")
+    private String orderTime;
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty(value = "完成时间", dataType = "String")
+    @TableField("require_over_time")
+    private String requireOverTime;
+
+    /**
+     * 交接时间
+     */
+    @ApiModelProperty(value = "交接时间", dataType = "String")
+    @TableField("deliver_time")
+    private String deliverTime;
+
+    /**
+     * 检校类别（字典code）
+     */
+    @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
+    @TableField("measure_category")
+    private String measureCategory;
+
+    /**
+     * 保密要求（字典code）
+     */
+    @ApiModelProperty(value = "保密要求（字典code）", dataType = "String")
+    @TableField("secrecy")
+    private String secrecy;
+
+    /**
+     * 样品外观说明（手填）
+     */
+    @ApiModelProperty(value = "样品外观说明（手填）", dataType = "String")
+    @TableField("appearance")
+    private String appearance;
+
+    /**
+     * 依据文件说明（手填）
+     */
+    @ApiModelProperty(value = "依据文件说明（手填）", dataType = "String")
+    @TableField("rely_file")
+    private String relyFile;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer")
+    private String deliverer;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer_tel")
+    private String delivererTel;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人签名文件，minio存储文件名（为空时打印签字）", dataType = "String")
+    @TableField("deliverer_sign_file")
+    private String delivererSignFile;
+
+    /**
+     * 送检人签字时间
+     */
+    @ApiModelProperty(value = "送检人签字时间", dataType = "String")
+    @TableField("deliverer_sign_time")
+    private String delivererSignTime;
+
+    /**
+     * 接收人签名文件，minio存储文件名（系统签名模块获取）
+     */
+    @ApiModelProperty(value = "接收人签名文件，minio存储文件名（系统签名模块获取）", dataType = "String")
+    @TableField("reciever_sign_file")
+    private String recieverSignFile;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    @TableField("is_del")
+    private Integer isDel;
+
+    @TableField("create_user")
+    private Long createUser;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField(exist = false)
+    private List<CustomerSampleListVO>  customerSampleList;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index 95bd754..a80b3eb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -38,6 +38,10 @@
     @ExcelProperty(value = "委托方名称",order = 2)
     private String customerName;
 
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
     @ApiModelProperty(value = "委托日期", dataType = "String")
     private String orderTime;
 
@@ -48,17 +52,21 @@
     @ExcelProperty(value = "送样人",order = 3)
     private String deliverer;
 
+    @ApiModelProperty(value = "送样人联系方式", dataType = "String")
+    @ExcelProperty(value = "送样人联系方式",order = 4)
+    private String delivererTel;
+
     @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String")
-    @ExcelProperty(value = "联系方式",order = 4)
+    @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
-    @ExcelProperty(value = "样品数量",order = 5)
+    @ExcelProperty(value = "样品数量",order = 6)
     private Integer sampleCount;
 
     @ApiModelProperty(value = "是否加急", dataType = "String")
-    @ExcelProperty(value = "是否加急",order = 6)
+    @ExcelProperty(value = "是否加急",order = 7)
     private String isUrgent;
 
     @ApiModelProperty(value = "接收状态", dataType = "String")
@@ -67,15 +75,15 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
-    @ExcelProperty(value = "接收状态名称",order = 7)
+    @ExcelProperty(value = "接收状态名称",order = 8)
     private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 8)
+    @ExcelProperty(value = "创建时间",order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 9)
+    @ExcelProperty(value = "备注",order = 10)
     private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
index 66625f4..099ad47 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
@@ -10,10 +10,13 @@
 @Data
 @ApiModel("设备交接单样品接收列表")
 public class CustomerSampleListVO {
+    private  Long id;
     @ApiModelProperty(value = "委托书id", dataType = "String")
     private Long orderId;
     @ApiModelProperty(value = "样品id", dataType = "String")
-    private Long smapleId;
+    private Long sampleId;
+    @ApiModelProperty(value = "样品编号", dataType = "String")
+    private String sampleNo;
     @ApiModelProperty(value = "样品名称", dataType = "String")
     private String sampleName;
     @ApiModelProperty(value = "样品型号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
index ee59ea4..5663ba0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
@@ -110,8 +110,8 @@
      * 检校类别（字典code）
      */
     @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
-    @TableField("mesure_category")
-    private String mesureCategory;
+    @TableField("measure_category")
+    private String measureCategory;
 
     /**
      * 保密要求（字典code）
@@ -177,7 +177,7 @@
     private String remark;
 
     @TableField("is_del")
-    private Boolean isDel;
+    private Integer isDel;
 
     @TableField("create_user")
     private Long createUser;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
new file mode 100644
index 0000000..ecb13ff
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -0,0 +1,209 @@
+package com.casic.missiles.dto.business.interchange;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务管理-设备交接单
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_interchange")
+public class BusinessInterchangeDetailResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 交接单编号
+     */
+    @ApiModelProperty(value = "交接单编号", dataType = "String")
+    @TableField("interchange_code")
+    private String interchangeCode;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书id", dataType = "String")
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderNo;
+
+    /**
+     * 证书单位名称
+     */
+    @ApiModelProperty(value = "证书单位名称", dataType = "String")
+    @TableField("certification_company")
+    private String certificationCompany;
+
+    /**
+     * 证书单位传真
+     */
+    @ApiModelProperty(value = "证书单位传真", dataType = "String")
+    @TableField("certification_company_fex")
+    private String certificationCompanyFex;
+
+    /**
+     * 证书单位邮编
+     */
+    @ApiModelProperty(value = "证书单位邮编", dataType = "String")
+    @TableField("certification_company_email")
+    private String certificationCompanyEmail;
+
+    /**
+     * 接收人
+     */
+    @ApiModelProperty(value = "接收人", dataType = "String")
+    @TableField("reciever")
+    private String reciever;
+
+    /**
+     * 接收人电话/手机
+     */
+    @ApiModelProperty(value = "接收人电话/手机", dataType = "String")
+    @TableField("reciever_phone")
+    private String recieverPhone;
+
+    /**
+     * 证书单位地址
+     */
+    @ApiModelProperty(value = "证书单位地址", dataType = "String")
+    @TableField("certification_company_address")
+    private String certificationCompanyAddress;
+
+    /**
+     * 委托方id（客户id）
+     */
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    @TableField("customer_id")
+    private Long customerId;
+
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    private String customerName;
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @ApiModelProperty(value = "委托日期", dataType = "String")
+    private String orderTime;
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty(value = "完成时间", dataType = "String")
+    @TableField("require_over_time")
+    private String requireOverTime;
+
+    /**
+     * 交接时间
+     */
+    @ApiModelProperty(value = "交接时间", dataType = "String")
+    @TableField("deliver_time")
+    private String deliverTime;
+
+    /**
+     * 检校类别（字典code）
+     */
+    @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
+    @TableField("measure_category")
+    private String measureCategory;
+
+    /**
+     * 保密要求（字典code）
+     */
+    @ApiModelProperty(value = "保密要求（字典code）", dataType = "String")
+    @TableField("secrecy")
+    private String secrecy;
+
+    /**
+     * 样品外观说明（手填）
+     */
+    @ApiModelProperty(value = "样品外观说明（手填）", dataType = "String")
+    @TableField("appearance")
+    private String appearance;
+
+    /**
+     * 依据文件说明（手填）
+     */
+    @ApiModelProperty(value = "依据文件说明（手填）", dataType = "String")
+    @TableField("rely_file")
+    private String relyFile;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer")
+    private String deliverer;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer_tel")
+    private String delivererTel;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人签名文件，minio存储文件名（为空时打印签字）", dataType = "String")
+    @TableField("deliverer_sign_file")
+    private String delivererSignFile;
+
+    /**
+     * 送检人签字时间
+     */
+    @ApiModelProperty(value = "送检人签字时间", dataType = "String")
+    @TableField("deliverer_sign_time")
+    private String delivererSignTime;
+
+    /**
+     * 接收人签名文件，minio存储文件名（系统签名模块获取）
+     */
+    @ApiModelProperty(value = "接收人签名文件，minio存储文件名（系统签名模块获取）", dataType = "String")
+    @TableField("reciever_sign_file")
+    private String recieverSignFile;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    @TableField("is_del")
+    private Integer isDel;
+
+    @TableField("create_user")
+    private Long createUser;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField(exist = false)
+    private List<CustomerSampleListVO>  customerSampleList;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index 95bd754..a80b3eb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -38,6 +38,10 @@
     @ExcelProperty(value = "委托方名称",order = 2)
     private String customerName;
 
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
     @ApiModelProperty(value = "委托日期", dataType = "String")
     private String orderTime;
 
@@ -48,17 +52,21 @@
     @ExcelProperty(value = "送样人",order = 3)
     private String deliverer;
 
+    @ApiModelProperty(value = "送样人联系方式", dataType = "String")
+    @ExcelProperty(value = "送样人联系方式",order = 4)
+    private String delivererTel;
+
     @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String")
-    @ExcelProperty(value = "联系方式",order = 4)
+    @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
-    @ExcelProperty(value = "样品数量",order = 5)
+    @ExcelProperty(value = "样品数量",order = 6)
     private Integer sampleCount;
 
     @ApiModelProperty(value = "是否加急", dataType = "String")
-    @ExcelProperty(value = "是否加急",order = 6)
+    @ExcelProperty(value = "是否加急",order = 7)
     private String isUrgent;
 
     @ApiModelProperty(value = "接收状态", dataType = "String")
@@ -67,15 +75,15 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
-    @ExcelProperty(value = "接收状态名称",order = 7)
+    @ExcelProperty(value = "接收状态名称",order = 8)
     private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 8)
+    @ExcelProperty(value = "创建时间",order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 9)
+    @ExcelProperty(value = "备注",order = 10)
     private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
index 66625f4..099ad47 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
@@ -10,10 +10,13 @@
 @Data
 @ApiModel("设备交接单样品接收列表")
 public class CustomerSampleListVO {
+    private  Long id;
     @ApiModelProperty(value = "委托书id", dataType = "String")
     private Long orderId;
     @ApiModelProperty(value = "样品id", dataType = "String")
-    private Long smapleId;
+    private Long sampleId;
+    @ApiModelProperty(value = "样品编号", dataType = "String")
+    private String sampleNo;
     @ApiModelProperty(value = "样品名称", dataType = "String")
     private String sampleName;
     @ApiModelProperty(value = "样品型号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
index ee59ea4..5663ba0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
@@ -110,8 +110,8 @@
      * 检校类别（字典code）
      */
     @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
-    @TableField("mesure_category")
-    private String mesureCategory;
+    @TableField("measure_category")
+    private String measureCategory;
 
     /**
      * 保密要求（字典code）
@@ -177,7 +177,7 @@
     private String remark;
 
     @TableField("is_del")
-    private Boolean isDel;
+    private Integer isDel;
 
     @TableField("create_user")
     private Long createUser;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index a90ac40..a0cceda 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -66,6 +66,9 @@
             Assert.isFalse(Objects.isNull(user), () -> {
                 throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
             });
+            if (CollectionUtils.isEmpty(request.getIds())) {
+                request.setIds(null);
+            }
             page.setCurrent(1);
             page.setSearchCount(false);
             page.setSize(Integer.MAX_VALUE);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
new file mode 100644
index 0000000..ecb13ff
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -0,0 +1,209 @@
+package com.casic.missiles.dto.business.interchange;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务管理-设备交接单
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_interchange")
+public class BusinessInterchangeDetailResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 交接单编号
+     */
+    @ApiModelProperty(value = "交接单编号", dataType = "String")
+    @TableField("interchange_code")
+    private String interchangeCode;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书id", dataType = "String")
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderNo;
+
+    /**
+     * 证书单位名称
+     */
+    @ApiModelProperty(value = "证书单位名称", dataType = "String")
+    @TableField("certification_company")
+    private String certificationCompany;
+
+    /**
+     * 证书单位传真
+     */
+    @ApiModelProperty(value = "证书单位传真", dataType = "String")
+    @TableField("certification_company_fex")
+    private String certificationCompanyFex;
+
+    /**
+     * 证书单位邮编
+     */
+    @ApiModelProperty(value = "证书单位邮编", dataType = "String")
+    @TableField("certification_company_email")
+    private String certificationCompanyEmail;
+
+    /**
+     * 接收人
+     */
+    @ApiModelProperty(value = "接收人", dataType = "String")
+    @TableField("reciever")
+    private String reciever;
+
+    /**
+     * 接收人电话/手机
+     */
+    @ApiModelProperty(value = "接收人电话/手机", dataType = "String")
+    @TableField("reciever_phone")
+    private String recieverPhone;
+
+    /**
+     * 证书单位地址
+     */
+    @ApiModelProperty(value = "证书单位地址", dataType = "String")
+    @TableField("certification_company_address")
+    private String certificationCompanyAddress;
+
+    /**
+     * 委托方id（客户id）
+     */
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    @TableField("customer_id")
+    private Long customerId;
+
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    private String customerName;
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @ApiModelProperty(value = "委托日期", dataType = "String")
+    private String orderTime;
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty(value = "完成时间", dataType = "String")
+    @TableField("require_over_time")
+    private String requireOverTime;
+
+    /**
+     * 交接时间
+     */
+    @ApiModelProperty(value = "交接时间", dataType = "String")
+    @TableField("deliver_time")
+    private String deliverTime;
+
+    /**
+     * 检校类别（字典code）
+     */
+    @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
+    @TableField("measure_category")
+    private String measureCategory;
+
+    /**
+     * 保密要求（字典code）
+     */
+    @ApiModelProperty(value = "保密要求（字典code）", dataType = "String")
+    @TableField("secrecy")
+    private String secrecy;
+
+    /**
+     * 样品外观说明（手填）
+     */
+    @ApiModelProperty(value = "样品外观说明（手填）", dataType = "String")
+    @TableField("appearance")
+    private String appearance;
+
+    /**
+     * 依据文件说明（手填）
+     */
+    @ApiModelProperty(value = "依据文件说明（手填）", dataType = "String")
+    @TableField("rely_file")
+    private String relyFile;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer")
+    private String deliverer;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer_tel")
+    private String delivererTel;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人签名文件，minio存储文件名（为空时打印签字）", dataType = "String")
+    @TableField("deliverer_sign_file")
+    private String delivererSignFile;
+
+    /**
+     * 送检人签字时间
+     */
+    @ApiModelProperty(value = "送检人签字时间", dataType = "String")
+    @TableField("deliverer_sign_time")
+    private String delivererSignTime;
+
+    /**
+     * 接收人签名文件，minio存储文件名（系统签名模块获取）
+     */
+    @ApiModelProperty(value = "接收人签名文件，minio存储文件名（系统签名模块获取）", dataType = "String")
+    @TableField("reciever_sign_file")
+    private String recieverSignFile;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    @TableField("is_del")
+    private Integer isDel;
+
+    @TableField("create_user")
+    private Long createUser;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField(exist = false)
+    private List<CustomerSampleListVO>  customerSampleList;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index 95bd754..a80b3eb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -38,6 +38,10 @@
     @ExcelProperty(value = "委托方名称",order = 2)
     private String customerName;
 
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
     @ApiModelProperty(value = "委托日期", dataType = "String")
     private String orderTime;
 
@@ -48,17 +52,21 @@
     @ExcelProperty(value = "送样人",order = 3)
     private String deliverer;
 
+    @ApiModelProperty(value = "送样人联系方式", dataType = "String")
+    @ExcelProperty(value = "送样人联系方式",order = 4)
+    private String delivererTel;
+
     @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String")
-    @ExcelProperty(value = "联系方式",order = 4)
+    @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
-    @ExcelProperty(value = "样品数量",order = 5)
+    @ExcelProperty(value = "样品数量",order = 6)
     private Integer sampleCount;
 
     @ApiModelProperty(value = "是否加急", dataType = "String")
-    @ExcelProperty(value = "是否加急",order = 6)
+    @ExcelProperty(value = "是否加急",order = 7)
     private String isUrgent;
 
     @ApiModelProperty(value = "接收状态", dataType = "String")
@@ -67,15 +75,15 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
-    @ExcelProperty(value = "接收状态名称",order = 7)
+    @ExcelProperty(value = "接收状态名称",order = 8)
     private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 8)
+    @ExcelProperty(value = "创建时间",order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 9)
+    @ExcelProperty(value = "备注",order = 10)
     private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
index 66625f4..099ad47 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
@@ -10,10 +10,13 @@
 @Data
 @ApiModel("设备交接单样品接收列表")
 public class CustomerSampleListVO {
+    private  Long id;
     @ApiModelProperty(value = "委托书id", dataType = "String")
     private Long orderId;
     @ApiModelProperty(value = "样品id", dataType = "String")
-    private Long smapleId;
+    private Long sampleId;
+    @ApiModelProperty(value = "样品编号", dataType = "String")
+    private String sampleNo;
     @ApiModelProperty(value = "样品名称", dataType = "String")
     private String sampleName;
     @ApiModelProperty(value = "样品型号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
index ee59ea4..5663ba0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
@@ -110,8 +110,8 @@
      * 检校类别（字典code）
      */
     @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
-    @TableField("mesure_category")
-    private String mesureCategory;
+    @TableField("measure_category")
+    private String measureCategory;
 
     /**
      * 保密要求（字典code）
@@ -177,7 +177,7 @@
     private String remark;
 
     @TableField("is_del")
-    private Boolean isDel;
+    private Integer isDel;
 
     @TableField("create_user")
     private Long createUser;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index a90ac40..a0cceda 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -66,6 +66,9 @@
             Assert.isFalse(Objects.isNull(user), () -> {
                 throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
             });
+            if (CollectionUtils.isEmpty(request.getIds())) {
+                request.setIds(null);
+            }
             page.setCurrent(1);
             page.setSearchCount(false);
             page.setSize(Integer.MAX_VALUE);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index 5e0a1f5..b397f83 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -10,10 +10,7 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
@@ -57,8 +54,8 @@
     }
 
     @Override
-    public BusinessInterchange exchangeDetail(Long id) {
-        BusinessInterchange businessExchange = this.baseMapper.selectById(id);
+    public BusinessInterchangeDetailResponse exchangeDetail(Long id) { ;
+        BusinessInterchangeDetailResponse businessExchange = this.baseMapper.getInfoById(id);
         QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("order_id", businessExchange.getOrderId());
         List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(queryWrapper);
@@ -116,6 +113,8 @@
             List<InterchangeListResponse> resultList;
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 initFlushEmpty(request);
+            } else {
+                request.setIds(null);
             }
             Page<InterchangeListResponse> page = PageFactory.defaultPage();
             page.setCurrent(1);
@@ -129,9 +128,9 @@
     }
 
     @Override
-    public  Page<InterchangeSampleListResponse> exchangeSampleList(Page<InterchangeSampleListResponse> page, InterchangeSampleListRequest request) throws Exception{
+    public Page<InterchangeSampleListResponse> exchangeSampleList(Page<InterchangeSampleListResponse> page, InterchangeSampleListRequest request) throws Exception {
         page.setRecords(this.baseMapper.exchangeSampleList(page, request));
-        for(InterchangeSampleListResponse sampleListResponse:page.getRecords()){
+        for (InterchangeSampleListResponse sampleListResponse : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(sampleListResponse);
         }
         return page;
@@ -167,7 +166,7 @@
     private Integer sampleStatusUpdator(CustomerSampleListVO sampleInfo, Long interChangeId) {
         QueryWrapper<BusinessOrderSampleRelation> orderSampleWrapper = new QueryWrapper<>();
         orderSampleWrapper.eq("order_id", sampleInfo.getOrderId());
-        orderSampleWrapper.eq("sample_id", sampleInfo.getSmapleId());
+        orderSampleWrapper.eq("sample_id", sampleInfo.getSampleId());
         BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation();
         businessOrderSampleRelation.setInterchangeId(interChangeId);
         return sampleRelationMapper.update(businessOrderSampleRelation, orderSampleWrapper);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
new file mode 100644
index 0000000..ecb13ff
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -0,0 +1,209 @@
+package com.casic.missiles.dto.business.interchange;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务管理-设备交接单
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_interchange")
+public class BusinessInterchangeDetailResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 交接单编号
+     */
+    @ApiModelProperty(value = "交接单编号", dataType = "String")
+    @TableField("interchange_code")
+    private String interchangeCode;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书id", dataType = "String")
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderNo;
+
+    /**
+     * 证书单位名称
+     */
+    @ApiModelProperty(value = "证书单位名称", dataType = "String")
+    @TableField("certification_company")
+    private String certificationCompany;
+
+    /**
+     * 证书单位传真
+     */
+    @ApiModelProperty(value = "证书单位传真", dataType = "String")
+    @TableField("certification_company_fex")
+    private String certificationCompanyFex;
+
+    /**
+     * 证书单位邮编
+     */
+    @ApiModelProperty(value = "证书单位邮编", dataType = "String")
+    @TableField("certification_company_email")
+    private String certificationCompanyEmail;
+
+    /**
+     * 接收人
+     */
+    @ApiModelProperty(value = "接收人", dataType = "String")
+    @TableField("reciever")
+    private String reciever;
+
+    /**
+     * 接收人电话/手机
+     */
+    @ApiModelProperty(value = "接收人电话/手机", dataType = "String")
+    @TableField("reciever_phone")
+    private String recieverPhone;
+
+    /**
+     * 证书单位地址
+     */
+    @ApiModelProperty(value = "证书单位地址", dataType = "String")
+    @TableField("certification_company_address")
+    private String certificationCompanyAddress;
+
+    /**
+     * 委托方id（客户id）
+     */
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    @TableField("customer_id")
+    private Long customerId;
+
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    private String customerName;
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @ApiModelProperty(value = "委托日期", dataType = "String")
+    private String orderTime;
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty(value = "完成时间", dataType = "String")
+    @TableField("require_over_time")
+    private String requireOverTime;
+
+    /**
+     * 交接时间
+     */
+    @ApiModelProperty(value = "交接时间", dataType = "String")
+    @TableField("deliver_time")
+    private String deliverTime;
+
+    /**
+     * 检校类别（字典code）
+     */
+    @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
+    @TableField("measure_category")
+    private String measureCategory;
+
+    /**
+     * 保密要求（字典code）
+     */
+    @ApiModelProperty(value = "保密要求（字典code）", dataType = "String")
+    @TableField("secrecy")
+    private String secrecy;
+
+    /**
+     * 样品外观说明（手填）
+     */
+    @ApiModelProperty(value = "样品外观说明（手填）", dataType = "String")
+    @TableField("appearance")
+    private String appearance;
+
+    /**
+     * 依据文件说明（手填）
+     */
+    @ApiModelProperty(value = "依据文件说明（手填）", dataType = "String")
+    @TableField("rely_file")
+    private String relyFile;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer")
+    private String deliverer;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer_tel")
+    private String delivererTel;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人签名文件，minio存储文件名（为空时打印签字）", dataType = "String")
+    @TableField("deliverer_sign_file")
+    private String delivererSignFile;
+
+    /**
+     * 送检人签字时间
+     */
+    @ApiModelProperty(value = "送检人签字时间", dataType = "String")
+    @TableField("deliverer_sign_time")
+    private String delivererSignTime;
+
+    /**
+     * 接收人签名文件，minio存储文件名（系统签名模块获取）
+     */
+    @ApiModelProperty(value = "接收人签名文件，minio存储文件名（系统签名模块获取）", dataType = "String")
+    @TableField("reciever_sign_file")
+    private String recieverSignFile;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    @TableField("is_del")
+    private Integer isDel;
+
+    @TableField("create_user")
+    private Long createUser;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField(exist = false)
+    private List<CustomerSampleListVO>  customerSampleList;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index 95bd754..a80b3eb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -38,6 +38,10 @@
     @ExcelProperty(value = "委托方名称",order = 2)
     private String customerName;
 
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
     @ApiModelProperty(value = "委托日期", dataType = "String")
     private String orderTime;
 
@@ -48,17 +52,21 @@
     @ExcelProperty(value = "送样人",order = 3)
     private String deliverer;
 
+    @ApiModelProperty(value = "送样人联系方式", dataType = "String")
+    @ExcelProperty(value = "送样人联系方式",order = 4)
+    private String delivererTel;
+
     @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String")
-    @ExcelProperty(value = "联系方式",order = 4)
+    @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
-    @ExcelProperty(value = "样品数量",order = 5)
+    @ExcelProperty(value = "样品数量",order = 6)
     private Integer sampleCount;
 
     @ApiModelProperty(value = "是否加急", dataType = "String")
-    @ExcelProperty(value = "是否加急",order = 6)
+    @ExcelProperty(value = "是否加急",order = 7)
     private String isUrgent;
 
     @ApiModelProperty(value = "接收状态", dataType = "String")
@@ -67,15 +75,15 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
-    @ExcelProperty(value = "接收状态名称",order = 7)
+    @ExcelProperty(value = "接收状态名称",order = 8)
     private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 8)
+    @ExcelProperty(value = "创建时间",order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 9)
+    @ExcelProperty(value = "备注",order = 10)
     private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
index 66625f4..099ad47 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
@@ -10,10 +10,13 @@
 @Data
 @ApiModel("设备交接单样品接收列表")
 public class CustomerSampleListVO {
+    private  Long id;
     @ApiModelProperty(value = "委托书id", dataType = "String")
     private Long orderId;
     @ApiModelProperty(value = "样品id", dataType = "String")
-    private Long smapleId;
+    private Long sampleId;
+    @ApiModelProperty(value = "样品编号", dataType = "String")
+    private String sampleNo;
     @ApiModelProperty(value = "样品名称", dataType = "String")
     private String sampleName;
     @ApiModelProperty(value = "样品型号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
index ee59ea4..5663ba0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
@@ -110,8 +110,8 @@
      * 检校类别（字典code）
      */
     @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
-    @TableField("mesure_category")
-    private String mesureCategory;
+    @TableField("measure_category")
+    private String measureCategory;
 
     /**
      * 保密要求（字典code）
@@ -177,7 +177,7 @@
     private String remark;
 
     @TableField("is_del")
-    private Boolean isDel;
+    private Integer isDel;
 
     @TableField("create_user")
     private Long createUser;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index a90ac40..a0cceda 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -66,6 +66,9 @@
             Assert.isFalse(Objects.isNull(user), () -> {
                 throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
             });
+            if (CollectionUtils.isEmpty(request.getIds())) {
+                request.setIds(null);
+            }
             page.setCurrent(1);
             page.setSearchCount(false);
             page.setSize(Integer.MAX_VALUE);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index 5e0a1f5..b397f83 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -10,10 +10,7 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
@@ -57,8 +54,8 @@
     }
 
     @Override
-    public BusinessInterchange exchangeDetail(Long id) {
-        BusinessInterchange businessExchange = this.baseMapper.selectById(id);
+    public BusinessInterchangeDetailResponse exchangeDetail(Long id) { ;
+        BusinessInterchangeDetailResponse businessExchange = this.baseMapper.getInfoById(id);
         QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("order_id", businessExchange.getOrderId());
         List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(queryWrapper);
@@ -116,6 +113,8 @@
             List<InterchangeListResponse> resultList;
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 initFlushEmpty(request);
+            } else {
+                request.setIds(null);
             }
             Page<InterchangeListResponse> page = PageFactory.defaultPage();
             page.setCurrent(1);
@@ -129,9 +128,9 @@
     }
 
     @Override
-    public  Page<InterchangeSampleListResponse> exchangeSampleList(Page<InterchangeSampleListResponse> page, InterchangeSampleListRequest request) throws Exception{
+    public Page<InterchangeSampleListResponse> exchangeSampleList(Page<InterchangeSampleListResponse> page, InterchangeSampleListRequest request) throws Exception {
         page.setRecords(this.baseMapper.exchangeSampleList(page, request));
-        for(InterchangeSampleListResponse sampleListResponse:page.getRecords()){
+        for (InterchangeSampleListResponse sampleListResponse : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(sampleListResponse);
         }
         return page;
@@ -167,7 +166,7 @@
     private Integer sampleStatusUpdator(CustomerSampleListVO sampleInfo, Long interChangeId) {
         QueryWrapper<BusinessOrderSampleRelation> orderSampleWrapper = new QueryWrapper<>();
         orderSampleWrapper.eq("order_id", sampleInfo.getOrderId());
-        orderSampleWrapper.eq("sample_id", sampleInfo.getSmapleId());
+        orderSampleWrapper.eq("sample_id", sampleInfo.getSampleId());
         BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation();
         businessOrderSampleRelation.setInterchangeId(interChangeId);
         return sampleRelationMapper.update(businessOrderSampleRelation, orderSampleWrapper);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index e8ae76b..e922dc2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -134,7 +134,9 @@
 
             Page<DeviceDispatchVO> deviceDispatchVOPage = PageFactory.defaultPage();
             if (!CollectionUtils.isEmpty(request.getIds())) {
-               initDeviceDispatchDTOEmpty(request);
+                initDeviceDispatchDTOEmpty(request);
+            } else {
+                request.setIds(null);
             }
             Page<DeviceDispatchVO> page = PageFactory.defaultPage();
             page.setCurrent(1);
@@ -148,7 +150,6 @@
     }
 
 
-
     @Override
     public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) {
         Integer updateFalg = this.statusChangeUpdator(deviceStatusChangeDTO, false);
@@ -237,7 +238,7 @@
         }
     }
 
-    private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request){
+    private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) {
         request.setSampleName(null);
         request.setSampleNo(null);
         request.setOrderNo(null);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index 78af9c4..a846ff2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -8,10 +8,7 @@
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -59,7 +56,7 @@
 
     @ApiOperation("设备交接单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessOrder> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessInterchangeDetailResponse> exchangeDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
index bcbb996..ee36461 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java
@@ -2,10 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -26,6 +23,8 @@
 
     List<InterchangeSampleListResponse> exchangeSampleList(@Param("page") Page<InterchangeSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
+    BusinessInterchangeDetailResponse getInfoById(@Param("id")Long id);
+
     Long selectMaxExchangeNo();
 
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 2342e79..a496210 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -57,7 +57,7 @@
         <if test="request.endTime != null and request.endTime !=''">
             AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
         </if>
-        <if test="request.ids != null">
+        <if test="request.ids != null ">
             and id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
@@ -117,4 +117,42 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getInfoById" resultType="com.casic.missiles.dto.business.interchange.BusinessInterchangeDetailResponse">
+    SELECT
+        bi.id,
+        interchange_code AS "interchangeCode",
+        bo.id AS "orderId",
+        order_code AS "orderNo",
+        certification_company AS "certificationCompany",
+        certification_company_fex AS "certificationCompanyFex",
+        certification_company_email AS "certificationCompanyEmail",
+        reciever,
+        reciever_phone AS "recieverPhone",
+        certification_company_address AS "certificationCompanyAddress",
+        bo.customer_id AS "customerId",
+        customer_no AS "customerNo",
+        customer_name AS "customerName",
+        customer_address AS "customerAddress",
+        order_time AS "orderTime",
+        bo.require_over_time AS "requireOverTime",
+        bo.deliver_time AS "deliverTime",
+        measure_category AS "measureCategory",
+        secrecy,
+        appearance,
+        rely_file AS "relyFile",
+        bo.deliverer,
+        bo.deliverer_tel AS "delivererTel",
+        deliverer_sign_file AS "delivererSignFile",
+        deliverer_sign_time AS "delivererSignTime",
+        reciever_sign_file AS "recieverSignFile",
+        bi.remark,
+        bi.create_user AS "createUser",
+        bi.create_Time AS createTime,
+        bi.update_time AS "updateTime"
+    FROM
+        ( SELECT * FROM business_interchange WHERE is_del = 0 AND id=#{id} ) bi
+        JOIN ( SELECT * FROM business_order WHERE is_del = 0 ) bo ON bi.order_id = bo.id
+    </select>
+
+
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index 2335aed..a4ecac7 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -164,7 +164,7 @@
 
 
     <select id="getInterChangeSampleList" resultType="com.casic.missiles.dto.customer.sample.CustomerSampleListVO">
-        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent
+        SELECT sampleNo,sampleName,sampleModel,manufacturingNo,appendixDescn,id,remark,sampleId,measureContent,orderId
         FROM
         (
           SELECT sample_no AS "sampleNo",sample_name AS "sampleName",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",id,remark
@@ -172,7 +172,7 @@
           WHERE is_del=0 AND id=#{sampleId}
         )bo
         JOIN (
-            SELECT measure_content AS "measureContent",sample_id AS "sampleId"
+            SELECT measure_content AS "measureContent",sample_id AS "sampleId",order_id AS  "orderId"
             FROM business_order_sample_relation
             WHERE order_id=#{orderId}
             AND sample_id=#{sampleId}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
new file mode 100644
index 0000000..ecb13ff
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -0,0 +1,209 @@
+package com.casic.missiles.dto.business.interchange;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 业务管理-设备交接单
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+@Data
+@TableName("business_interchange")
+public class BusinessInterchangeDetailResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 交接单编号
+     */
+    @ApiModelProperty(value = "交接单编号", dataType = "String")
+    @TableField("interchange_code")
+    private String interchangeCode;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书id", dataType = "String")
+    @TableField("order_id")
+    private Long orderId;
+
+    /**
+     * 委托书id
+     */
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderNo;
+
+    /**
+     * 证书单位名称
+     */
+    @ApiModelProperty(value = "证书单位名称", dataType = "String")
+    @TableField("certification_company")
+    private String certificationCompany;
+
+    /**
+     * 证书单位传真
+     */
+    @ApiModelProperty(value = "证书单位传真", dataType = "String")
+    @TableField("certification_company_fex")
+    private String certificationCompanyFex;
+
+    /**
+     * 证书单位邮编
+     */
+    @ApiModelProperty(value = "证书单位邮编", dataType = "String")
+    @TableField("certification_company_email")
+    private String certificationCompanyEmail;
+
+    /**
+     * 接收人
+     */
+    @ApiModelProperty(value = "接收人", dataType = "String")
+    @TableField("reciever")
+    private String reciever;
+
+    /**
+     * 接收人电话/手机
+     */
+    @ApiModelProperty(value = "接收人电话/手机", dataType = "String")
+    @TableField("reciever_phone")
+    private String recieverPhone;
+
+    /**
+     * 证书单位地址
+     */
+    @ApiModelProperty(value = "证书单位地址", dataType = "String")
+    @TableField("certification_company_address")
+    private String certificationCompanyAddress;
+
+    /**
+     * 委托方id（客户id）
+     */
+    @ApiModelProperty(value = "委托方id", dataType = "String")
+    @TableField("customer_id")
+    private Long customerId;
+
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
+    @ApiModelProperty(value = "委托方名称", dataType = "String")
+    private String customerName;
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @ApiModelProperty(value = "委托日期", dataType = "String")
+    private String orderTime;
+    /**
+     * 完成时间
+     */
+    @ApiModelProperty(value = "完成时间", dataType = "String")
+    @TableField("require_over_time")
+    private String requireOverTime;
+
+    /**
+     * 交接时间
+     */
+    @ApiModelProperty(value = "交接时间", dataType = "String")
+    @TableField("deliver_time")
+    private String deliverTime;
+
+    /**
+     * 检校类别（字典code）
+     */
+    @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
+    @TableField("measure_category")
+    private String measureCategory;
+
+    /**
+     * 保密要求（字典code）
+     */
+    @ApiModelProperty(value = "保密要求（字典code）", dataType = "String")
+    @TableField("secrecy")
+    private String secrecy;
+
+    /**
+     * 样品外观说明（手填）
+     */
+    @ApiModelProperty(value = "样品外观说明（手填）", dataType = "String")
+    @TableField("appearance")
+    private String appearance;
+
+    /**
+     * 依据文件说明（手填）
+     */
+    @ApiModelProperty(value = "依据文件说明（手填）", dataType = "String")
+    @TableField("rely_file")
+    private String relyFile;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer")
+    private String deliverer;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
+    @TableField("deliverer_tel")
+    private String delivererTel;
+
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
+    @ApiModelProperty(value = "送检人签名文件，minio存储文件名（为空时打印签字）", dataType = "String")
+    @TableField("deliverer_sign_file")
+    private String delivererSignFile;
+
+    /**
+     * 送检人签字时间
+     */
+    @ApiModelProperty(value = "送检人签字时间", dataType = "String")
+    @TableField("deliverer_sign_time")
+    private String delivererSignTime;
+
+    /**
+     * 接收人签名文件，minio存储文件名（系统签名模块获取）
+     */
+    @ApiModelProperty(value = "接收人签名文件，minio存储文件名（系统签名模块获取）", dataType = "String")
+    @TableField("reciever_sign_file")
+    private String recieverSignFile;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @TableField("remark")
+    private String remark;
+
+    @TableField("is_del")
+    private Integer isDel;
+
+    @TableField("create_user")
+    private Long createUser;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField(exist = false)
+    private List<CustomerSampleListVO>  customerSampleList;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index 95bd754..a80b3eb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -38,6 +38,10 @@
     @ExcelProperty(value = "委托方名称",order = 2)
     private String customerName;
 
+
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
     @ApiModelProperty(value = "委托日期", dataType = "String")
     private String orderTime;
 
@@ -48,17 +52,21 @@
     @ExcelProperty(value = "送样人",order = 3)
     private String deliverer;
 
+    @ApiModelProperty(value = "送样人联系方式", dataType = "String")
+    @ExcelProperty(value = "送样人联系方式",order = 4)
+    private String delivererTel;
+
     @ApiModelProperty(value = "联系方式-客户的固定电话", dataType = "String")
-    @ExcelProperty(value = "联系方式",order = 4)
+    @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
-    @ExcelProperty(value = "样品数量",order = 5)
+    @ExcelProperty(value = "样品数量",order = 6)
     private Integer sampleCount;
 
     @ApiModelProperty(value = "是否加急", dataType = "String")
-    @ExcelProperty(value = "是否加急",order = 6)
+    @ExcelProperty(value = "是否加急",order = 7)
     private String isUrgent;
 
     @ApiModelProperty(value = "接收状态", dataType = "String")
@@ -67,15 +75,15 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
-    @ExcelProperty(value = "接收状态名称",order = 7)
+    @ExcelProperty(value = "接收状态名称",order = 8)
     private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 8)
+    @ExcelProperty(value = "创建时间",order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注",order = 9)
+    @ExcelProperty(value = "备注",order = 10)
     private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
index 66625f4..099ad47 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java
@@ -10,10 +10,13 @@
 @Data
 @ApiModel("设备交接单样品接收列表")
 public class CustomerSampleListVO {
+    private  Long id;
     @ApiModelProperty(value = "委托书id", dataType = "String")
     private Long orderId;
     @ApiModelProperty(value = "样品id", dataType = "String")
-    private Long smapleId;
+    private Long sampleId;
+    @ApiModelProperty(value = "样品编号", dataType = "String")
+    private String sampleNo;
     @ApiModelProperty(value = "样品名称", dataType = "String")
     private String sampleName;
     @ApiModelProperty(value = "样品型号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
index ee59ea4..5663ba0 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java
@@ -110,8 +110,8 @@
      * 检校类别（字典code）
      */
     @ApiModelProperty(value = "检校类别（字典code）", dataType = "String")
-    @TableField("mesure_category")
-    private String mesureCategory;
+    @TableField("measure_category")
+    private String measureCategory;
 
     /**
      * 保密要求（字典code）
@@ -177,7 +177,7 @@
     private String remark;
 
     @TableField("is_del")
-    private Boolean isDel;
+    private Integer isDel;
 
     @TableField("create_user")
     private Long createUser;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
index a90ac40..a0cceda 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java
@@ -66,6 +66,9 @@
             Assert.isFalse(Objects.isNull(user), () -> {
                 throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
             });
+            if (CollectionUtils.isEmpty(request.getIds())) {
+                request.setIds(null);
+            }
             page.setCurrent(1);
             page.setSearchCount(false);
             page.setSize(Integer.MAX_VALUE);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index 5e0a1f5..b397f83 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -10,10 +10,7 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListVO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
@@ -57,8 +54,8 @@
     }
 
     @Override
-    public BusinessInterchange exchangeDetail(Long id) {
-        BusinessInterchange businessExchange = this.baseMapper.selectById(id);
+    public BusinessInterchangeDetailResponse exchangeDetail(Long id) { ;
+        BusinessInterchangeDetailResponse businessExchange = this.baseMapper.getInfoById(id);
         QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("order_id", businessExchange.getOrderId());
         List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(queryWrapper);
@@ -116,6 +113,8 @@
             List<InterchangeListResponse> resultList;
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 initFlushEmpty(request);
+            } else {
+                request.setIds(null);
             }
             Page<InterchangeListResponse> page = PageFactory.defaultPage();
             page.setCurrent(1);
@@ -129,9 +128,9 @@
     }
 
     @Override
-    public  Page<InterchangeSampleListResponse> exchangeSampleList(Page<InterchangeSampleListResponse> page, InterchangeSampleListRequest request) throws Exception{
+    public Page<InterchangeSampleListResponse> exchangeSampleList(Page<InterchangeSampleListResponse> page, InterchangeSampleListRequest request) throws Exception {
         page.setRecords(this.baseMapper.exchangeSampleList(page, request));
-        for(InterchangeSampleListResponse sampleListResponse:page.getRecords()){
+        for (InterchangeSampleListResponse sampleListResponse : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(sampleListResponse);
         }
         return page;
@@ -167,7 +166,7 @@
     private Integer sampleStatusUpdator(CustomerSampleListVO sampleInfo, Long interChangeId) {
         QueryWrapper<BusinessOrderSampleRelation> orderSampleWrapper = new QueryWrapper<>();
         orderSampleWrapper.eq("order_id", sampleInfo.getOrderId());
-        orderSampleWrapper.eq("sample_id", sampleInfo.getSmapleId());
+        orderSampleWrapper.eq("sample_id", sampleInfo.getSampleId());
         BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation();
         businessOrderSampleRelation.setInterchangeId(interChangeId);
         return sampleRelationMapper.update(businessOrderSampleRelation, orderSampleWrapper);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index e8ae76b..e922dc2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -134,7 +134,9 @@
 
             Page<DeviceDispatchVO> deviceDispatchVOPage = PageFactory.defaultPage();
             if (!CollectionUtils.isEmpty(request.getIds())) {
-               initDeviceDispatchDTOEmpty(request);
+                initDeviceDispatchDTOEmpty(request);
+            } else {
+                request.setIds(null);
             }
             Page<DeviceDispatchVO> page = PageFactory.defaultPage();
             page.setCurrent(1);
@@ -148,7 +150,6 @@
     }
 
 
-
     @Override
     public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) {
         Integer updateFalg = this.statusChangeUpdator(deviceStatusChangeDTO, false);
@@ -237,7 +238,7 @@
         }
     }
 
-    private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request){
+    private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request) {
         request.setSampleName(null);
         request.setSampleNo(null);
         request.setOrderNo(null);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
index 40db836..54e2757 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
@@ -3,10 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.dto.ReturnDTO;
-import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest;
-import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse;
+import com.casic.missiles.dto.business.interchange.*;
 import com.casic.missiles.model.business.BusinessInterchange;
 
 import javax.servlet.http.HttpServletResponse;
@@ -24,7 +21,7 @@
 
     Page<InterchangeListResponse> exchangeListPage(Page<InterchangeListResponse> page, InterchangeListRequest request) throws Exception;
 
-    BusinessInterchange exchangeDetail(Long id);
+    BusinessInterchangeDetailResponse exchangeDetail(Long id);
 
     ReturnDTO deleteExchange(Long id);