diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 3a68b15..61a9e8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -30,7 +30,7 @@
     private Long id;
 
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -42,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @ApiModelProperty(value = "客户编号", dataType = "String")
-    @ExcelProperty(value = "客户编号",order = 4)
+    @ExcelProperty(value = "客户编号", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "公司名称", dataType = "String")
-    @ExcelProperty(value = "公司名称",order = 5)
+    @ExcelProperty(value = "公司名称", order = 5)
     private String customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -85,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 3a68b15..61a9e8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -30,7 +30,7 @@
     private Long id;
 
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -42,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @ApiModelProperty(value = "客户编号", dataType = "String")
-    @ExcelProperty(value = "客户编号",order = 4)
+    @ExcelProperty(value = "客户编号", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "公司名称", dataType = "String")
-    @ExcelProperty(value = "公司名称",order = 5)
+    @ExcelProperty(value = "公司名称", order = 5)
     private String customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -85,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1b7bce..beb1f86 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 3a68b15..61a9e8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -30,7 +30,7 @@
     private Long id;
 
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -42,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @ApiModelProperty(value = "客户编号", dataType = "String")
-    @ExcelProperty(value = "客户编号",order = 4)
+    @ExcelProperty(value = "客户编号", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "公司名称", dataType = "String")
-    @ExcelProperty(value = "公司名称",order = 5)
+    @ExcelProperty(value = "公司名称", order = 5)
     private String customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -85,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1b7bce..beb1f86 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4c9d57a..a136bd1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 3a68b15..61a9e8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -30,7 +30,7 @@
     private Long id;
 
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -42,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @ApiModelProperty(value = "客户编号", dataType = "String")
-    @ExcelProperty(value = "客户编号",order = 4)
+    @ExcelProperty(value = "客户编号", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "公司名称", dataType = "String")
-    @ExcelProperty(value = "公司名称",order = 5)
+    @ExcelProperty(value = "公司名称", order = 5)
     private String customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -85,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1b7bce..beb1f86 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4c9d57a..a136bd1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 50d1c6d..4fac180 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
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
@@ -21,8 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -44,69 +47,74 @@
         if (CollectionUtils.isEmpty(records)) {
             return new Page<>();
         }
-//        dispatchVOPage.getRecords().stream().forEach(
-//                dispatchVO -> {
-//                    Long orderId = dispatchVO.getOrderId();
-//                    Long sampleId = dispatchVO.getSampleId();
-//                    String sampleStatus = dispatchVO.getSampleStatus();
-//                    switch (sampleStatus) {
-//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.TO_HANDOUT:
-//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
-//                                dispatchVO.setFallbackState(0);
-//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
-//                            } else {
-//                                dispatchVO.setFallbackState(1);
-//                                dispatchVO.setAlreadyCertifications(0);
-//                            }
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                            break;
-//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
-//                        case SampleStatusEnum.IN_MEASURE:
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.MEASURE_COMPLETE:
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
-//                            break;
-//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
-//                        case SampleStatusEnum.BE_OVERDUE:
-//                            //待分发的超期
-//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
-//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                                break;
-//                            }
-//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
-//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
-//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
-//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                    }
-//                }
-//        );
+        dispatchVOPage.getRecords().stream().forEach(
+                dispatchVO -> {
+                    Long orderId = dispatchVO.getOrderId();
+                    Long sampleId = dispatchVO.getSampleId();
+                    String sampleStatus = dispatchVO.getSampleStatus();
+                    switch (sampleStatus) {
+                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.TO_HANDOUT:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -114,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -123,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -132,8 +140,17 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -143,14 +160,14 @@
 
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
-        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
-        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
-        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
-                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE);
         return wrapper;
     }
 
-    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO dispatchVO, Long measureDeptId) {
         Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
         return aLong.intValue();
     }
@@ -161,8 +178,8 @@
             log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
             return null;
         }
-        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
-        return handOutLabExecutiveDTO;
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
     }
 
     private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 3a68b15..61a9e8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -30,7 +30,7 @@
     private Long id;
 
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -42,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @ApiModelProperty(value = "客户编号", dataType = "String")
-    @ExcelProperty(value = "客户编号",order = 4)
+    @ExcelProperty(value = "客户编号", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "公司名称", dataType = "String")
-    @ExcelProperty(value = "公司名称",order = 5)
+    @ExcelProperty(value = "公司名称", order = 5)
     private String customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -85,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1b7bce..beb1f86 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4c9d57a..a136bd1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 50d1c6d..4fac180 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
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
@@ -21,8 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -44,69 +47,74 @@
         if (CollectionUtils.isEmpty(records)) {
             return new Page<>();
         }
-//        dispatchVOPage.getRecords().stream().forEach(
-//                dispatchVO -> {
-//                    Long orderId = dispatchVO.getOrderId();
-//                    Long sampleId = dispatchVO.getSampleId();
-//                    String sampleStatus = dispatchVO.getSampleStatus();
-//                    switch (sampleStatus) {
-//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.TO_HANDOUT:
-//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
-//                                dispatchVO.setFallbackState(0);
-//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
-//                            } else {
-//                                dispatchVO.setFallbackState(1);
-//                                dispatchVO.setAlreadyCertifications(0);
-//                            }
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                            break;
-//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
-//                        case SampleStatusEnum.IN_MEASURE:
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.MEASURE_COMPLETE:
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
-//                            break;
-//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
-//                        case SampleStatusEnum.BE_OVERDUE:
-//                            //待分发的超期
-//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
-//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                                break;
-//                            }
-//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
-//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
-//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
-//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                    }
-//                }
-//        );
+        dispatchVOPage.getRecords().stream().forEach(
+                dispatchVO -> {
+                    Long orderId = dispatchVO.getOrderId();
+                    Long sampleId = dispatchVO.getSampleId();
+                    String sampleStatus = dispatchVO.getSampleStatus();
+                    switch (sampleStatus) {
+                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.TO_HANDOUT:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -114,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -123,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -132,8 +140,17 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -143,14 +160,14 @@
 
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
-        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
-        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
-        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
-                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE);
         return wrapper;
     }
 
-    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO dispatchVO, Long measureDeptId) {
         Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
         return aLong.intValue();
     }
@@ -161,8 +178,8 @@
             log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
             return null;
         }
-        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
-        return handOutLabExecutiveDTO;
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
     }
 
     private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index 938d725..626c209 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 3a68b15..61a9e8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -30,7 +30,7 @@
     private Long id;
 
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -42,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @ApiModelProperty(value = "客户编号", dataType = "String")
-    @ExcelProperty(value = "客户编号",order = 4)
+    @ExcelProperty(value = "客户编号", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "公司名称", dataType = "String")
-    @ExcelProperty(value = "公司名称",order = 5)
+    @ExcelProperty(value = "公司名称", order = 5)
     private String customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -85,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1b7bce..beb1f86 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4c9d57a..a136bd1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 50d1c6d..4fac180 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
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
@@ -21,8 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -44,69 +47,74 @@
         if (CollectionUtils.isEmpty(records)) {
             return new Page<>();
         }
-//        dispatchVOPage.getRecords().stream().forEach(
-//                dispatchVO -> {
-//                    Long orderId = dispatchVO.getOrderId();
-//                    Long sampleId = dispatchVO.getSampleId();
-//                    String sampleStatus = dispatchVO.getSampleStatus();
-//                    switch (sampleStatus) {
-//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.TO_HANDOUT:
-//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
-//                                dispatchVO.setFallbackState(0);
-//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
-//                            } else {
-//                                dispatchVO.setFallbackState(1);
-//                                dispatchVO.setAlreadyCertifications(0);
-//                            }
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                            break;
-//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
-//                        case SampleStatusEnum.IN_MEASURE:
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.MEASURE_COMPLETE:
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
-//                            break;
-//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
-//                        case SampleStatusEnum.BE_OVERDUE:
-//                            //待分发的超期
-//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
-//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                                break;
-//                            }
-//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
-//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
-//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
-//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                    }
-//                }
-//        );
+        dispatchVOPage.getRecords().stream().forEach(
+                dispatchVO -> {
+                    Long orderId = dispatchVO.getOrderId();
+                    Long sampleId = dispatchVO.getSampleId();
+                    String sampleStatus = dispatchVO.getSampleStatus();
+                    switch (sampleStatus) {
+                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.TO_HANDOUT:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -114,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -123,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -132,8 +140,17 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -143,14 +160,14 @@
 
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
-        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
-        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
-        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
-                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE);
         return wrapper;
     }
 
-    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO dispatchVO, Long measureDeptId) {
         Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
         return aLong.intValue();
     }
@@ -161,8 +178,8 @@
             log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
             return null;
         }
-        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
-        return handOutLabExecutiveDTO;
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
     }
 
     private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index 938d725..626c209 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index c4f6cb8..28082ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 3a68b15..61a9e8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -30,7 +30,7 @@
     private Long id;
 
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -42,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @ApiModelProperty(value = "客户编号", dataType = "String")
-    @ExcelProperty(value = "客户编号",order = 4)
+    @ExcelProperty(value = "客户编号", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "公司名称", dataType = "String")
-    @ExcelProperty(value = "公司名称",order = 5)
+    @ExcelProperty(value = "公司名称", order = 5)
     private String customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -85,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1b7bce..beb1f86 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4c9d57a..a136bd1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 50d1c6d..4fac180 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
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
@@ -21,8 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -44,69 +47,74 @@
         if (CollectionUtils.isEmpty(records)) {
             return new Page<>();
         }
-//        dispatchVOPage.getRecords().stream().forEach(
-//                dispatchVO -> {
-//                    Long orderId = dispatchVO.getOrderId();
-//                    Long sampleId = dispatchVO.getSampleId();
-//                    String sampleStatus = dispatchVO.getSampleStatus();
-//                    switch (sampleStatus) {
-//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.TO_HANDOUT:
-//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
-//                                dispatchVO.setFallbackState(0);
-//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
-//                            } else {
-//                                dispatchVO.setFallbackState(1);
-//                                dispatchVO.setAlreadyCertifications(0);
-//                            }
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                            break;
-//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
-//                        case SampleStatusEnum.IN_MEASURE:
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.MEASURE_COMPLETE:
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
-//                            break;
-//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
-//                        case SampleStatusEnum.BE_OVERDUE:
-//                            //待分发的超期
-//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
-//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                                break;
-//                            }
-//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
-//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
-//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
-//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                    }
-//                }
-//        );
+        dispatchVOPage.getRecords().stream().forEach(
+                dispatchVO -> {
+                    Long orderId = dispatchVO.getOrderId();
+                    Long sampleId = dispatchVO.getSampleId();
+                    String sampleStatus = dispatchVO.getSampleStatus();
+                    switch (sampleStatus) {
+                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.TO_HANDOUT:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -114,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -123,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -132,8 +140,17 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -143,14 +160,14 @@
 
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
-        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
-        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
-        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
-                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE);
         return wrapper;
     }
 
-    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO dispatchVO, Long measureDeptId) {
         Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
         return aLong.intValue();
     }
@@ -161,8 +178,8 @@
             log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
             return null;
         }
-        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
-        return handOutLabExecutiveDTO;
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
     }
 
     private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index 938d725..626c209 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index c4f6cb8..28082ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
index 85918e9..62c4a00 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
@@ -85,7 +85,7 @@
         customerInfo.setUpdateUser(authUser.getId());
         userInfoListDeletor(customerInfo.getId());
         Integer updateFlag = this.baseMapper.updateById(customerInfo);
-        Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList(),customerInfo.getId());
+        Boolean userUpdateFlag = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -166,7 +166,7 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
-        queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize());
+        queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
         queryWrapper.eq("is_del", 0);
@@ -195,19 +195,6 @@
         customerUserMapper.delete(queryWrapper);
     }
 
-
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList,Long id) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            customerUserInfo.setCustomerId(id);
-            Integer userUpdateNum = customerUserMapper.insert(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
-    }
-
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
         Long maxUserNo = customerUserMapper.selectMaxUserNo();
         Boolean userUpdateFlag = true;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index dc5e97a..b7f70f6 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
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 d2c0633..cf45164 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -30,8 +30,8 @@
     </sql>
 
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
-        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
-        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
         FROM
         (
@@ -47,9 +47,6 @@
             <if test="request.customerNo != null and request.customerNo !=''">
                 AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
             </if>
-            <if test="request.customerName != null and request.customerName !=''">
-                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
-            </if>
             <if test="request.startTime != null and request.startTime !=''">
                 AND bo.require_over_time &lt;= #{request.startTime}
             </if>
@@ -66,10 +63,10 @@
             FROM business_order_sample_relation bosr
             WHERE 1=1
             <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
             </if>
             <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
-                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3)
             </if>
             <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
                 AND bosr.sample_status = #{request.sampleStatus}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index d8ee7af..bdbdb1b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -98,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index b73df1c..9abb575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,7 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     private String sampleStatus;
 
     @ApiModelProperty(value = "开始时间", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 917610e..6175e65 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -24,7 +24,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
     private Long  orderId;
     private Long  sampleId;
     private String  sampleStatus;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index f3fa4ff..4871276 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -24,131 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级id", dataType = "String")
-        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "履约评级", dataType = "String")
-        @ExcelProperty(value = "履约评级",order =15)
-        private String gradeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "公司省地址", dataType = "String")
-        @ExcelProperty(value = "公司省地址",order =16)
-        private String addressProvinceName;
 
-        @ApiModelProperty(value = "公司市地址", dataType = "String")
-        @ExcelProperty(value = "公司市地址",order =17)
-        private String addressCityName;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
-        @ExcelProperty(value = "公司市详细地址",order =18)
-        private String fullAddress;
+    @ApiModelProperty(value = "公司省地址", dataType = "String")
+    @ExcelProperty(value = "公司省地址", order = 16)
+    private String addressProvinceName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =19)
-        private String businessScope;
+    @ApiModelProperty(value = "公司市地址", dataType = "String")
+    @ExcelProperty(value = "公司市地址", order = 17)
+    private String addressCityName;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =20)
-        private String createTime;
+    @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+    @ExcelProperty(value = "公司市详细地址", order = 18)
+    private String fullAddress;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =21)
-        private String updateTime;
+    @ApiModelProperty(value = "业务范围", dataType = "String")
+    @ExcelProperty(value = "业务范围", order = 19)
+    private String businessScope;
 
-        @ApiModelProperty(value = "备注", dataType = "String")
-        @ExcelProperty(value = "备注",order =22)
-        private String remark;
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @ExcelProperty(value = "最后更新时间", order = 21)
+    private String updateTime;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    @ExcelProperty(value = "备注", order = 22)
+    private String remark;
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index 95b7ebe..58bbbbb 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 3a68b15..61a9e8b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -30,7 +30,7 @@
     private Long id;
 
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -42,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @ApiModelProperty(value = "客户编号", dataType = "String")
-    @ExcelProperty(value = "客户编号",order = 4)
+    @ExcelProperty(value = "客户编号", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "公司名称", dataType = "String")
-    @ExcelProperty(value = "公司名称",order = 5)
+    @ExcelProperty(value = "公司名称", order = 5)
     private String customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -85,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index e1b7bce..beb1f86 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4c9d57a..a136bd1 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 50d1c6d..4fac180 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
@@ -9,6 +9,7 @@
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
@@ -21,8 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -44,69 +47,74 @@
         if (CollectionUtils.isEmpty(records)) {
             return new Page<>();
         }
-//        dispatchVOPage.getRecords().stream().forEach(
-//                dispatchVO -> {
-//                    Long orderId = dispatchVO.getOrderId();
-//                    Long sampleId = dispatchVO.getSampleId();
-//                    String sampleStatus = dispatchVO.getSampleStatus();
-//                    switch (sampleStatus) {
-//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.TO_HANDOUT:
-//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
-//                                dispatchVO.setFallbackState(0);
-//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
-//                            } else {
-//                                dispatchVO.setFallbackState(1);
-//                                dispatchVO.setAlreadyCertifications(0);
-//                            }
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                            break;
-//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
-//                        case SampleStatusEnum.IN_MEASURE:
-//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
-//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
-//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
-//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
-//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
-//                        case SampleStatusEnum.MEASURE_COMPLETE:
-//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
-//                            break;
-//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
-//                        case SampleStatusEnum.BE_OVERDUE:
-//                            //待分发的超期
-//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
-//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-//                                break;
-//                            }
-//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
-//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
-//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
-//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
-//                            break;
-//                    }
-//                }
-//        );
+        dispatchVOPage.getRecords().stream().forEach(
+                dispatchVO -> {
+                    Long orderId = dispatchVO.getOrderId();
+                    Long sampleId = dispatchVO.getSampleId();
+                    String sampleStatus = dispatchVO.getSampleStatus();
+                    switch (sampleStatus) {
+                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.TO_HANDOUT:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -114,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -123,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -132,8 +140,17 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -143,14 +160,14 @@
 
     private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
         QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
-        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
-        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
-        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
-                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", MeasureStatusEnum.TO_MEASURE);
         return wrapper;
     }
 
-    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO dispatchVO, Long measureDeptId) {
         Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
         return aLong.intValue();
     }
@@ -161,8 +178,8 @@
             log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
             return null;
         }
-        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
-        return handOutLabExecutiveDTO;
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
     }
 
     private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index 938d725..626c209 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index c4f6cb8..28082ec 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
index 85918e9..62c4a00 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
@@ -85,7 +85,7 @@
         customerInfo.setUpdateUser(authUser.getId());
         userInfoListDeletor(customerInfo.getId());
         Integer updateFlag = this.baseMapper.updateById(customerInfo);
-        Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList(),customerInfo.getId());
+        Boolean userUpdateFlag = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -166,7 +166,7 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
-        queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize());
+        queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
         queryWrapper.eq("is_del", 0);
@@ -195,19 +195,6 @@
         customerUserMapper.delete(queryWrapper);
     }
 
-
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList,Long id) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            customerUserInfo.setCustomerId(id);
-            Integer userUpdateNum = customerUserMapper.insert(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
-    }
-
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
         Long maxUserNo = customerUserMapper.selectMaxUserNo();
         Boolean userUpdateFlag = true;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
index 6ae3aa2..2fc354d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,11 +14,13 @@
 
     void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response);
 
-    ReturnDTO receiveDevice(Long id);
+    ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO backDevice(Long id);
+    ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO forcedTerminate(Long id);
+    ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO rushDoProcess(Long id);
+    ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO);
+
+    ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO);
 }