diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java
index c8c30dc5c..dc76201dd 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java
@@ -11,12 +11,15 @@
 
 package com.xdadan.erp.web.emis;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
@@ -64,6 +67,24 @@ public class EmisSettlePayRecordController extends BaseController
 
         setPrivParams(emisSettlePayRecord);
 
+        String billCodeStr = MapUtil.getStr(emisSettlePayRecord.getParams(),"billCode");
+        if(!StringUtils.isEmpty(billCodeStr)){
+            emisSettlePayRecord.getParams().put("billCode", WaybillHelper.formatQueryValue(billCodeStr));
+            String[] billCodeSortList = billCodeStr.split(",");
+            if(billCodeSortList.length>1){
+                emisSettlePayRecord.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
+            }
+        }
+
+
+        if(!StringUtils.isEmpty(emisSettlePayRecord.getSettleBillNo())){
+            emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo()));
+            String[] settleBillNoSortList = emisSettlePayRecord.getSettleBillNo().split(",");
+            if(settleBillNoSortList.length>1){
+                emisSettlePayRecord.getParams().put("settleBillNoSortList",Arrays.asList(settleBillNoSortList));
+            }
+        }
+
         List<EmisSettlePayRecord> list = emisSettlePayRecordService.selectEmisSettlePayRecordList(emisSettlePayRecord);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
index e51e2e3b0..fd7f90b5b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
@@ -79,12 +79,20 @@ public class EmisWarehouseInBatch extends BaseEntity
     private String prepareInSupplier;
     /* 包装类型 */
     private String packType;
-    /* 总件数 */
+    /* 总件数-旧 */
     private Integer totalParcelQty;
     /* 总体积 */
     private BigDecimal totalVolume;
-    /* 总重量 */
+    /* 总重量-旧 */
     private BigDecimal totalWeight;
+
+
+    /* 件数-新 */
+    private Integer parcelQty;
+    /* 实际重量-新 */
+    private BigDecimal billWeight;
+    /* 货值 */
+    private String realValue;
     /* 进仓图片链接 */
     private String picUrl;
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
index 7bc15afcf..6af6b8520 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
@@ -112,6 +112,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
             </if>
 
+            <if test="params.beginTradeDate != null and params.beginTradeDate != ''">
+                and trade_date <![CDATA[ >= ]]>  #{params.beginTradeDate}
+            </if>
+            <if test="params.endTradeDate != null and params.endTradeDate != ''">
+                and trade_date <![CDATA[ <= ]]>  #{params.endTradeDate}
+            </if>
+
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and settle_bill_no in(
                     select bill_no from emis_settle_sub_bill b
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
index 0fff5a162..4fd41b33a 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
@@ -26,9 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="prepareInRemark"    column="prepare_in_remark"    />
         <result property="prepareInSupplier"    column="prepare_in_supplier"    />
         <result property="packType"    column="pack_type"    />
-        <result property="totalParcelQty"    column="total_parcel_qty"    />
+        <result property="totalParcelQty"    column="parcel_qty"    />
         <result property="totalVolume"    column="total_volume"    />
-        <result property="totalWeight"    column="total_weight"    />
+        <result property="totalWeight"    column="bill_weight"    />
+        <result property="parcelQty"    column="parcel_qty"    />
+        <result property="billWeight"    column="bill_weight"    />
+        <result property="realValue"    column="real_value"    />
         <result property="picUrl"    column="pic_url"    />
 
         <association property="cargoList"
@@ -40,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisWarehouseInBatchVo">
-        select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in_batch
+        select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, parcel_qty, bill_weight, real_value, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in_batch
     </sql>
 
     <select id="selectEmisWarehouseInBatchList" parameterType="EmisWarehouseInBatch" resultMap="EmisWarehouseInBatchResult">
@@ -86,13 +89,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectEmisWarehouseInBatchById" parameterType="Long" resultMap="EmisWarehouseInBatchResult">
-        select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, parcel_qty, bill_weight, real_value, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_warehouse_in_batch a
         where a.id = #{id}
     </select>
 
     <select id="selectInBatchListByInNo" parameterType="String" resultMap="EmisWarehouseInBatchResult">
-        select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, parcel_qty, bill_weight, real_value, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_warehouse_in_batch a
         where del_flag='0' and a.in_no = #{inNo}
     </select>
@@ -123,6 +126,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalParcelQty != null">total_parcel_qty,</if>
             <if test="totalVolume != null">total_volume,</if>
             <if test="totalWeight != null">total_weight,</if>
+            <if test="parcelQty != null">parcel_qty,</if>
+            <if test="billWeight != null">bill_weight,</if>
+            <if test="realValue != null and realValue != ''">real_value,</if>
             <if test="picUrl != null and picUrl != ''">pic_url,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
@@ -158,6 +164,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalParcelQty != null">#{totalParcelQty},</if>
             <if test="totalVolume != null">#{totalVolume},</if>
             <if test="totalWeight != null">#{totalWeight},</if>
+            <if test="parcelQty != null">#{parcelQty},</if>
+            <if test="billWeight != null">#{billWeight},</if>
+            <if test="realValue != null and realValue != ''">#{realValue},</if>
             <if test="picUrl != null and picUrl != ''">#{picUrl},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
@@ -197,6 +206,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalParcelQty != null">total_parcel_qty = #{totalParcelQty},</if>
             <if test="totalVolume != null">total_volume = #{totalVolume},</if>
             <if test="totalWeight != null">total_weight = #{totalWeight},</if>
+            <if test="parcelQty != null">parcel_qty = #{parcelQty},</if>
+            <if test="billWeight != null">bill_weight = #{billWeight},</if>
+            <if test="realValue != null and realValue != ''">real_value = #{realValue},</if>
             <if test="picUrl != null and picUrl != ''">pic_url = #{picUrl},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
@@ -212,11 +224,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteEmisWarehouseInBatchById" parameterType="Long">
-        delete from emis_warehouse_in_batch where id = #{id}
+        update emis_warehouse_in_batch set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisWarehouseInBatchByIds" parameterType="String">
-        delete from emis_warehouse_in_batch where id in
+        update emis_warehouse_in_batch set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>