From 588cf6fa191ae6b077e924f86c868559c9725cda Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 9 Jul 2024 17:00:18 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisSettleBillServiceImpl.java       | 3 ---
 emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
index 5308e9f48..59a03bd88 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
@@ -116,9 +116,6 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
                 throw  new EmisBizError(EmisBizErrorType.FAIL,"合账失败,子单号["+subBllOld.getBillCode()+"]未确认");
             }
 
-
-
-
             // 更新主账单编号
             subBllOld.setSettleBillNo(emisSettleBill.getSettleBillNo());
             emisSettleSubBillMapper.updateMainSettleBillNo(subBllOld);
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 4a482cf13..123c7a6a3 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -449,7 +449,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateMainSettleBillNo" parameterType="EmisSettleSubBill">
         update emis_settle_sub_bill
         <trim prefix="SET" suffixOverrides=",">
-            settle_bill_no = #{settleBillNo}
+            settle_bill_no = #{settleBillNo},
             <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>