diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a28fcd5..8cb272d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a28fcd5..8cb272d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 604fb64..9f22064 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -127,5 +127,15 @@
         return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackage(page, request)));
     }
 
+    @ApiOperation("样品列表（分包证书页面）")
+    @PostMapping("/listPageBySubpackageCertificate")
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<MultiItemSampleListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackageCertificate(page, request)));
+    }
+
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a28fcd5..8cb272d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 604fb64..9f22064 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -127,5 +127,15 @@
         return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackage(page, request)));
     }
 
+    @ApiOperation("样品列表（分包证书页面）")
+    @PostMapping("/listPageBySubpackageCertificate")
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<MultiItemSampleListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackageCertificate(page, request)));
+    }
+
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 7d180d1..250d594 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,6 +30,9 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+
+
 
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a28fcd5..8cb272d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 604fb64..9f22064 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -127,5 +127,15 @@
         return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackage(page, request)));
     }
 
+    @ApiOperation("样品列表（分包证书页面）")
+    @PostMapping("/listPageBySubpackageCertificate")
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<MultiItemSampleListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackageCertificate(page, request)));
+    }
+
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 7d180d1..250d594 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,6 +30,9 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+
+
 
 
 }
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 8e08174..465542f 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -189,6 +189,38 @@
         )bor ON bor.sampleId=csi.id
     </select>
 
+    <select id="listPageBySubpackageCertificate"
+            resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse">
+        SELECT
+        orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod,
+        validDeadline,measureLastTime,sampleNo,orderCode,customerNo
+        FROM (
+            SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS
+            "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS
+            "measurePeriod",id,
+            valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS
+            "measureContent",customer_no  AS  "customerNo"
+            FROM customer_sample_info
+            WHERE customer_id=#{request.customerId}
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND sample_no like concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND sample_name like concat('%',#{request.sampleName},'%')
+            </if>
+        )csi
+        JOIN (
+            SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode"
+            FROM business_order_sample_relation bosr
+            JOIN (
+                SELECT id,order_code
+                FROM business_order
+                WHERE customer_id=#{request.customerId}
+             )bo ON bo.id=bosr.order_id
+        )bor ON bor.sampleId=csi.id
+        ORDER BY create_time DESC
+    </select>
+
     <sql id="Sample_Testing">
         (
             SELECT sample_id

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a28fcd5..8cb272d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 604fb64..9f22064 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -127,5 +127,15 @@
         return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackage(page, request)));
     }
 
+    @ApiOperation("样品列表（分包证书页面）")
+    @PostMapping("/listPageBySubpackageCertificate")
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<MultiItemSampleListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackageCertificate(page, request)));
+    }
+
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 7d180d1..250d594 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,6 +30,9 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+
+
 
 
 }
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 8e08174..465542f 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -189,6 +189,38 @@
         )bor ON bor.sampleId=csi.id
     </select>
 
+    <select id="listPageBySubpackageCertificate"
+            resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse">
+        SELECT
+        orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod,
+        validDeadline,measureLastTime,sampleNo,orderCode,customerNo
+        FROM (
+            SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS
+            "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS
+            "measurePeriod",id,
+            valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS
+            "measureContent",customer_no  AS  "customerNo"
+            FROM customer_sample_info
+            WHERE customer_id=#{request.customerId}
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND sample_no like concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND sample_name like concat('%',#{request.sampleName},'%')
+            </if>
+        )csi
+        JOIN (
+            SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode"
+            FROM business_order_sample_relation bosr
+            JOIN (
+                SELECT id,order_code
+                FROM business_order
+                WHERE customer_id=#{request.customerId}
+             )bo ON bo.id=bosr.order_id
+        )bor ON bor.sampleId=csi.id
+        ORDER BY create_time DESC
+    </select>
+
     <sql id="Sample_Testing">
         (
             SELECT sample_id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
index 6c36bf5..6861a6c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
@@ -51,6 +51,9 @@
     @TableField("order_id")
     private Long orderId;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderCode;
+
     @ApiModelProperty(value = "委托方id", dataType = "String")
     @TableField("customer_id")
     private Long customerId;
@@ -71,6 +74,8 @@
     @TableField("executive_address")
     private String executiveAddress;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a28fcd5..8cb272d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 604fb64..9f22064 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -127,5 +127,15 @@
         return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackage(page, request)));
     }
 
+    @ApiOperation("样品列表（分包证书页面）")
+    @PostMapping("/listPageBySubpackageCertificate")
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<MultiItemSampleListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackageCertificate(page, request)));
+    }
+
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 7d180d1..250d594 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,6 +30,9 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+
+
 
 
 }
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 8e08174..465542f 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -189,6 +189,38 @@
         )bor ON bor.sampleId=csi.id
     </select>
 
+    <select id="listPageBySubpackageCertificate"
+            resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse">
+        SELECT
+        orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod,
+        validDeadline,measureLastTime,sampleNo,orderCode,customerNo
+        FROM (
+            SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS
+            "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS
+            "measurePeriod",id,
+            valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS
+            "measureContent",customer_no  AS  "customerNo"
+            FROM customer_sample_info
+            WHERE customer_id=#{request.customerId}
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND sample_no like concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND sample_name like concat('%',#{request.sampleName},'%')
+            </if>
+        )csi
+        JOIN (
+            SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode"
+            FROM business_order_sample_relation bosr
+            JOIN (
+                SELECT id,order_code
+                FROM business_order
+                WHERE customer_id=#{request.customerId}
+             )bo ON bo.id=bosr.order_id
+        )bor ON bor.sampleId=csi.id
+        ORDER BY create_time DESC
+    </select>
+
     <sql id="Sample_Testing">
         (
             SELECT sample_id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
index 6c36bf5..6861a6c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
@@ -51,6 +51,9 @@
     @TableField("order_id")
     private Long orderId;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderCode;
+
     @ApiModelProperty(value = "委托方id", dataType = "String")
     @TableField("customer_id")
     private Long customerId;
@@ -71,6 +74,8 @@
     @TableField("executive_address")
     private String executiveAddress;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 840386e..6ea28a6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -227,6 +227,8 @@
         businessSiteExecutiveDetail.setCustomerPhone(businessOrder.getCustomerPhone());
         businessSiteExecutiveDetail.setDeliverer(businessOrder.getDeliverer());
         businessSiteExecutiveDetail.setDelivererTel(businessOrder.getDelivererTel());
+        businessSiteExecutiveDetail.setOrderCode(businessOrder.getOrderCode());
+        businessSiteExecutiveDetail.setCustomerNo(businessOrder.getCustomerNo());
     }
 
     private List<SiteExecutiveApprovalListResponse> handleApprovalStatus(Page<SiteExecutiveApprovalListResponse> page, SiteExecutiveApprovalListRequest request) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a28fcd5..8cb272d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 604fb64..9f22064 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -127,5 +127,15 @@
         return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackage(page, request)));
     }
 
+    @ApiOperation("样品列表（分包证书页面）")
+    @PostMapping("/listPageBySubpackageCertificate")
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<MultiItemSampleListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackageCertificate(page, request)));
+    }
+
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 7d180d1..250d594 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,6 +30,9 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+
+
 
 
 }
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 8e08174..465542f 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -189,6 +189,38 @@
         )bor ON bor.sampleId=csi.id
     </select>
 
+    <select id="listPageBySubpackageCertificate"
+            resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse">
+        SELECT
+        orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod,
+        validDeadline,measureLastTime,sampleNo,orderCode,customerNo
+        FROM (
+            SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS
+            "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS
+            "measurePeriod",id,
+            valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS
+            "measureContent",customer_no  AS  "customerNo"
+            FROM customer_sample_info
+            WHERE customer_id=#{request.customerId}
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND sample_no like concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND sample_name like concat('%',#{request.sampleName},'%')
+            </if>
+        )csi
+        JOIN (
+            SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode"
+            FROM business_order_sample_relation bosr
+            JOIN (
+                SELECT id,order_code
+                FROM business_order
+                WHERE customer_id=#{request.customerId}
+             )bo ON bo.id=bosr.order_id
+        )bor ON bor.sampleId=csi.id
+        ORDER BY create_time DESC
+    </select>
+
     <sql id="Sample_Testing">
         (
             SELECT sample_id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
index 6c36bf5..6861a6c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
@@ -51,6 +51,9 @@
     @TableField("order_id")
     private Long orderId;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderCode;
+
     @ApiModelProperty(value = "委托方id", dataType = "String")
     @TableField("customer_id")
     private Long customerId;
@@ -71,6 +74,8 @@
     @TableField("executive_address")
     private String executiveAddress;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 840386e..6ea28a6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -227,6 +227,8 @@
         businessSiteExecutiveDetail.setCustomerPhone(businessOrder.getCustomerPhone());
         businessSiteExecutiveDetail.setDeliverer(businessOrder.getDeliverer());
         businessSiteExecutiveDetail.setDelivererTel(businessOrder.getDelivererTel());
+        businessSiteExecutiveDetail.setOrderCode(businessOrder.getOrderCode());
+        businessSiteExecutiveDetail.setCustomerNo(businessOrder.getCustomerNo());
     }
 
     private List<SiteExecutiveApprovalListResponse> handleApprovalStatus(Page<SiteExecutiveApprovalListResponse> page, SiteExecutiveApprovalListRequest request) {
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 635a7ee..81a4204 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
@@ -197,6 +197,15 @@
         return page;
     }
 
+    @Override
+    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request) throws Exception {
+        page.setRecords(this.baseMapper.listPageBySubpackageCertificate(page, request));
+        for (MultiItemSampleListResponse multiItemSampleResponse : page.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(multiItemSampleResponse);
+        }
+        return page;
+    }
+
     private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) {
         QueryWrapper<BusinessOrderSampleRelation> wrapper = new QueryWrapper<BusinessOrderSampleRelation>()
                 .eq("sample_id", sampleId)

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index a28fcd5..8cb272d 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -54,7 +54,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "admin";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 604fb64..9f22064 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -127,5 +127,15 @@
         return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackage(page, request)));
     }
 
+    @ApiOperation("样品列表（分包证书页面）")
+    @PostMapping("/listPageBySubpackageCertificate")
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        Page<MultiItemSampleListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(customerSampleService.listPageBySubpackageCertificate(page, request)));
+    }
+
 
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 7d180d1..250d594 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,6 +30,9 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+
+
 
 
 }
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 8e08174..465542f 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -189,6 +189,38 @@
         )bor ON bor.sampleId=csi.id
     </select>
 
+    <select id="listPageBySubpackageCertificate"
+            resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse">
+        SELECT
+        orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod,
+        validDeadline,measureLastTime,sampleNo,orderCode,customerNo
+        FROM (
+            SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS
+            "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS
+            "measurePeriod",id,
+            valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS
+            "measureContent",customer_no  AS  "customerNo"
+            FROM customer_sample_info
+            WHERE customer_id=#{request.customerId}
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND sample_no like concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND sample_name like concat('%',#{request.sampleName},'%')
+            </if>
+        )csi
+        JOIN (
+            SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode"
+            FROM business_order_sample_relation bosr
+            JOIN (
+                SELECT id,order_code
+                FROM business_order
+                WHERE customer_id=#{request.customerId}
+             )bo ON bo.id=bosr.order_id
+        )bor ON bor.sampleId=csi.id
+        ORDER BY create_time DESC
+    </select>
+
     <sql id="Sample_Testing">
         (
             SELECT sample_id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
index 6c36bf5..6861a6c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveDetail.java
@@ -51,6 +51,9 @@
     @TableField("order_id")
     private Long orderId;
 
+    @ApiModelProperty(value = "委托书编号", dataType = "String")
+    private String orderCode;
+
     @ApiModelProperty(value = "委托方id", dataType = "String")
     @TableField("customer_id")
     private Long customerId;
@@ -71,6 +74,8 @@
     @TableField("executive_address")
     private String executiveAddress;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 840386e..6ea28a6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -227,6 +227,8 @@
         businessSiteExecutiveDetail.setCustomerPhone(businessOrder.getCustomerPhone());
         businessSiteExecutiveDetail.setDeliverer(businessOrder.getDeliverer());
         businessSiteExecutiveDetail.setDelivererTel(businessOrder.getDelivererTel());
+        businessSiteExecutiveDetail.setOrderCode(businessOrder.getOrderCode());
+        businessSiteExecutiveDetail.setCustomerNo(businessOrder.getCustomerNo());
     }
 
     private List<SiteExecutiveApprovalListResponse> handleApprovalStatus(Page<SiteExecutiveApprovalListResponse> page, SiteExecutiveApprovalListRequest request) {
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 635a7ee..81a4204 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
@@ -197,6 +197,15 @@
         return page;
     }
 
+    @Override
+    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request) throws Exception {
+        page.setRecords(this.baseMapper.listPageBySubpackageCertificate(page, request));
+        for (MultiItemSampleListResponse multiItemSampleResponse : page.getRecords()) {
+            DictCodeUtils.convertDictCodeToName(multiItemSampleResponse);
+        }
+        return page;
+    }
+
     private BusinessOrderSampleRelation getSampleStatusById(Long sampleId) {
         QueryWrapper<BusinessOrderSampleRelation> wrapper = new QueryWrapper<BusinessOrderSampleRelation>()
                 .eq("sample_id", sampleId)
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java
index 36f7a4f..931bc9c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java
@@ -34,6 +34,9 @@
     Page<MultiItemSampleListResponse> listPageByInterchange(Page<MultiItemSampleListResponse> page, InterchangeSampleListRequest request)  throws Exception;
 
     Page<MultiItemSampleListResponse> listPageBySubpackage(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request)  throws Exception;
+
+    Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request)  throws Exception;
+
     /**
      * 根据 委托书id、样品编号、样品名称查询样品信息（分页）
      *