diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java
index 43e1f0ade..2ab2f195f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAjustApply.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisWaybillAjustApply.java
  * @author linfso
- * @date 2024-06-25 23:39:28
+ * @date 2024-06-25 23:52:10
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 运单调整申请 实体类 </p>
  */
 
@@ -26,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisWaybillAjustApply
  * @Description 运单调整申请
  * @author linfso
- * @date 2024-06-25 23:39:28
+ * @date 2024-06-25 23:52:10
  */
- @Data
+@Data
 public class EmisWaybillAjustApply extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -59,6 +59,8 @@ public class EmisWaybillAjustApply extends BaseEntity
     private String destConfirmNote;
     /* 目的站点确认人代码 */
     private String destConfirmManCode;
+    /* 目的财务中心编码 */
+    private String destFinanceCenterCode;
     /* 改前值 */
     private String oldValue;
     /* 改后值 */
@@ -67,8 +69,8 @@ public class EmisWaybillAjustApply extends BaseEntity
     private String blValueJson;
     /* 申请备注 */
     private String applyMemo;
-    /* 目的财务中心编码 */
-    private String destFinanceCenterCode;
+    /* 中心是否审核 0-未审核 1-审核通过 2-审核拒绝 */
+    private String blCenterConfirmed;
     /* 中心确认编码 */
     private String centerConfirmSiteCode;
     /* 中心确认人 */
@@ -79,4 +81,19 @@ public class EmisWaybillAjustApply extends BaseEntity
     /* 中心审核备注 */
     private String centerConfirmNote;
 
+
+    // 扩展值
+    private String applyTypeName;
+    private String applyManName;
+    private String applySiteName;
+    private String applyFinanceCenterName;
+
+    private String destConfirmSiteName;
+    private String destConfirmManName;
+    private String destFinanceCenterName;
+
+    private String centerConfirmSiteName;
+    private String centerConfirmManName;
+
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
index 718b4e239..d6aa3aff4 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper">
-    
+
     <resultMap type="EmisWaybillAjustApply" id="EmisWaybillAjustApplyResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
@@ -17,11 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="destConfirmDate"    column="dest_confirm_date"    />
         <result property="destConfirmNote"    column="dest_confirm_note"    />
         <result property="destConfirmManCode"    column="dest_confirm_man_code"    />
+        <result property="destFinanceCenterCode"    column="dest_finance_center_code"    />
         <result property="oldValue"    column="old_value"    />
         <result property="newValue"    column="new_value"    />
         <result property="blValueJson"    column="bl_value_json"    />
         <result property="applyMemo"    column="apply_memo"    />
-        <result property="destFinanceCenterCode"    column="dest_finance_center_code"    />
+        <result property="blCenterConfirmed"    column="bl_center_confirmed"    />
         <result property="centerConfirmSiteCode"    column="center_confirm_site_code"    />
         <result property="centerConfirmManCode"    column="center_confirm_man_code"    />
         <result property="centerConfirmDate"    column="center_confirm_date"    />
@@ -29,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisWaybillAjustApplyVo">
-        select id, bill_code, apply_type, apply_man_code, apply_site_code, apply_finance_center_code, apply_date, bl_dest_confirmed, dest_confirm_site_code, dest_confirm_date, dest_confirm_note, dest_confirm_man_code, old_value, new_value, bl_value_json, apply_memo, dest_finance_center_code, center_confirm_site_code, center_confirm_man_code, center_confirm_date, center_confirm_note, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_waybill_ajust_apply
+        select id, bill_code, apply_type, apply_man_code, apply_site_code, apply_finance_center_code, apply_date, bl_dest_confirmed, dest_confirm_site_code, dest_confirm_date, dest_confirm_note, dest_confirm_man_code, dest_finance_center_code, old_value, new_value, bl_value_json, apply_memo, bl_center_confirmed, center_confirm_site_code, center_confirm_man_code, center_confirm_date, center_confirm_note, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_waybill_ajust_apply
     </sql>
 
     <select id="selectEmisWaybillAjustApplyList" parameterType="EmisWaybillAjustApply" resultMap="EmisWaybillAjustApplyResult">
         <include refid="selectEmisWaybillAjustApplyVo"/>
-        <where>  
-             del_flag='0'
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
             <if test="applyType != null  and applyType != ''"> and apply_type = #{applyType}</if>
@@ -48,11 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="destConfirmDate != null "> and dest_confirm_date = #{destConfirmDate}</if>
             <if test="destConfirmNote != null  and destConfirmNote != ''"> and dest_confirm_note = #{destConfirmNote}</if>
             <if test="destConfirmManCode != null  and destConfirmManCode != ''"> and dest_confirm_man_code = #{destConfirmManCode}</if>
+            <if test="destFinanceCenterCode != null  and destFinanceCenterCode != ''"> and dest_finance_center_code like concat('%', #{destFinanceCenterCode}, '%')</if>
             <if test="oldValue != null  and oldValue != ''"> and old_value like concat('%', #{oldValue}, '%')</if>
             <if test="newValue != null  and newValue != ''"> and new_value like concat('%', #{newValue}, '%')</if>
             <if test="blValueJson != null  and blValueJson != ''"> and bl_value_json like concat('%', #{blValueJson}, '%')</if>
             <if test="applyMemo != null  and applyMemo != ''"> and apply_memo like concat('%', #{applyMemo}, '%')</if>
-            <if test="destFinanceCenterCode != null  and destFinanceCenterCode != ''"> and dest_finance_center_code like concat('%', #{destFinanceCenterCode}, '%')</if>
+            <if test="blCenterConfirmed != null  and blCenterConfirmed != ''"> and bl_center_confirmed like concat('%', #{blCenterConfirmed}, '%')</if>
             <if test="centerConfirmSiteCode != null  and centerConfirmSiteCode != ''"> and center_confirm_site_code like concat('%', #{centerConfirmSiteCode}, '%')</if>
             <if test="centerConfirmManCode != null  and centerConfirmManCode != ''"> and center_confirm_man_code like concat('%', #{centerConfirmManCode}, '%')</if>
             <if test="centerConfirmDate != null "> and center_confirm_date = #{centerConfirmDate}</if>
@@ -66,10 +68,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+
+
+            <if test="params.beginApplyDate != null and params.beginApplyDate != ''">
+                and apply_date <![CDATA[ >= ]]>  #{params.beginApplyDate}
+            </if>
+            <if test="params.endApplyDate != null and params.endApplyDate != ''">
+                and apply_date <![CDATA[ <= ]]>  #{params.endApplyDate}
+            </if>
+
+            <if test="params.processStatus != null  and params.processStatus == 1">
+                and bl_dest_confirmed='0'
+            </if>
+
+            <if test="params.processStatus != null  and params.processStatus == 2">
+                and bl_dest_confirmed='1'
+            </if>
+
+            <if test="params.processStatus != null  and params.processStatus == 3">
+                and bl_center_confirmed='1'
+            </if>
+
+            <if test="params.processStatus != null  and params.processStatus == 4">
+                and bl_dest_confirmed='2'
+            </if>
+
+            <if test="params.processStatus != null  and params.processStatus == 5">
+                and bl_center_confirmed='2'
+            </if>
+
         </where>
         order by create_time desc
     </select>
 
+
+    <!--
+                 未确认 - 1
+                 已确认 - 2
+                 中心已审核 - 3
+                 网点驳回 - 4
+                 中心驳回 - 5
+   -->
+
+
     <select id="checkUnique" parameterType="EmisWaybillAjustApply"  resultType="int">
 		select count(1) from  emis_waybill_ajust_apply
 		where del_flag='0'
@@ -85,11 +126,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and dest_confirm_date = #{destConfirmDate}
            and dest_confirm_note = #{destConfirmNote}
            and dest_confirm_man_code = #{destConfirmManCode}
+           and dest_finance_center_code = #{destFinanceCenterCode}
            and old_value = #{oldValue}
            and new_value = #{newValue}
            and bl_value_json = #{blValueJson}
            and apply_memo = #{applyMemo}
-           and dest_finance_center_code = #{destFinanceCenterCode}
+           and bl_center_confirmed = #{blCenterConfirmed}
            and center_confirm_site_code = #{centerConfirmSiteCode}
            and center_confirm_man_code = #{centerConfirmManCode}
            and center_confirm_date = #{centerConfirmDate}
@@ -105,13 +147,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and update_site = #{updateSite}
 		limit 1
 	</select>
-  
+
     <select id="selectEmisWaybillAjustApplyById" parameterType="Long" resultMap="EmisWaybillAjustApplyResult">
-        select id, bill_code, apply_type, apply_man_code, apply_site_code, apply_finance_center_code, apply_date, bl_dest_confirmed, dest_confirm_site_code, dest_confirm_date, dest_confirm_note, dest_confirm_man_code, old_value, new_value, bl_value_json, apply_memo, dest_finance_center_code, center_confirm_site_code, center_confirm_man_code, center_confirm_date, center_confirm_note, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, bill_code, apply_type, apply_man_code, apply_site_code, apply_finance_center_code, apply_date, bl_dest_confirmed, dest_confirm_site_code, dest_confirm_date, dest_confirm_note, dest_confirm_man_code, dest_finance_center_code, old_value, new_value, bl_value_json, apply_memo, bl_center_confirmed, center_confirm_site_code, center_confirm_man_code, center_confirm_date, center_confirm_note, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_waybill_ajust_apply a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisWaybillAjustApply" parameterType="EmisWaybillAjustApply" useGeneratedKeys="true" keyProperty="id">
         insert into emis_waybill_ajust_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -127,11 +169,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="destConfirmDate != null">dest_confirm_date,</if>
             <if test="destConfirmNote != null and destConfirmNote != ''">dest_confirm_note,</if>
             <if test="destConfirmManCode != null and destConfirmManCode != ''">dest_confirm_man_code,</if>
+            <if test="destFinanceCenterCode != null and destFinanceCenterCode != ''">dest_finance_center_code,</if>
             <if test="oldValue != null and oldValue != ''">old_value,</if>
             <if test="newValue != null and newValue != ''">new_value,</if>
             <if test="blValueJson != null and blValueJson != ''">bl_value_json,</if>
             <if test="applyMemo != null and applyMemo != ''">apply_memo,</if>
-            <if test="destFinanceCenterCode != null and destFinanceCenterCode != ''">dest_finance_center_code,</if>
+            <if test="blCenterConfirmed != null and blCenterConfirmed != ''">bl_center_confirmed,</if>
             <if test="centerConfirmSiteCode != null and centerConfirmSiteCode != ''">center_confirm_site_code,</if>
             <if test="centerConfirmManCode != null and centerConfirmManCode != ''">center_confirm_man_code,</if>
             <if test="centerConfirmDate != null">center_confirm_date,</if>
@@ -145,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="billCode != null and billCode != ''">#{billCode},</if>
@@ -159,11 +202,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="destConfirmDate != null">#{destConfirmDate},</if>
             <if test="destConfirmNote != null and destConfirmNote != ''">#{destConfirmNote},</if>
             <if test="destConfirmManCode != null and destConfirmManCode != ''">#{destConfirmManCode},</if>
+            <if test="destFinanceCenterCode != null and destFinanceCenterCode != ''">#{destFinanceCenterCode},</if>
             <if test="oldValue != null and oldValue != ''">#{oldValue},</if>
             <if test="newValue != null and newValue != ''">#{newValue},</if>
             <if test="blValueJson != null and blValueJson != ''">#{blValueJson},</if>
             <if test="applyMemo != null and applyMemo != ''">#{applyMemo},</if>
-            <if test="destFinanceCenterCode != null and destFinanceCenterCode != ''">#{destFinanceCenterCode},</if>
+            <if test="blCenterConfirmed != null and blCenterConfirmed != ''">#{blCenterConfirmed},</if>
             <if test="centerConfirmSiteCode != null and centerConfirmSiteCode != ''">#{centerConfirmSiteCode},</if>
             <if test="centerConfirmManCode != null and centerConfirmManCode != ''">#{centerConfirmManCode},</if>
             <if test="centerConfirmDate != null">#{centerConfirmDate},</if>
@@ -177,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisWaybillAjustApply" parameterType="EmisWaybillAjustApply">
@@ -194,11 +238,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="destConfirmDate != null">dest_confirm_date = #{destConfirmDate},</if>
             <if test="destConfirmNote != null and destConfirmNote != ''">dest_confirm_note = #{destConfirmNote},</if>
             <if test="destConfirmManCode != null and destConfirmManCode != ''">dest_confirm_man_code = #{destConfirmManCode},</if>
+            <if test="destFinanceCenterCode != null and destFinanceCenterCode != ''">dest_finance_center_code = #{destFinanceCenterCode},</if>
             <if test="oldValue != null and oldValue != ''">old_value = #{oldValue},</if>
             <if test="newValue != null and newValue != ''">new_value = #{newValue},</if>
             <if test="blValueJson != null and blValueJson != ''">bl_value_json = #{blValueJson},</if>
             <if test="applyMemo != null and applyMemo != ''">apply_memo = #{applyMemo},</if>
-            <if test="destFinanceCenterCode != null and destFinanceCenterCode != ''">dest_finance_center_code = #{destFinanceCenterCode},</if>
+            <if test="blCenterConfirmed != null and blCenterConfirmed != ''">bl_center_confirmed = #{blCenterConfirmed},</if>
             <if test="centerConfirmSiteCode != null and centerConfirmSiteCode != ''">center_confirm_site_code = #{centerConfirmSiteCode},</if>
             <if test="centerConfirmManCode != null and centerConfirmManCode != ''">center_confirm_man_code = #{centerConfirmManCode},</if>
             <if test="centerConfirmDate != null">center_confirm_date = #{centerConfirmDate},</if>
@@ -221,7 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisWaybillAjustApplyByIds" parameterType="String">
-        delete from emis_waybill_ajust_apply where id in 
+        delete from emis_waybill_ajust_apply where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>