diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index a4e2ad64d..d04b1b399 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
+import com.xdadan.erp.emis.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -51,6 +52,10 @@ public class EmisSettleBillController extends BaseController
     @Autowired
     private IEmisSettleBillService emisSettleBillService;
 
+    @Autowired
+    private EmisBaseService emisBaseService;
+
+
     /**
      * 查询结算总账单列表
      */
@@ -102,6 +107,18 @@ public class EmisSettleBillController extends BaseController
         return AjaxResult.success(emisSettleBillService.selectEmisSettleBillById(id));
     }
 
+
+    /**
+     * 获取结算总账单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisSettleBill:query')")
+    @GetMapping(value = "/getInfoBySettleBillNo")
+    public AjaxResult getInfoBySettleBillNo(String settleBillNo)
+    {
+        return AjaxResult.success(emisBaseService.getSettleBillBySettleBillNo(settleBillNo));
+    }
+
+
     /**
      * 新增结算总账单
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java
index 5ca193db4..f82e61761 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleBillMapper.java
@@ -28,6 +28,10 @@ public interface EmisSettleBillMapper extends BaseMapper<EmisSettleBill>
      */
     public EmisSettleBill selectEmisSettleBillById(Long id);
 
+
+    public EmisSettleBill selectSettleBillBySettleBillNo(String settleBillNo);
+
+
     /**
      * 查询列表
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
index f9d99205f..8828296c7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleSubBillMapper.java
@@ -16,6 +16,7 @@ import java.util.Map;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xdadan.erp.emis.domain.EmisSettleSubBill;
 import com.xdadan.erp.emis.domain.EmisWaybill;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @ClassName EmisSettleSubBillMapper
@@ -82,6 +83,7 @@ public interface EmisSettleSubBillMapper extends BaseMapper<EmisSettleSubBill>
 
     // 更新主账单号
     public int updateMainSettleBillNo(EmisSettleSubBill emisSettleSubBill);
+    public int batchUpdateMainSettleBillNo(@Param("param") EmisSettleSubBill emisSettleSubBill,@Param("idsObj") List<EmisSettleSubBill> ids);
 
 
     // 财务中心取消和确认,确认不出账，设置异常
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index a8b1e906c..92077a287 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -164,6 +164,9 @@ public class EmisBaseService {
      @Autowired
      private EmisSettleSubBillMapper emisSettleSubBillMapper;
 
+     @Autowired
+     private EmisSettleBillMapper emisSettleBillMapper;
+
 
      @Autowired
      private EmisSettleSubBillFeeitemMapper emisSettleSubBillFeeitemMapper;
@@ -1137,6 +1140,15 @@ public class EmisBaseService {
          return emisSettleSubBillMapper.setBillErrorBySite(emisSettleSubBill);
      }
 
+     /**
+      * 根据账单号获取总账单
+      * @param settleBillNo
+      * @return
+      */
+     public EmisSettleBill getSettleBillBySettleBillNo(String settleBillNo){
+         return emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo);
+     }
+
 
 
      /**
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 49c442e7f..454345078 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -182,6 +182,14 @@
         where a.id = #{id}
     </select>
 
+
+    <select id="selectSettleBillBySettleBillNo" parameterType="String" resultMap="EmisSettleBillResult">
+        select id, settle_bill_no, settle_bill_name, settle_type, settle_start_date, settle_end_date, bill_month, rec_money, reced_money, cust_no, customer_code, customer_name, site_code, site_name, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, send_piece_sum, piece_number, fee_weight, uncollected_amount, send_money_sum, refund_amount, refund_money, payee, salesmen, bl_send_oms, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_settle_bill a
+        where a.settle_bill_no = #{settleBillNo}
+    </select>
+
+
     <insert id="insertEmisSettleBill" parameterType="EmisSettleBill" useGeneratedKeys="true" keyProperty="id">
         insert into emis_settle_bill
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index e3c72266d..a5a8bec4b 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -502,6 +502,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
             settle_bill_no = #{settleBillNo},
+            bl_merge = '1',
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
@@ -509,6 +510,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+
+    <update id="batchUpdateMainSettleBillNo" parameterType="String">
+        update emis_settle_sub_bill
+        <trim prefix="SET" suffixOverrides=",">
+            settle_bill_no = #{settleBillNo},
+            bl_merge = '1',
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
+        </trim>
+
+         where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <!--  中心确认 -->
     <update id="confirmBillByCenter" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill