diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }
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 baea973..ff086d9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -36,7 +36,8 @@
         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, csi.measure_type, bo.is_urgent, bo.plan_deliver_time,
-        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id
+        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id,
+        bo.remark
         FROM
         (
         SELECT *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }
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 baea973..ff086d9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -36,7 +36,8 @@
         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, csi.measure_type, bo.is_urgent, bo.plan_deliver_time,
-        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id
+        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id,
+        bo.remark
         FROM
         (
         SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 3f80a63..56b4ae5 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -185,6 +185,7 @@
             )bo ON bo.id=bosr.order_id
             WHERE (sample_status ='1' OR sample_status ='2')      <!-- 样品状态只能为待收入、待分发状态-->
         AND sample_id NOT IN  <include refid="Sample_Testing"/>   <!-- 样品在分包、委托书创建状态不在实验室使用状态-->
+        AND sample_id NOT IN  <include refid="Sample_Outsource"/>
         )bor ON bor.sampleId=csi.id
     </select>
 
@@ -221,12 +222,21 @@
     <sql id="Sample_Testing">
         (
             SELECT sample_id
-			 FROM (
+			FROM (
 					 SELECT sample_id,measure_status,Max(create_time)
 					 FROM business_lab_executive_info
 					 GROUP BY sample_id,measure_status
 				  ) bo
-              WHERE measure_status= '5'
+            WHERE measure_status= '5'
+        )
+    </sql>
+
+    <sql id="Sample_Outsource">
+        (
+            SELECT bopsr.sample_id
+			FROM business_outsource_project_sample_relation bopsr
+			JOIN business_order_sample_relation bosr ON (bopsr.order_id = bosr.order_id AND bopsr.sample_id = bosr.sample_id)
+            WHERE bosr.sample_status IN ('1','2','3')
         )
     </sql>
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }
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 baea973..ff086d9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -36,7 +36,8 @@
         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, csi.measure_type, bo.is_urgent, bo.plan_deliver_time,
-        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id
+        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id,
+        bo.remark
         FROM
         (
         SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 3f80a63..56b4ae5 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -185,6 +185,7 @@
             )bo ON bo.id=bosr.order_id
             WHERE (sample_status ='1' OR sample_status ='2')      <!-- 样品状态只能为待收入、待分发状态-->
         AND sample_id NOT IN  <include refid="Sample_Testing"/>   <!-- 样品在分包、委托书创建状态不在实验室使用状态-->
+        AND sample_id NOT IN  <include refid="Sample_Outsource"/>
         )bor ON bor.sampleId=csi.id
     </select>
 
@@ -221,12 +222,21 @@
     <sql id="Sample_Testing">
         (
             SELECT sample_id
-			 FROM (
+			FROM (
 					 SELECT sample_id,measure_status,Max(create_time)
 					 FROM business_lab_executive_info
 					 GROUP BY sample_id,measure_status
 				  ) bo
-              WHERE measure_status= '5'
+            WHERE measure_status= '5'
+        )
+    </sql>
+
+    <sql id="Sample_Outsource">
+        (
+            SELECT bopsr.sample_id
+			FROM business_outsource_project_sample_relation bopsr
+			JOIN business_order_sample_relation bosr ON (bopsr.order_id = bosr.order_id AND bopsr.sample_id = bosr.sample_id)
+            WHERE bosr.sample_status IN ('1','2','3')
         )
     </sql>
 
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 1610817..1610b44 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
@@ -104,6 +104,9 @@
     @ApiModelProperty(value = "是否自检", dataType = "boolean")
     private Boolean isSelfMeasure;
 
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
     @JSONField(serialize = false)
     private Integer measureType;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }
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 baea973..ff086d9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -36,7 +36,8 @@
         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, csi.measure_type, bo.is_urgent, bo.plan_deliver_time,
-        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id
+        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id,
+        bo.remark
         FROM
         (
         SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 3f80a63..56b4ae5 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -185,6 +185,7 @@
             )bo ON bo.id=bosr.order_id
             WHERE (sample_status ='1' OR sample_status ='2')      <!-- 样品状态只能为待收入、待分发状态-->
         AND sample_id NOT IN  <include refid="Sample_Testing"/>   <!-- 样品在分包、委托书创建状态不在实验室使用状态-->
+        AND sample_id NOT IN  <include refid="Sample_Outsource"/>
         )bor ON bor.sampleId=csi.id
     </select>
 
@@ -221,12 +222,21 @@
     <sql id="Sample_Testing">
         (
             SELECT sample_id
-			 FROM (
+			FROM (
 					 SELECT sample_id,measure_status,Max(create_time)
 					 FROM business_lab_executive_info
 					 GROUP BY sample_id,measure_status
 				  ) bo
-              WHERE measure_status= '5'
+            WHERE measure_status= '5'
+        )
+    </sql>
+
+    <sql id="Sample_Outsource">
+        (
+            SELECT bopsr.sample_id
+			FROM business_outsource_project_sample_relation bopsr
+			JOIN business_order_sample_relation bosr ON (bopsr.order_id = bosr.order_id AND bopsr.sample_id = bosr.sample_id)
+            WHERE bosr.sample_status IN ('1','2','3')
         )
     </sql>
 
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 1610817..1610b44 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
@@ -104,6 +104,9 @@
     @ApiModelProperty(value = "是否自检", dataType = "boolean")
     private Boolean isSelfMeasure;
 
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
     @JSONField(serialize = false)
     private Integer measureType;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 67433bf..cd29832 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -34,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    @ApiModelProperty(value = "出厂编号", dataType = "String")
+    private String manufacturingNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     /**
      * 导出ids
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }
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 baea973..ff086d9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -36,7 +36,8 @@
         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, csi.measure_type, bo.is_urgent, bo.plan_deliver_time,
-        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id
+        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id,
+        bo.remark
         FROM
         (
         SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 3f80a63..56b4ae5 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -185,6 +185,7 @@
             )bo ON bo.id=bosr.order_id
             WHERE (sample_status ='1' OR sample_status ='2')      <!-- 样品状态只能为待收入、待分发状态-->
         AND sample_id NOT IN  <include refid="Sample_Testing"/>   <!-- 样品在分包、委托书创建状态不在实验室使用状态-->
+        AND sample_id NOT IN  <include refid="Sample_Outsource"/>
         )bor ON bor.sampleId=csi.id
     </select>
 
@@ -221,12 +222,21 @@
     <sql id="Sample_Testing">
         (
             SELECT sample_id
-			 FROM (
+			FROM (
 					 SELECT sample_id,measure_status,Max(create_time)
 					 FROM business_lab_executive_info
 					 GROUP BY sample_id,measure_status
 				  ) bo
-              WHERE measure_status= '5'
+            WHERE measure_status= '5'
+        )
+    </sql>
+
+    <sql id="Sample_Outsource">
+        (
+            SELECT bopsr.sample_id
+			FROM business_outsource_project_sample_relation bopsr
+			JOIN business_order_sample_relation bosr ON (bopsr.order_id = bosr.order_id AND bopsr.sample_id = bosr.sample_id)
+            WHERE bosr.sample_status IN ('1','2','3')
         )
     </sql>
 
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 1610817..1610b44 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
@@ -104,6 +104,9 @@
     @ApiModelProperty(value = "是否自检", dataType = "boolean")
     private Boolean isSelfMeasure;
 
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
     @JSONField(serialize = false)
     private Integer measureType;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 67433bf..cd29832 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -34,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    @ApiModelProperty(value = "出厂编号", dataType = "String")
+    private String manufacturingNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     /**
      * 导出ids
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index c0a9a99..bc9c069 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -46,8 +46,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ExcelProperty(value = "出厂编号", order = 4)
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码", order = 4)
+    @ExcelProperty(value = "委托方代码", order = 5)
     private String customerNo;
 
     @TableField(exist = false)
@@ -57,33 +61,33 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品状态", dataType = "String")
-    @ExcelProperty(value = "样品状态", order = 5)
+    @ExcelProperty(value = "样品状态", order = 6)
     private String sampleStatusName;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
-    @ExcelProperty(value = "委托方名称", order = 6)
+    @ExcelProperty(value = "委托方名称", order = 7)
     private String customerName;
 
     @ApiModelProperty(value = "检定周期", dataType = "String")
-    @ExcelProperty(value = "检定周期", order = 7)
+    @ExcelProperty(value = "检定周期", order = 8)
     private String measurePeriod;
 
     @ApiModelProperty(value = "证书过期时间", dataType = "String")
-    @ExcelProperty(value = "证书过期时间", order = 8)
+    @ExcelProperty(value = "证书过期时间", order = 9)
     private String validDeadline;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "证书状态", dataType = "String")
-    @ExcelProperty(value = "证书状态", order = 9)
+    @ExcelProperty(value = "证书状态", order = 10)
     private String certificationStatus;
 
 
     @ApiModelProperty(value = "上次检定时间", dataType = "String")
-    @ExcelProperty(value = "上次检定时间", order = 10)
+    @ExcelProperty(value = "上次检定时间", order = 11)
     private String measureLastTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注", order = 11)
+    @ExcelProperty(value = "备注", order = 12)
     private String remark;
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }
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 baea973..ff086d9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -36,7 +36,8 @@
         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, csi.measure_type, bo.is_urgent, bo.plan_deliver_time,
-        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id
+        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id,
+        bo.remark
         FROM
         (
         SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 3f80a63..56b4ae5 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -185,6 +185,7 @@
             )bo ON bo.id=bosr.order_id
             WHERE (sample_status ='1' OR sample_status ='2')      <!-- 样品状态只能为待收入、待分发状态-->
         AND sample_id NOT IN  <include refid="Sample_Testing"/>   <!-- 样品在分包、委托书创建状态不在实验室使用状态-->
+        AND sample_id NOT IN  <include refid="Sample_Outsource"/>
         )bor ON bor.sampleId=csi.id
     </select>
 
@@ -221,12 +222,21 @@
     <sql id="Sample_Testing">
         (
             SELECT sample_id
-			 FROM (
+			FROM (
 					 SELECT sample_id,measure_status,Max(create_time)
 					 FROM business_lab_executive_info
 					 GROUP BY sample_id,measure_status
 				  ) bo
-              WHERE measure_status= '5'
+            WHERE measure_status= '5'
+        )
+    </sql>
+
+    <sql id="Sample_Outsource">
+        (
+            SELECT bopsr.sample_id
+			FROM business_outsource_project_sample_relation bopsr
+			JOIN business_order_sample_relation bosr ON (bopsr.order_id = bosr.order_id AND bopsr.sample_id = bosr.sample_id)
+            WHERE bosr.sample_status IN ('1','2','3')
         )
     </sql>
 
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 1610817..1610b44 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
@@ -104,6 +104,9 @@
     @ApiModelProperty(value = "是否自检", dataType = "boolean")
     private Boolean isSelfMeasure;
 
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
     @JSONField(serialize = false)
     private Integer measureType;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 67433bf..cd29832 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -34,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    @ApiModelProperty(value = "出厂编号", dataType = "String")
+    private String manufacturingNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     /**
      * 导出ids
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index c0a9a99..bc9c069 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -46,8 +46,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ExcelProperty(value = "出厂编号", order = 4)
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码", order = 4)
+    @ExcelProperty(value = "委托方代码", order = 5)
     private String customerNo;
 
     @TableField(exist = false)
@@ -57,33 +61,33 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品状态", dataType = "String")
-    @ExcelProperty(value = "样品状态", order = 5)
+    @ExcelProperty(value = "样品状态", order = 6)
     private String sampleStatusName;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
-    @ExcelProperty(value = "委托方名称", order = 6)
+    @ExcelProperty(value = "委托方名称", order = 7)
     private String customerName;
 
     @ApiModelProperty(value = "检定周期", dataType = "String")
-    @ExcelProperty(value = "检定周期", order = 7)
+    @ExcelProperty(value = "检定周期", order = 8)
     private String measurePeriod;
 
     @ApiModelProperty(value = "证书过期时间", dataType = "String")
-    @ExcelProperty(value = "证书过期时间", order = 8)
+    @ExcelProperty(value = "证书过期时间", order = 9)
     private String validDeadline;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "证书状态", dataType = "String")
-    @ExcelProperty(value = "证书状态", order = 9)
+    @ExcelProperty(value = "证书状态", order = 10)
     private String certificationStatus;
 
 
     @ApiModelProperty(value = "上次检定时间", dataType = "String")
-    @ExcelProperty(value = "上次检定时间", order = 10)
+    @ExcelProperty(value = "上次检定时间", order = 11)
     private String measureLastTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注", order = 11)
+    @ExcelProperty(value = "备注", order = 12)
     private String remark;
 
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
index bc1c338..086eaa8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
@@ -197,4 +197,12 @@
         return ReturnUtil.success();
     }
 
+    @Override
+    public ReturnDTO deleteCertificate(Long id) {
+        if(certificateMapper.deleteById(id) > 0){
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }
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 baea973..ff086d9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -36,7 +36,8 @@
         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, csi.measure_type, bo.is_urgent, bo.plan_deliver_time,
-        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id
+        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id,
+        bo.remark
         FROM
         (
         SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 3f80a63..56b4ae5 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -185,6 +185,7 @@
             )bo ON bo.id=bosr.order_id
             WHERE (sample_status ='1' OR sample_status ='2')      <!-- 样品状态只能为待收入、待分发状态-->
         AND sample_id NOT IN  <include refid="Sample_Testing"/>   <!-- 样品在分包、委托书创建状态不在实验室使用状态-->
+        AND sample_id NOT IN  <include refid="Sample_Outsource"/>
         )bor ON bor.sampleId=csi.id
     </select>
 
@@ -221,12 +222,21 @@
     <sql id="Sample_Testing">
         (
             SELECT sample_id
-			 FROM (
+			FROM (
 					 SELECT sample_id,measure_status,Max(create_time)
 					 FROM business_lab_executive_info
 					 GROUP BY sample_id,measure_status
 				  ) bo
-              WHERE measure_status= '5'
+            WHERE measure_status= '5'
+        )
+    </sql>
+
+    <sql id="Sample_Outsource">
+        (
+            SELECT bopsr.sample_id
+			FROM business_outsource_project_sample_relation bopsr
+			JOIN business_order_sample_relation bosr ON (bopsr.order_id = bosr.order_id AND bopsr.sample_id = bosr.sample_id)
+            WHERE bosr.sample_status IN ('1','2','3')
         )
     </sql>
 
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 1610817..1610b44 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
@@ -104,6 +104,9 @@
     @ApiModelProperty(value = "是否自检", dataType = "boolean")
     private Boolean isSelfMeasure;
 
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
     @JSONField(serialize = false)
     private Integer measureType;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 67433bf..cd29832 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -34,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    @ApiModelProperty(value = "出厂编号", dataType = "String")
+    private String manufacturingNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     /**
      * 导出ids
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index c0a9a99..bc9c069 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -46,8 +46,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ExcelProperty(value = "出厂编号", order = 4)
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码", order = 4)
+    @ExcelProperty(value = "委托方代码", order = 5)
     private String customerNo;
 
     @TableField(exist = false)
@@ -57,33 +61,33 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品状态", dataType = "String")
-    @ExcelProperty(value = "样品状态", order = 5)
+    @ExcelProperty(value = "样品状态", order = 6)
     private String sampleStatusName;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
-    @ExcelProperty(value = "委托方名称", order = 6)
+    @ExcelProperty(value = "委托方名称", order = 7)
     private String customerName;
 
     @ApiModelProperty(value = "检定周期", dataType = "String")
-    @ExcelProperty(value = "检定周期", order = 7)
+    @ExcelProperty(value = "检定周期", order = 8)
     private String measurePeriod;
 
     @ApiModelProperty(value = "证书过期时间", dataType = "String")
-    @ExcelProperty(value = "证书过期时间", order = 8)
+    @ExcelProperty(value = "证书过期时间", order = 9)
     private String validDeadline;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "证书状态", dataType = "String")
-    @ExcelProperty(value = "证书状态", order = 9)
+    @ExcelProperty(value = "证书状态", order = 10)
     private String certificationStatus;
 
 
     @ApiModelProperty(value = "上次检定时间", dataType = "String")
-    @ExcelProperty(value = "上次检定时间", order = 10)
+    @ExcelProperty(value = "上次检定时间", order = 11)
     private String measureLastTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注", order = 11)
+    @ExcelProperty(value = "备注", order = 12)
     private String remark;
 
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
index bc1c338..086eaa8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
@@ -197,4 +197,12 @@
         return ReturnUtil.success();
     }
 
+    @Override
+    public ReturnDTO deleteCertificate(Long id) {
+        if(certificateMapper.deleteById(id) > 0){
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
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 d3d8727..f508b66 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
@@ -10,8 +10,8 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -19,12 +19,11 @@
 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.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
+import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 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.model.meter.MeterTraceSupplier;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -259,6 +258,8 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
+        queryWrapper.like(StringUtils.isNotBlank(request.getManufacturingNo()), "manufacturing_no", request.getManufacturingNo());
+        queryWrapper.like(StringUtils.isNotBlank(request.getManufacturer()), "manufacturer", request.getManufacturer());
         if (!StringUtils.isEmpty(request.getOvertimeStatus())) {
             int expireTime=StringUtils.isEmpty(reminderNodeConfig.getSampleCertificate())?0:Integer.valueOf(reminderNodeConfig.getSampleCertificate());
             queryWrapper.apply("1".equals(request.getOvertimeStatus()),
@@ -271,7 +272,7 @@
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} >= DATE_FORMAT(measure_last_time,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.eq("is_del", 0);
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("sample_no");
         return queryWrapper;
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
index 8c7aebb..896cade 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourceCertificateController.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.outsource.OutsourceCertificateListRequest;
@@ -99,4 +100,11 @@
         return certificateService.updateCertificate(certificate);
     }
 
+    @ApiOperation("分包证书删除")
+    @PostMapping("/delete")
+    @ResponseBody
+    public ReturnDTO delete(@RequestBody IdDTO idDTO) {
+        return certificateService.deleteCertificate(idDTO.getId());
+    }
+
 }
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 baea973..ff086d9 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -36,7 +36,8 @@
         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, csi.measure_type, bo.is_urgent, bo.plan_deliver_time,
-        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id
+        bo.require_over_time, bo.deliverer, bosr.return_time, csi.remark, csi.label_bind, bo.customer_id,
+        bo.remark
         FROM
         (
         SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index 3f80a63..56b4ae5 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -185,6 +185,7 @@
             )bo ON bo.id=bosr.order_id
             WHERE (sample_status ='1' OR sample_status ='2')      <!-- 样品状态只能为待收入、待分发状态-->
         AND sample_id NOT IN  <include refid="Sample_Testing"/>   <!-- 样品在分包、委托书创建状态不在实验室使用状态-->
+        AND sample_id NOT IN  <include refid="Sample_Outsource"/>
         )bor ON bor.sampleId=csi.id
     </select>
 
@@ -221,12 +222,21 @@
     <sql id="Sample_Testing">
         (
             SELECT sample_id
-			 FROM (
+			FROM (
 					 SELECT sample_id,measure_status,Max(create_time)
 					 FROM business_lab_executive_info
 					 GROUP BY sample_id,measure_status
 				  ) bo
-              WHERE measure_status= '5'
+            WHERE measure_status= '5'
+        )
+    </sql>
+
+    <sql id="Sample_Outsource">
+        (
+            SELECT bopsr.sample_id
+			FROM business_outsource_project_sample_relation bopsr
+			JOIN business_order_sample_relation bosr ON (bopsr.order_id = bosr.order_id AND bopsr.sample_id = bosr.sample_id)
+            WHERE bosr.sample_status IN ('1','2','3')
         )
     </sql>
 
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 1610817..1610b44 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
@@ -104,6 +104,9 @@
     @ApiModelProperty(value = "是否自检", dataType = "boolean")
     private Boolean isSelfMeasure;
 
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
     @JSONField(serialize = false)
     private Integer measureType;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 67433bf..cd29832 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -34,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    @ApiModelProperty(value = "出厂编号", dataType = "String")
+    private String manufacturingNo;
+
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     /**
      * 导出ids
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index c0a9a99..bc9c069 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -46,8 +46,12 @@
     @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
+    @ExcelProperty(value = "出厂编号", order = 4)
+    @ApiModelProperty(value = "生产厂家", dataType = "String")
+    private String manufacturer;
+
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码", order = 4)
+    @ExcelProperty(value = "委托方代码", order = 5)
     private String customerNo;
 
     @TableField(exist = false)
@@ -57,33 +61,33 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "样品状态", dataType = "String")
-    @ExcelProperty(value = "样品状态", order = 5)
+    @ExcelProperty(value = "样品状态", order = 6)
     private String sampleStatusName;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
-    @ExcelProperty(value = "委托方名称", order = 6)
+    @ExcelProperty(value = "委托方名称", order = 7)
     private String customerName;
 
     @ApiModelProperty(value = "检定周期", dataType = "String")
-    @ExcelProperty(value = "检定周期", order = 7)
+    @ExcelProperty(value = "检定周期", order = 8)
     private String measurePeriod;
 
     @ApiModelProperty(value = "证书过期时间", dataType = "String")
-    @ExcelProperty(value = "证书过期时间", order = 8)
+    @ExcelProperty(value = "证书过期时间", order = 9)
     private String validDeadline;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "证书状态", dataType = "String")
-    @ExcelProperty(value = "证书状态", order = 9)
+    @ExcelProperty(value = "证书状态", order = 10)
     private String certificationStatus;
 
 
     @ApiModelProperty(value = "上次检定时间", dataType = "String")
-    @ExcelProperty(value = "上次检定时间", order = 10)
+    @ExcelProperty(value = "上次检定时间", order = 11)
     private String measureLastTime;
 
     @ApiModelProperty(value = "备注", dataType = "String")
-    @ExcelProperty(value = "备注", order = 11)
+    @ExcelProperty(value = "备注", order = 12)
     private String remark;
 
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
index bc1c338..086eaa8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOutsourceCertificateServiceImpl.java
@@ -197,4 +197,12 @@
         return ReturnUtil.success();
     }
 
+    @Override
+    public ReturnDTO deleteCertificate(Long id) {
+        if(certificateMapper.deleteById(id) > 0){
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
 }
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 d3d8727..f508b66 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
@@ -10,8 +10,8 @@
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -19,12 +19,11 @@
 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.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
+import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 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.model.meter.MeterTraceSupplier;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -259,6 +258,8 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getSampleModel()), "sample_model", request.getSampleModel());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
+        queryWrapper.like(StringUtils.isNotBlank(request.getManufacturingNo()), "manufacturing_no", request.getManufacturingNo());
+        queryWrapper.like(StringUtils.isNotBlank(request.getManufacturer()), "manufacturer", request.getManufacturer());
         if (!StringUtils.isEmpty(request.getOvertimeStatus())) {
             int expireTime=StringUtils.isEmpty(reminderNodeConfig.getSampleCertificate())?0:Integer.valueOf(reminderNodeConfig.getSampleCertificate());
             queryWrapper.apply("1".equals(request.getOvertimeStatus()),
@@ -271,7 +272,7 @@
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} >= DATE_FORMAT(measure_last_time,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.eq("is_del", 0);
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("sample_no");
         return queryWrapper;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceCertificateService.java
index ed29b75..74068a6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceCertificateService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessOutsourceCertificateService.java
@@ -32,4 +32,6 @@
     ReturnDTO updateCertificate(BusinessOutsourceCertificate certificate);
 
     ReturnDTO batchImport(MultipartFile file) throws IOException;
+
+    ReturnDTO deleteCertificate(Long id);
 }