diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
index b168e8c..2987115 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
@@ -19,6 +19,12 @@
     @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long")
     private Long deptId;
 
+    @ApiModelProperty(value = "培训计划编号", dataType = "String")
+    private String planNo;
+
+    @ApiModelProperty(value = "培训计划名称", dataType = "String")
+    private String planName;
+
     /**
      * 实施单位-手填
      */

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
index b168e8c..2987115 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
@@ -19,6 +19,12 @@
     @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long")
     private Long deptId;
 
+    @ApiModelProperty(value = "培训计划编号", dataType = "String")
+    private String planNo;
+
+    @ApiModelProperty(value = "培训计划名称", dataType = "String")
+    private String planName;
+
     /**
      * 实施单位-手填
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 6ca4564..f9e2b4b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -43,10 +43,15 @@
     private String priceName;
 
     @TableField("check_type")
-    @ExcelProperty(value = "校验类型",order = 2)
+    @ExcelProperty(value = "校验类型")
     @ApiModelProperty(value = "校验类型-字典value", dataType = "String")
     private String checkType;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "校验类型",order = 2)
+    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    private String checkTypeName;
+
     @TableField("price_type")
     @ApiModelProperty(value = "类别id", dataType = "String")
     private String priceType;
@@ -83,15 +88,25 @@
     private String priceDescription;
 
     @TableField("operator_discount_permission")
-    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ExcelProperty(value = "业务员折扣权限")
     @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String")
     private String operatorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String")
+    private String operatorDiscountPermissionName;
+
     @TableField("director_discount_permission")
-    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ExcelProperty(value = "负责人折扣权限")
     @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String")
     private String directorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String")
+    private String directorDiscountPermissionName;
+
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
     private String remark;

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
index b168e8c..2987115 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
@@ -19,6 +19,12 @@
     @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long")
     private Long deptId;
 
+    @ApiModelProperty(value = "培训计划编号", dataType = "String")
+    private String planNo;
+
+    @ApiModelProperty(value = "培训计划名称", dataType = "String")
+    private String planName;
+
     /**
      * 实施单位-手填
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 6ca4564..f9e2b4b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -43,10 +43,15 @@
     private String priceName;
 
     @TableField("check_type")
-    @ExcelProperty(value = "校验类型",order = 2)
+    @ExcelProperty(value = "校验类型")
     @ApiModelProperty(value = "校验类型-字典value", dataType = "String")
     private String checkType;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "校验类型",order = 2)
+    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    private String checkTypeName;
+
     @TableField("price_type")
     @ApiModelProperty(value = "类别id", dataType = "String")
     private String priceType;
@@ -83,15 +88,25 @@
     private String priceDescription;
 
     @TableField("operator_discount_permission")
-    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ExcelProperty(value = "业务员折扣权限")
     @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String")
     private String operatorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String")
+    private String operatorDiscountPermissionName;
+
     @TableField("director_discount_permission")
-    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ExcelProperty(value = "负责人折扣权限")
     @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String")
     private String directorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String")
+    private String directorDiscountPermissionName;
+
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
     private String remark;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
index ffc21af..2d10d6f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
@@ -47,7 +47,7 @@
      * 培训计划编号
      */
     @ExcelProperty("计划编号")
-    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long")
+    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String")
     @TableField("plan_no")
     private String planNo;
 

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
index b168e8c..2987115 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
@@ -19,6 +19,12 @@
     @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long")
     private Long deptId;
 
+    @ApiModelProperty(value = "培训计划编号", dataType = "String")
+    private String planNo;
+
+    @ApiModelProperty(value = "培训计划名称", dataType = "String")
+    private String planName;
+
     /**
      * 实施单位-手填
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 6ca4564..f9e2b4b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -43,10 +43,15 @@
     private String priceName;
 
     @TableField("check_type")
-    @ExcelProperty(value = "校验类型",order = 2)
+    @ExcelProperty(value = "校验类型")
     @ApiModelProperty(value = "校验类型-字典value", dataType = "String")
     private String checkType;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "校验类型",order = 2)
+    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    private String checkTypeName;
+
     @TableField("price_type")
     @ApiModelProperty(value = "类别id", dataType = "String")
     private String priceType;
@@ -83,15 +88,25 @@
     private String priceDescription;
 
     @TableField("operator_discount_permission")
-    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ExcelProperty(value = "业务员折扣权限")
     @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String")
     private String operatorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String")
+    private String operatorDiscountPermissionName;
+
     @TableField("director_discount_permission")
-    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ExcelProperty(value = "负责人折扣权限")
     @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String")
     private String directorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String")
+    private String directorDiscountPermissionName;
+
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
     private String remark;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
index ffc21af..2d10d6f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
@@ -47,7 +47,7 @@
      * 培训计划编号
      */
     @ExcelProperty("计划编号")
-    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long")
+    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String")
     @TableField("plan_no")
     private String planNo;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index c6f5d95..65295c2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -239,6 +239,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId, MeasureStatusEnum.TO_ALLOCATE, null);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                 });
                 break;
@@ -251,6 +252,7 @@
                 statusList.add(MeasureStatusEnum.IN_MEASURE);
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId,null, statusList);
                 resultPage.getRecords().parallelStream().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                     //查询证书报告表
                     if(MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())){
@@ -294,6 +296,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                 });
                 break;
@@ -303,6 +306,7 @@
             case MeasureStatusEnum.IN_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                     //本实验室在一个流程中若有多次检测，这里的证书信息是多次的总和，已出具的是当前本人的（后续根据需求定义调整）
                     Integer alreadyCertificateNum = getAlreadyCertificateNum(lab.getOrderId(), lab.getSampleId(), lab.getMeasureDeptId());
@@ -549,6 +553,10 @@
             int seqUpdateFlag = labExecutiveInfoMapper.updateForSendBack(request.getOrderId(), request.getSampleId());
             //更新所有状态为空的实验室检测中序号最小的记录的状态为待分配
             Long id = labExecutiveInfoMapper.selectMinSeq(request.getOrderId(), request.getSampleId());
+            //仅分发了一个实验室检测的情况
+            if(seqUpdateFlag <= 0 && Objects.isNull(id)){
+                return ReturnUtil.success();
+            }
             BusinessLabExecutiveInfo info = new BusinessLabExecutiveInfo();
             info.setId(id);
             info.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE);
@@ -564,6 +572,7 @@
         labExecutiveInfo.setId(sampleAllocateRequest.getId());
         labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
         labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        labExecutiveInfo.setRequireCertifications(sampleAllocateRequest.getRequireCertifications());
         if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
             return ReturnUtil.success();
         }

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
index b168e8c..2987115 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
@@ -19,6 +19,12 @@
     @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long")
     private Long deptId;
 
+    @ApiModelProperty(value = "培训计划编号", dataType = "String")
+    private String planNo;
+
+    @ApiModelProperty(value = "培训计划名称", dataType = "String")
+    private String planName;
+
     /**
      * 实施单位-手填
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 6ca4564..f9e2b4b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -43,10 +43,15 @@
     private String priceName;
 
     @TableField("check_type")
-    @ExcelProperty(value = "校验类型",order = 2)
+    @ExcelProperty(value = "校验类型")
     @ApiModelProperty(value = "校验类型-字典value", dataType = "String")
     private String checkType;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "校验类型",order = 2)
+    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    private String checkTypeName;
+
     @TableField("price_type")
     @ApiModelProperty(value = "类别id", dataType = "String")
     private String priceType;
@@ -83,15 +88,25 @@
     private String priceDescription;
 
     @TableField("operator_discount_permission")
-    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ExcelProperty(value = "业务员折扣权限")
     @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String")
     private String operatorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String")
+    private String operatorDiscountPermissionName;
+
     @TableField("director_discount_permission")
-    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ExcelProperty(value = "负责人折扣权限")
     @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String")
     private String directorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String")
+    private String directorDiscountPermissionName;
+
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
     private String remark;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
index ffc21af..2d10d6f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
@@ -47,7 +47,7 @@
      * 培训计划编号
      */
     @ExcelProperty("计划编号")
-    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long")
+    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String")
     @TableField("plan_no")
     private String planNo;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index c6f5d95..65295c2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -239,6 +239,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId, MeasureStatusEnum.TO_ALLOCATE, null);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                 });
                 break;
@@ -251,6 +252,7 @@
                 statusList.add(MeasureStatusEnum.IN_MEASURE);
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId,null, statusList);
                 resultPage.getRecords().parallelStream().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                     //查询证书报告表
                     if(MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())){
@@ -294,6 +296,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                 });
                 break;
@@ -303,6 +306,7 @@
             case MeasureStatusEnum.IN_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                     //本实验室在一个流程中若有多次检测，这里的证书信息是多次的总和，已出具的是当前本人的（后续根据需求定义调整）
                     Integer alreadyCertificateNum = getAlreadyCertificateNum(lab.getOrderId(), lab.getSampleId(), lab.getMeasureDeptId());
@@ -549,6 +553,10 @@
             int seqUpdateFlag = labExecutiveInfoMapper.updateForSendBack(request.getOrderId(), request.getSampleId());
             //更新所有状态为空的实验室检测中序号最小的记录的状态为待分配
             Long id = labExecutiveInfoMapper.selectMinSeq(request.getOrderId(), request.getSampleId());
+            //仅分发了一个实验室检测的情况
+            if(seqUpdateFlag <= 0 && Objects.isNull(id)){
+                return ReturnUtil.success();
+            }
             BusinessLabExecutiveInfo info = new BusinessLabExecutiveInfo();
             info.setId(id);
             info.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE);
@@ -564,6 +572,7 @@
         labExecutiveInfo.setId(sampleAllocateRequest.getId());
         labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
         labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        labExecutiveInfo.setRequireCertifications(sampleAllocateRequest.getRequireCertifications());
         if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
             return ReturnUtil.success();
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index d468012..403f44a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -374,7 +374,7 @@
         if(updateFlg>0){
             // 删除所有关联设备信息
             QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
-            wrapper.eq("applyId",equipmentApply.getId());
+            wrapper.eq("apply_id",equipmentApply.getId());
             equipmentService.remove(wrapper);
             equipmentApply.getEquipmentList().forEach(bean->{
                 bean.setApplyId(equipmentApply.getId().toString());
@@ -389,6 +389,7 @@
                 taskService.complete(task.getId());
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
+                return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
index b168e8c..2987115 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
@@ -19,6 +19,12 @@
     @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long")
     private Long deptId;
 
+    @ApiModelProperty(value = "培训计划编号", dataType = "String")
+    private String planNo;
+
+    @ApiModelProperty(value = "培训计划名称", dataType = "String")
+    private String planName;
+
     /**
      * 实施单位-手填
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 6ca4564..f9e2b4b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -43,10 +43,15 @@
     private String priceName;
 
     @TableField("check_type")
-    @ExcelProperty(value = "校验类型",order = 2)
+    @ExcelProperty(value = "校验类型")
     @ApiModelProperty(value = "校验类型-字典value", dataType = "String")
     private String checkType;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "校验类型",order = 2)
+    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    private String checkTypeName;
+
     @TableField("price_type")
     @ApiModelProperty(value = "类别id", dataType = "String")
     private String priceType;
@@ -83,15 +88,25 @@
     private String priceDescription;
 
     @TableField("operator_discount_permission")
-    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ExcelProperty(value = "业务员折扣权限")
     @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String")
     private String operatorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String")
+    private String operatorDiscountPermissionName;
+
     @TableField("director_discount_permission")
-    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ExcelProperty(value = "负责人折扣权限")
     @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String")
     private String directorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String")
+    private String directorDiscountPermissionName;
+
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
     private String remark;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
index ffc21af..2d10d6f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
@@ -47,7 +47,7 @@
      * 培训计划编号
      */
     @ExcelProperty("计划编号")
-    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long")
+    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String")
     @TableField("plan_no")
     private String planNo;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index c6f5d95..65295c2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -239,6 +239,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId, MeasureStatusEnum.TO_ALLOCATE, null);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                 });
                 break;
@@ -251,6 +252,7 @@
                 statusList.add(MeasureStatusEnum.IN_MEASURE);
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId,null, statusList);
                 resultPage.getRecords().parallelStream().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                     //查询证书报告表
                     if(MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())){
@@ -294,6 +296,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                 });
                 break;
@@ -303,6 +306,7 @@
             case MeasureStatusEnum.IN_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                     //本实验室在一个流程中若有多次检测，这里的证书信息是多次的总和，已出具的是当前本人的（后续根据需求定义调整）
                     Integer alreadyCertificateNum = getAlreadyCertificateNum(lab.getOrderId(), lab.getSampleId(), lab.getMeasureDeptId());
@@ -549,6 +553,10 @@
             int seqUpdateFlag = labExecutiveInfoMapper.updateForSendBack(request.getOrderId(), request.getSampleId());
             //更新所有状态为空的实验室检测中序号最小的记录的状态为待分配
             Long id = labExecutiveInfoMapper.selectMinSeq(request.getOrderId(), request.getSampleId());
+            //仅分发了一个实验室检测的情况
+            if(seqUpdateFlag <= 0 && Objects.isNull(id)){
+                return ReturnUtil.success();
+            }
             BusinessLabExecutiveInfo info = new BusinessLabExecutiveInfo();
             info.setId(id);
             info.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE);
@@ -564,6 +572,7 @@
         labExecutiveInfo.setId(sampleAllocateRequest.getId());
         labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
         labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        labExecutiveInfo.setRequireCertifications(sampleAllocateRequest.getRequireCertifications());
         if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
             return ReturnUtil.success();
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index d468012..403f44a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -374,7 +374,7 @@
         if(updateFlg>0){
             // 删除所有关联设备信息
             QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
-            wrapper.eq("applyId",equipmentApply.getId());
+            wrapper.eq("apply_id",equipmentApply.getId());
             equipmentService.remove(wrapper);
             equipmentApply.getEquipmentList().forEach(bean->{
                 bean.setApplyId(equipmentApply.getId().toString());
@@ -389,6 +389,7 @@
                 taskService.complete(task.getId());
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
+                return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
index 643ba4c..ab30ff5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
@@ -99,9 +99,9 @@
     @Override
     public MeterPrice queryPriceInfo(IdDTO idDto) {
         MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId());
-        meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
-        meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
-        meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
+        meterPrice.setCheckTypeName(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
+        meterPrice.setDirectorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
+        meterPrice.setOperatorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
         return meterPrice;
     }
 
@@ -208,9 +208,9 @@
 
     private List<MeterPrice> supplementList(List<MeterPrice> meterPriceList){
         meterPriceList.forEach(bean->{
-            bean.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType()));
-            bean.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission()));
-            bean.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission()));
+            bean.setCheckTypeName(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType()));
+            bean.setDirectorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission()));
+            bean.setOperatorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission()));
         });
         return meterPriceList;
     }

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
index b168e8c..2987115 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
@@ -19,6 +19,12 @@
     @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long")
     private Long deptId;
 
+    @ApiModelProperty(value = "培训计划编号", dataType = "String")
+    private String planNo;
+
+    @ApiModelProperty(value = "培训计划名称", dataType = "String")
+    private String planName;
+
     /**
      * 实施单位-手填
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 6ca4564..f9e2b4b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -43,10 +43,15 @@
     private String priceName;
 
     @TableField("check_type")
-    @ExcelProperty(value = "校验类型",order = 2)
+    @ExcelProperty(value = "校验类型")
     @ApiModelProperty(value = "校验类型-字典value", dataType = "String")
     private String checkType;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "校验类型",order = 2)
+    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    private String checkTypeName;
+
     @TableField("price_type")
     @ApiModelProperty(value = "类别id", dataType = "String")
     private String priceType;
@@ -83,15 +88,25 @@
     private String priceDescription;
 
     @TableField("operator_discount_permission")
-    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ExcelProperty(value = "业务员折扣权限")
     @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String")
     private String operatorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String")
+    private String operatorDiscountPermissionName;
+
     @TableField("director_discount_permission")
-    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ExcelProperty(value = "负责人折扣权限")
     @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String")
     private String directorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String")
+    private String directorDiscountPermissionName;
+
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
     private String remark;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
index ffc21af..2d10d6f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
@@ -47,7 +47,7 @@
      * 培训计划编号
      */
     @ExcelProperty("计划编号")
-    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long")
+    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String")
     @TableField("plan_no")
     private String planNo;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index c6f5d95..65295c2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -239,6 +239,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId, MeasureStatusEnum.TO_ALLOCATE, null);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                 });
                 break;
@@ -251,6 +252,7 @@
                 statusList.add(MeasureStatusEnum.IN_MEASURE);
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId,null, statusList);
                 resultPage.getRecords().parallelStream().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                     //查询证书报告表
                     if(MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())){
@@ -294,6 +296,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                 });
                 break;
@@ -303,6 +306,7 @@
             case MeasureStatusEnum.IN_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                     //本实验室在一个流程中若有多次检测，这里的证书信息是多次的总和，已出具的是当前本人的（后续根据需求定义调整）
                     Integer alreadyCertificateNum = getAlreadyCertificateNum(lab.getOrderId(), lab.getSampleId(), lab.getMeasureDeptId());
@@ -549,6 +553,10 @@
             int seqUpdateFlag = labExecutiveInfoMapper.updateForSendBack(request.getOrderId(), request.getSampleId());
             //更新所有状态为空的实验室检测中序号最小的记录的状态为待分配
             Long id = labExecutiveInfoMapper.selectMinSeq(request.getOrderId(), request.getSampleId());
+            //仅分发了一个实验室检测的情况
+            if(seqUpdateFlag <= 0 && Objects.isNull(id)){
+                return ReturnUtil.success();
+            }
             BusinessLabExecutiveInfo info = new BusinessLabExecutiveInfo();
             info.setId(id);
             info.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE);
@@ -564,6 +572,7 @@
         labExecutiveInfo.setId(sampleAllocateRequest.getId());
         labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
         labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        labExecutiveInfo.setRequireCertifications(sampleAllocateRequest.getRequireCertifications());
         if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
             return ReturnUtil.success();
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index d468012..403f44a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -374,7 +374,7 @@
         if(updateFlg>0){
             // 删除所有关联设备信息
             QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
-            wrapper.eq("applyId",equipmentApply.getId());
+            wrapper.eq("apply_id",equipmentApply.getId());
             equipmentService.remove(wrapper);
             equipmentApply.getEquipmentList().forEach(bean->{
                 bean.setApplyId(equipmentApply.getId().toString());
@@ -389,6 +389,7 @@
                 taskService.complete(task.getId());
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
+                return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
index 643ba4c..ab30ff5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
@@ -99,9 +99,9 @@
     @Override
     public MeterPrice queryPriceInfo(IdDTO idDto) {
         MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId());
-        meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
-        meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
-        meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
+        meterPrice.setCheckTypeName(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
+        meterPrice.setDirectorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
+        meterPrice.setOperatorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
         return meterPrice;
     }
 
@@ -208,9 +208,9 @@
 
     private List<MeterPrice> supplementList(List<MeterPrice> meterPriceList){
         meterPriceList.forEach(bean->{
-            bean.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType()));
-            bean.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission()));
-            bean.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission()));
+            bean.setCheckTypeName(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType()));
+            bean.setDirectorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission()));
+            bean.setOperatorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission()));
         });
         return meterPriceList;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
index 0beebb1..5d1d181 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
@@ -236,6 +236,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(MeterTraceSupplier traceSupplier) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {

diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index f486c47..7c8dd1d 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -32,7 +32,8 @@
     <!-- 各状态列表查询结果列 -->
     <sql id="Status_Column_List">
         blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId,
-        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, blei.measure_status
+        bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications,
+        blei.measure_status, blei.measure_person_id
     </sql>
 
     <select id="selectListByInMeasureStatus" resultType="com.casic.missiles.dto.business.HandOutLabExecutiveDTO">
@@ -114,7 +115,7 @@
     </select>
 
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.SampleLabExecutiveListResponse">
-        SELECT <include refid="Status_Column_List"/>, sd.SIMPLE_NAME AS measureDeptName
+        SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
         JOIN customer_sample_info csi ON csi.id = blei.sample_id
         JOIN business_order bo ON bo.id = blei.order_id
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 435d1de..1ca9077 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -24,7 +24,7 @@
     <!-- 详情查询结果列 -->
     <sql id="Detail_Column_List">
         bosr.sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, csi.manufacturer, csi.manufacturer_country,
-        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
+        csi.manufacturing_date, csi.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId,
         bo.order_code, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bosr.measure_content, csi.measure_period,
         csi.measure_last_time AS measureLastDate, csi.valid_deadline AS effectiveDate, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
index ca129e3..0e357fa 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml
@@ -51,10 +51,10 @@
                 and mp.model like concat('%', #{request.model}, '%')
             </if>
             <if test="request.priceType != null  and request.priceType != ''">
-                and mp.price_type like concat('%', #{request.priceType}, '%')
+                and mpc.category_name like concat('%', #{request.priceType}, '%')
             </if>
             <if test="request.priceItem != null  and request.priceItem != ''">
-                and mp.price_item like concat('%', #{request.priceItem}, '%')
+                and mpi.item_name like concat('%', #{request.priceItem}, '%')
             </if>
             <if test="request.ids != null and request.ids.size() > 0 ">
                 and t1.id in
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
index 639e8a8..ade9dde 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleAllocateRequest.java
@@ -22,4 +22,7 @@
     @ApiModelProperty(value = "分配检定人员id（在本部门下的计量人员列表中选择）", dataType = "Long")
     private Long measurePersonId;
 
+    @ApiModelProperty(value = "应出具证书总数", dataType = "Integer")
+    private Integer requireCertifications;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
index fff240e..77844f2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutDetailResponse.java
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
index 6d50374..1a24931 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleLabExecutiveListResponse.java
@@ -81,10 +81,16 @@
     @ExcelProperty(value = "应检完时间", order = 10)
     private String requireOverTime;
 
+    @ApiModelProperty(value = "当前检定环节，实验室id", dataType = "Long")
+    private Long currentSegmentId;
+
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
     @ExcelProperty(value = "当前检定环节", order = 11)
     private String currentSegment;
 
+    @ApiModelProperty(value = "检定人员id", dataType = "Long")
+    private Long measurePersonId;
+
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
     private Integer alreadyCertifications;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
index b168e8c..2987115 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/TrainPlanListRequest.java
@@ -19,6 +19,12 @@
     @ApiModelProperty(value = "组织部门id-系统组织表", dataType = "Long")
     private Long deptId;
 
+    @ApiModelProperty(value = "培训计划编号", dataType = "String")
+    private String planNo;
+
+    @ApiModelProperty(value = "培训计划名称", dataType = "String")
+    private String planName;
+
     /**
      * 实施单位-手填
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
index 6ca4564..f9e2b4b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java
@@ -43,10 +43,15 @@
     private String priceName;
 
     @TableField("check_type")
-    @ExcelProperty(value = "校验类型",order = 2)
+    @ExcelProperty(value = "校验类型")
     @ApiModelProperty(value = "校验类型-字典value", dataType = "String")
     private String checkType;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "校验类型",order = 2)
+    @ApiModelProperty(value = "校验类型名称", dataType = "String")
+    private String checkTypeName;
+
     @TableField("price_type")
     @ApiModelProperty(value = "类别id", dataType = "String")
     private String priceType;
@@ -83,15 +88,25 @@
     private String priceDescription;
 
     @TableField("operator_discount_permission")
-    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ExcelProperty(value = "业务员折扣权限")
     @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String")
     private String operatorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "业务员折扣权限",order = 7)
+    @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String")
+    private String operatorDiscountPermissionName;
+
     @TableField("director_discount_permission")
-    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ExcelProperty(value = "负责人折扣权限")
     @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String")
     private String directorDiscountPermission;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "负责人折扣权限",order = 8)
+    @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String")
+    private String directorDiscountPermissionName;
+
     @TableField("remark")
     @ApiModelProperty(value = "备注", dataType = "String")
     private String remark;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
index ffc21af..2d10d6f 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainPlan.java
@@ -47,7 +47,7 @@
      * 培训计划编号
      */
     @ExcelProperty("计划编号")
-    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "Long")
+    @ApiModelProperty(value = "培训计划编号（列表、更新接口参数）", dataType = "String")
     @TableField("plan_no")
     private String planNo;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index c6f5d95..65295c2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -239,6 +239,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId, MeasureStatusEnum.TO_ALLOCATE, null);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                 });
                 break;
@@ -251,6 +252,7 @@
                 statusList.add(MeasureStatusEnum.IN_MEASURE);
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId,null, statusList);
                 resultPage.getRecords().parallelStream().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
                     lab.setCurrentSegment(deptName);
                     //查询证书报告表
                     if(MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())){
@@ -294,6 +296,7 @@
             case MeasureStatusEnum.TO_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.TO_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                 });
                 break;
@@ -303,6 +306,7 @@
             case MeasureStatusEnum.IN_MEASURE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.IN_MEASURE);
                 resultPage.getRecords().forEach(lab -> {
+                    lab.setCurrentSegmentId(lab.getMeasureDeptId());
                     lab.setCurrentSegment(lab.getMeasureDeptName());
                     //本实验室在一个流程中若有多次检测，这里的证书信息是多次的总和，已出具的是当前本人的（后续根据需求定义调整）
                     Integer alreadyCertificateNum = getAlreadyCertificateNum(lab.getOrderId(), lab.getSampleId(), lab.getMeasureDeptId());
@@ -549,6 +553,10 @@
             int seqUpdateFlag = labExecutiveInfoMapper.updateForSendBack(request.getOrderId(), request.getSampleId());
             //更新所有状态为空的实验室检测中序号最小的记录的状态为待分配
             Long id = labExecutiveInfoMapper.selectMinSeq(request.getOrderId(), request.getSampleId());
+            //仅分发了一个实验室检测的情况
+            if(seqUpdateFlag <= 0 && Objects.isNull(id)){
+                return ReturnUtil.success();
+            }
             BusinessLabExecutiveInfo info = new BusinessLabExecutiveInfo();
             info.setId(id);
             info.setMeasureStatus(MeasureStatusEnum.TO_ALLOCATE);
@@ -564,6 +572,7 @@
         labExecutiveInfo.setId(sampleAllocateRequest.getId());
         labExecutiveInfo.setMeasurePersonId(sampleAllocateRequest.getMeasurePersonId());
         labExecutiveInfo.setMeasureStatus(MeasureStatusEnum.TO_MEASURE);
+        labExecutiveInfo.setRequireCertifications(sampleAllocateRequest.getRequireCertifications());
         if(labExecutiveInfoMapper.updateById(labExecutiveInfo) > 0){
             return ReturnUtil.success();
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index d468012..403f44a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -374,7 +374,7 @@
         if(updateFlg>0){
             // 删除所有关联设备信息
             QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
-            wrapper.eq("applyId",equipmentApply.getId());
+            wrapper.eq("apply_id",equipmentApply.getId());
             equipmentService.remove(wrapper);
             equipmentApply.getEquipmentList().forEach(bean->{
                 bean.setApplyId(equipmentApply.getId().toString());
@@ -389,6 +389,7 @@
                 taskService.complete(task.getId());
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
+                return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
index 643ba4c..ab30ff5 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java
@@ -99,9 +99,9 @@
     @Override
     public MeterPrice queryPriceInfo(IdDTO idDto) {
         MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId());
-        meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
-        meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
-        meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
+        meterPrice.setCheckTypeName(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType()));
+        meterPrice.setDirectorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission()));
+        meterPrice.setOperatorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission()));
         return meterPrice;
     }
 
@@ -208,9 +208,9 @@
 
     private List<MeterPrice> supplementList(List<MeterPrice> meterPriceList){
         meterPriceList.forEach(bean->{
-            bean.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType()));
-            bean.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission()));
-            bean.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission()));
+            bean.setCheckTypeName(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType()));
+            bean.setDirectorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission()));
+            bean.setOperatorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission()));
         });
         return meterPriceList;
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
index 0beebb1..5d1d181 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTraceSupplierServiceImpl.java
@@ -236,6 +236,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(MeterTraceSupplier traceSupplier) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
index e3d0750..6545b56 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterTrainPlanServiceImpl.java
@@ -408,6 +408,8 @@
             wrapper.eq("id", 12344321);
             return wrapper;
         }
+        wrapper.like(StringUtils.isNotBlank(request.getPlanNo()), "plan_no", request.getPlanNo());
+        wrapper.like(StringUtils.isNotBlank(request.getPlanName()), "plan_name", request.getPlanName());
         wrapper.like(StringUtils.isNotBlank(request.getDirector()), "director", request.getDirector());
         wrapper.like(StringUtils.isNotBlank(request.getEffectiveCompany()), "effective_company", request.getEffectiveCompany());
         wrapper.like(!Objects.isNull(request.getDeptId()), "dept_id", request.getDeptId());